【会员系统】- 付费版区分免费跟永久

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

@@ -22,7 +22,7 @@ import Cocoa
     case lite_type11    // 免费版 有旧买断 试用过期或取消 (右上角导航栏按钮 - “登录领福利” + 开通会员)
     case lite_type12    // 免费版 有旧买断 订阅中 (右上角导航栏按钮 - “登录领福利”)
     case lite_type13    // 免费版 有旧买断 订阅未过期且取消订阅 (右上角导航栏按钮 - “登录领福利” + 续费)
-    case pro_type1      // 付费版 有旧PDF To Office未订阅 (右上角导航栏按钮 - “登录领福利” + 升级（全平台）)
+    case pro_type1      // 付费版 有旧PDF To Offic  免费+永久 (右上角导航栏按钮 - “登录领福利” + 升级（全平台）)
     case pro_type2      // 付费版 有旧PDF To Office 订阅且未过期 (右上角导航栏按钮 - “登录领福利”)
     case pro_type3      // 付费版 无旧PDF To Office未订阅 (右上角导航栏按钮 - “登录领福利” + 升级（全平台/高级版永久）)
     case pro_type4      // 付费版 无旧PDF To Office 高级版永久 (右上角导航栏按钮 - Info + 升级（全平台）)

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -285,8 +285,9 @@ class KMUserInfoViewController: NSViewController {
             number1ImageView.isHidden = false
             number1Label.isHidden = true
             centerBackgroud.image = NSImage(named: "ButtonBackgroundImage5")
-        } else if KMMemberInfo.shared.userScenarioType == .lite_type9 {
-            if(KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1") {
+        } else if KMMemberInfo.shared.userScenarioType == .lite_type9 ||
+                  KMMemberInfo.shared.userScenarioType == .pro_type1 {
+            if(KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1") { //永久
                 lockedLabel.stringValue = NSLocalizedString("Permanent", tableName: "MemberCenterLocalizable", comment: "")
                 lockedImageView.image = NSImage(named: "UpgradeImage2")
                 number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
@@ -298,7 +299,7 @@ class KMUserInfoViewController: NSViewController {
                 number1ImageView.isHidden = false
                 number1Label.isHidden = true
                 centerBackgroud.image = NSImage(named: "ButtonBackgroundImage4")
-            } else {
+            } else { //免费+订阅过期+试用过期
                 lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
                 lockedImageView.image = NSImage(named: "LockedImage")
                 number1Label.stringValue = NSLocalizedString("150+", tableName: "MemberCenterLocalizable", comment: "")
@@ -349,15 +350,6 @@ class KMUserInfoViewController: NSViewController {
             number1ImageView.isHidden = false
             number1Label.isHidden = true
             centerBackgroud.image = NSImage(named: "ButtonBackgroundImage5")
-        } else if KMMemberInfo.shared.userScenarioType == .pro_type1 {
-            lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
-            lockedImageView.image = NSImage(named: "LockedImage")
-            number1Label.stringValue = NSLocalizedString("150+", tableName: "MemberCenterLocalizable", comment: "")
-            number2Label.stringValue = NSLocalizedString("Benefits of Functions", tableName: "MemberCenterLocalizable", comment: "")
-            number1ImageView.isHidden = true
-            number1Label.isHidden = false
-            centerBackgroud.image = NSImage(named: "ButtonBackgroundImage3")
-            number1Label.textColor = NSColor(hex: "0E1114")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type2 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -512,8 +504,7 @@ class KMUserInfoViewController: NSViewController {
                 buyNow2Box.isHidden = true
                 buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
             }
-        } else if KMMemberInfo.shared.userScenarioType == .pro_type1 ||
-                  KMMemberInfo.shared.userScenarioType == .pro_type3  {
+        } else if KMMemberInfo.shared.userScenarioType == .pro_type3  {
             buyBox.contentView = buyView1
             
             buyNow1ImageView.isHidden = false
@@ -522,13 +513,14 @@ class KMUserInfoViewController: NSViewController {
             
             buyNow2Box.isHidden = true
             buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
-        } else if KMMemberInfo.shared.userScenarioType == .lite_type9 {
+        } else if KMMemberInfo.shared.userScenarioType == .lite_type9 ||
+                  KMMemberInfo.shared.userScenarioType == .pro_type1 {
             buyBox.contentView = buyView1
 
             buyNow2Box.isHidden = true
             buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
 
-            if((KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1")) {
+            if((KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1")) { //永久
                 arrow1ImageView.image = NSImage(named: "BuyNewArrowImage2")
                 buyNow1Label.textColor = NSColor(hex: "42464D")
             } else {
@@ -597,7 +589,8 @@ class KMUserInfoViewController: NSViewController {
             number4_1Label.textColor = NSColor(hex: "FFFFFF")
             number5Label.textColor = NSColor(hex: "FFFFFF")
             membershipLabel.textColor = NSColor(hex: "FFFFFF")
-        } else if(KMMemberInfo.shared.userScenarioType == .lite_type9) {
+        } else if(KMMemberInfo.shared.userScenarioType == .lite_type9 ||
+                  KMMemberInfo.shared.userScenarioType == .pro_type1) {
             if(KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1") { //永久
                 rightsBox.fillColor = NSColor(named: "FFFFFF_0.2") ?? .white
                 membershipLabel.textColor = NSColor(hex: "FFFFFF")

PDF Office/PDF Master/MemberCenter/ViewModel/KMUserInfoVCModel.swift

@@ -62,7 +62,10 @@ class KMUserInfoVCModel: ObservableObject {
                 KMMemberInfo.shared.userScenarioType == .lite_type13 ||
                 KMMemberInfo.shared.userScenarioType == .pro_type2 ||
                 KMMemberInfo.shared.userScenarioType == .pro_type4 ||
-                (KMMemberInfo.shared.userScenarioType == .lite_type9 &&             (KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1"))  ||
+                (KMMemberInfo.shared.userScenarioType == .lite_type9 &&
+                 (KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1"))  ||
+                (KMMemberInfo.shared.userScenarioType == .pro_type1 &&
+                 (KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1"))  ||
                 KMMemberInfo.shared.userScenarioType == .pro_type5 {
                 if platform == "mac" {
                     images.append(NSImage(named: "MacOSPlatformImage2")!)