【会员系统】付费版卡片UI问题

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

@@ -209,6 +209,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type2 {
             lockedLabel.stringValue = NSLocalizedString("Annual Plan", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -222,6 +223,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type3 {
             lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -236,6 +238,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type4 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -253,6 +256,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type5 {
             lockedLabel.stringValue = NSLocalizedString("Permanent", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -270,6 +274,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type6 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -288,6 +293,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type7 {
             lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -302,6 +308,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type8 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -319,6 +326,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type9 {
             lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -333,6 +341,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type10 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -346,6 +355,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type11 {
             lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -360,6 +370,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type12 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -377,6 +388,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type13 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -394,6 +406,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type1 {
             lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -408,6 +421,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type2 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -420,11 +434,13 @@ class KMUserInfoViewController: NSViewController {
             number1ImageView.isHidden = false
             number1Label.isHidden = true
             centerBackgroud.image = NSImage(named: "ButtonBackgroundImage5")
+            number1Label.textColor = NSColor(named: "FFFFFF")
             number2Label.textColor = NSColor(named: "FFFFFF")
             number3Label.textColor = NSColor(named: "FFFFFF")
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type3 {
             lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -439,6 +455,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type4 {
             lockedLabel.stringValue = NSLocalizedString("Permanent", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -456,6 +473,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type5 {
             lockedLabel.stringValue = NSLocalizedString("Subscription", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -473,6 +491,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(named: "FFFFFF")
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
+            membershipLabel.textColor = NSColor(named: "FFFFFF")
         } else {
             lockedLabel.stringValue = NSLocalizedString("Locked", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "LockedImage")
@@ -487,6 +506,7 @@ class KMUserInfoViewController: NSViewController {
             number4Label.textColor = NSColor(hex: "42464D")
             number4_1Label.textColor = NSColor(hex: "42464D")
             number5Label.textColor = NSColor(hex: "42464D")
+            membershipLabel.textColor = NSColor(hex: "42464D")
         }
     }
     
@@ -596,17 +616,12 @@ class KMUserInfoViewController: NSViewController {
                     KMMemberInfo.shared.userScenarioType == .pro_type3 ||
                     KMMemberInfo.shared.userScenarioType == .pro_type4 ||
                     KMMemberInfo.shared.userScenarioType == .pro_type5 {
-            membershipLabel.textColor = NSColor(named: "FFFFFF")
-            lockedLabel.textColor = NSColor(hex: "FCFDFF")
-            number5Label.textColor = NSColor(named: "FFFFFF")
             rightsBox.fillColor = NSColor(named: "FFFFFF_0.2") ?? .white
-            if KMMemberInfo.shared.userScenarioType == .lite_type5 ||
-                KMMemberInfo.shared.userScenarioType == .pro_type1 ||
-                KMMemberInfo.shared.userScenarioType == .pro_type3 ||
-                KMMemberInfo.shared.userScenarioType == .pro_type4 {
+            if KMMemberInfo.shared.userScenarioType == .pro_type1 ||
+                KMMemberInfo.shared.userScenarioType == .pro_type3 {
                 buyBox.contentView = buyView2
-                buyNow3ImageView.isHidden = true
-                arrow3ImageView.image = NSImage(named: "BuyNewArrowImage2")
+                buyNow3Label.textColor = NSColor(named: "FFFFFF")
+                arrow3ImageView.image = NSImage(named: "BuyNewArrowImage1")
             }
         } else if KMMemberInfo.shared.userScenarioType == .lite_type7 ||
                     (KMMemberInfo.shared.userScenarioType == .lite_type9 && !(KMMemberInfo.shared.vip_status == 1 || KMMemberInfo.shared.vip_status == 4)  && isNoOldSubscribed) || (KMMemberInfo.shared.userScenarioType == .lite_type11 && KMMemberInfo.shared.vip_paymentModel == "2" && isNoOldSubscribed) {

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

@@ -60,9 +60,9 @@ class KMUserInfoVCModel: ObservableObject {
                 KMMemberInfo.shared.userScenarioType == .lite_type8 ||
                 KMMemberInfo.shared.userScenarioType == .lite_type12 ||
                 KMMemberInfo.shared.userScenarioType == .lite_type13 ||
-                KMMemberInfo.shared.userScenarioType == .pro_type1 ||
                 KMMemberInfo.shared.userScenarioType == .pro_type2 ||
-                KMMemberInfo.shared.userScenarioType == .pro_type3 {
+                KMMemberInfo.shared.userScenarioType == .pro_type4 ||
+                KMMemberInfo.shared.userScenarioType == .pro_type5 {
                 if platform == "mac" {
                     images.append(NSImage(named: "MacOSPlatformImage2")!)
                 } else if platform == "ios" {