Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/AIInfo/AIPurchaseWindowController/AIPurchaseWindowController.swift

@@ -141,12 +141,15 @@ class AIPurchaseWindowController: NSWindowController, NSWindowDelegate {
     
     func reloadData() -> Void {
         self.purchaseButton.isEnabled = true
+        var priceLabel = ""
 #if VERSION_FREE
-#if !VERSION_DMG
-        let priceLabel = IAPProductsManager.default().aiAllAccessPack1month_lite.price()
+#if VERSION_DMG
+        priceLabel = IAPProductsManager.default().dmgpdfReaderProAI_Monthly.price()
+#else
+        priceLabel = IAPProductsManager.default().aiAllAccessPack1month_lite.price()
 #endif
 #else
-        let priceLabel = IAPProductsManager.default().aiAllAccessPack1month_pro.price()
+        priceLabel = IAPProductsManager.default().aiAllAccessPack1month_pro.price()
 #endif
         
         let allowPurchaseAI = KMMemberInfo.shared.allowPurchaseAI
@@ -157,7 +160,7 @@ class AIPurchaseWindowController: NSWindowController, NSWindowDelegate {
             self.purchaseButton.isEnabled = false
             self.purchaseButton.layer?.backgroundColor = NSColor.white.withAlphaComponent(0.2).cgColor
         }
-        self.priceLabel.stringValue = priceLabel!
+        self.priceLabel.stringValue = priceLabel
     }
     
     func appStoreRestoreFinish() -> Void {

PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -940,7 +940,12 @@ import Cocoa
             KMLoginWindowsController.shared.openWindow() { [weak self] success in
                 guard let self = self else { return }
                 if success {
-                    self.productCompareShow()
+                    if userScenarioType == .dmg_type16 ||
+                        userScenarioType == .dmg_type17 {
+                        
+                    } else {
+                        self.productCompareShow()
+                    }
                 }
             }
         }