Ver código fonte

【会员系统】修复DMG编译报错

wanjun 3 meses atrás
pai
commit
62aa987a5f

+ 5 - 5
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift

@@ -723,18 +723,18 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
                 KMProductCompareWC.shared.orientation = false
                 let winC = KMProductCompareWC.shared
                 if let viewC = self.view.window?.contentViewController, viewC.kEventTag == 1 {
-                    winC?.kEventName = "Onbrd_ConvertPDF_BuyNow"
+                    winC.kEventName = "Onbrd_ConvertPDF_BuyNow"
                 } else {
                     if convertType == .WordStandard || convertType == .WordAdvance {
-                        winC?.kEventName = "Onbrd_PDFtoWord_BuyNow"
+                        winC.kEventName = "Onbrd_PDFtoWord_BuyNow"
                     } else if convertType == .Excel {
-                        winC?.kEventName = "Onbrd_PDFtoExcel_BuyNow"
+                        winC.kEventName = "Onbrd_PDFtoExcel_BuyNow"
                     } else if convertType == .PowerPoint {
-                        winC?.kEventName = "Onbrd_PDFtoPPT_BuyNow"
+                        winC.kEventName = "Onbrd_PDFtoPPT_BuyNow"
                     }
                 }
                 
-                winC?.showWindow(nil)
+                winC.showWindow(nil)
             }
 #else
 //            if IAPProductsManager.default().isAvailableAllFunction() {

+ 9 - 0
PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -617,6 +617,11 @@ class KMProductCompareWC: NSWindowController {
     }
     
     func refreshPurchaseSwitch() -> Void {
+#if VERSION_FREE
+#if VERSION_DMG
+    // DMG
+#else
+    // AppStore 免费版本
         reloadData()
         if model.isPurchaseSwitch {
             sixMouthProLabel.textColor = NSColor(red: 117/255.0, green: 119/255.0, blue: 128/255.0, alpha: 1.0)
@@ -831,6 +836,10 @@ class KMProductCompareWC: NSWindowController {
         }
         value1PurchaseSubLabel.stringValue = String(format: NSLocalizedString("%@", comment: ""), tTips)
         value1PurchaseBtnLbl.font = NSFont.UbuntuBoldFontWithSize(16)
+#endif
+#else
+    // AppStore 付费版
+#endif
     }
     
     @objc func reloadDataContent() {