【订阅】未续订时信息界面显示续订按钮

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/KMAccountInfoWindowController.swift

@@ -171,6 +171,11 @@ class KMAccountInfoWindowController: NSWindowController {
         } else if state == .subscription ||
                     state == .trial {
             self.accountViewHeightConstraint.constant = 411 - 60
+#if VERSION_DMG
+            if KMLightMemberManager.manager.info.subscriptionInfoList[0].payType == 0 {
+                self.accountViewHeightConstraint.constant = 483 - 52
+            }
+#endif
         } else if state == .subscriptionExpired ||
                     state == .trialExpired {
             self.accountViewHeightConstraint.constant = 483 - 52

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.swift

@@ -145,7 +145,13 @@ class KMAccountInfoView: KMBaseXibView {
                     purchaseState == .trial {
             self.statusContentView.isHidden = false
 //            self.purchaseInfoContentView.isHidden = false
-            self.subscribeButtonContentView.isHidden = true
+#if VERSION_DMG
+            if userInfo?.subscriptionInfoList[0].payType == 1 {
+                self.subscribeButtonContentView.isHidden = true
+            } else {
+                self.subscribeButtonContentView.isHidden = false
+            }
+#endif
             
             self.statusLabel.stringValue = NSLocalizedString("On Subscription", comment: "")
             if purchaseState == .trial {
@@ -153,7 +159,7 @@ class KMAccountInfoView: KMBaseXibView {
             }
             
             let dateString = userInfo?.subscriptionInfoList[0].endDate ?? ""
-            self.statusTimeLabel.stringValue = "\(self.fetchDate(dateString: dateString)) \n\(NSLocalizedString("Trial expires", comment: ""))"
+            self.statusTimeLabel.stringValue = "\(self.fetchDate(dateString: dateString)) \n\(NSLocalizedString("Subscription expires", comment: ""))"
         } else if purchaseState == .subscriptionExpired ||
                     purchaseState == .trialExpired {
             self.statusContentView.isHidden = false
@@ -164,7 +170,7 @@ class KMAccountInfoView: KMBaseXibView {
             self.statusLabel.textColor = NSColor(hex: "#F3465B")
             
             let dateString = userInfo?.subscriptionInfoList[0].endDate ?? ""
-            self.statusTimeLabel.stringValue = "\(self.fetchDate(dateString: dateString)) \n\(NSLocalizedString("Trial expires", comment: ""))"
+            self.statusTimeLabel.stringValue = "\(self.fetchDate(dateString: dateString)) \n\(NSLocalizedString("Subscription expires", comment: ""))"
         } else {
             self.statusContentView.isHidden = true
 //            self.purchaseInfoContentView.isHidden = true

PDF Office/PDF Master/Class/KMLightMember/InAppPurchase/KMPurchaseManager.swift

@@ -29,7 +29,7 @@ class KMPurchaseManager: NSObject {
         get {
 #if DEBUG
             //方便调整订阅状态
-//            return .subscriptionExpired
+            return .subscription
 #endif
             let info = KMLightMemberManager.manager.info.subscriptionInfoList
             var tempState: KMPurchaseManagerState = .unknow