Browse Source

【订阅】App Store版本,未登录-高级功能-弹出比较表- Subscribe Now - 登录界面-登录已订阅的用户,不需要显示比较表,直接刷新权益修复

lizhe 1 year ago
parent
commit
f2fed472aa

+ 3 - 2
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift

@@ -72,7 +72,8 @@ class KMComparativeTableViewController: NSWindowController {
             }
         }
 #endif
-        #if VERSION_FREE
+        
+#if VERSION_FREE
         let controller: KMComparativeTableViewController = KMComparativeTableViewController.init(windowNibName: "KMComparativeTableViewController")
         controller.inputType = type
 
@@ -111,7 +112,7 @@ class KMComparativeTableViewController: NSWindowController {
         comparativeController = controller
         comparativeMainWindow = window
         return controller
-        #endif
+#endif
         return nil
     }
     

+ 2 - 1
PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/KMLoginWindowController.swift

@@ -259,7 +259,8 @@ class KMLoginWindowController: NSWindowController {
                     KMRequestServerManager.manager.getUserInfo { success, data, error, isLocal in
                         if success {
                             self?.closeWindow()
-                            if inputType == .ComparativeTable {
+                            if self?.inputType == .ComparativeTable && (KMLightMemberManager.manager.purchaseState != .subscription &&
+                                                                  KMLightMemberManager.manager.purchaseState != .trial) {
                                 //跳转订阅比较表
                                 let _ = KMComparativeTableViewController.show(window: NSApp.mainWindow ?? NSWindow())
                             }