【会员系统】AI权益逻辑更新

PDF Office/PDF Master/Class/AIInfo/AIPurchaseWindowController/AIPurchaseWindowController.swift

@@ -148,7 +148,7 @@ class AIPurchaseWindowController: NSWindowController, NSWindowDelegate {
         let priceLabel = IAPProductsManager.default().proAIProduct.price()
 #endif
         
-        let aiInfoValid = AIInfoManager.default().aiInfoValid
+        let aiInfoValid = KMMemberInfo.shared.isPermitAI
         if  aiInfoValid {
             self.purchaseButton.isEnabled = false
             self.purchaseButton.layer?.backgroundColor = NSColor.white.withAlphaComponent(0.2).cgColor
@@ -257,7 +257,7 @@ class AIPurchaseWindowController: NSWindowController, NSWindowDelegate {
             if IAPProductsManager.default().liteAIProduct.isSubscribed {
                 AIInfoManager.default().activateAI(withInfo: ["receipt_str":IAPProductsManager.default().temptransactioReceipt as Any]) { dict, error in
                     self.reloadData()
-                    if AIInfoManager.default().aiInfoValid {
+                    if KMMemberInfo.shared.isPermitAI {
                         self.close()
                     }
                 }
@@ -266,7 +266,7 @@ class AIPurchaseWindowController: NSWindowController, NSWindowDelegate {
             if IAPProductsManager.default().proAIProduct.isSubscribed {
                 AIInfoManager.default().activateAI(withInfo: ["receipt_str":IAPProductsManager.default().temptransactioReceipt as Any]) { dict, error in
                     self.reloadData()
-                    if AIInfoManager.default().aiInfoValid {
+                    if KMMemberInfo.shared.isPermitAI {
                         self.close()
                     }
                 }
@@ -296,7 +296,7 @@ class AIPurchaseWindowController: NSWindowController, NSWindowDelegate {
     @objc func AIDeviceStatusChangeNotification() {
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.3) {
             self.reloadData()
-            if AIInfoManager.default().aiInfoValid {
+            if KMMemberInfo.shared.isPermitAI {
                 self.close()
             }
         }

PDF Office/PDF Master/Class/AIInfo/AIUserInfoController/AIUserInfoController.swift

@@ -67,7 +67,7 @@ import Cocoa
         self.emptyContendBox.isHidden = true
         self.creditsContendBox.isHidden = true
         self.emptyShowAIBtn.isHidden = true
-        if AIInfoManager.default().aiInfoValid == true {
+        if KMMemberInfo.shared.isPermitAI == true {
             self.creditsContendBox.isHidden = false
             
             var viewRect = self.view.frame
@@ -224,7 +224,7 @@ import Cocoa
 #else
         self.emptyRestoreBtn.isHidden = true
         self.creditsRestoreBtn.isHidden = true
-        if AIInfoManager.default().aiInfoValid == true {
+        if KMMemberInfo.shared.isPermitAI == true {
             self.creditsBuyNowBox.isHidden = true
         } else {
             self.creditsBuyNowBox.isHidden = false
@@ -249,14 +249,14 @@ import Cocoa
         self.emptyContendBox.isHidden = true
         self.emptyShowAIBtn.isHidden = true
         self.creditsContendBox.isHidden = true
-        if AIInfoManager.default().aiInfoValid == true {
+        if KMMemberInfo.shared.isPermitAI == true {
             self.creditsContendBox.isHidden = false
         } else {
             self.emptyContendBox.isHidden = false
             self.emptyShowAIBtn.isHidden = false
         }
         
-        if AIInfoManager.default().aiInfoValid == true {
+        if KMMemberInfo.shared.isPermitAI == true {
             var viewRect = self.view.frame
             viewRect.size.height = 330
             self.view.frame = viewRect

PDF Office/PDF Master/Class/GuideInfo/KMFunctionGuideWindowController.swift

@@ -96,7 +96,7 @@ class KMFunctionGuideWindowController: NSWindowController {
                     if controller.currentNameKEY == controller.AIInfoKey {
 //                        var url = URL(string: AIProduct_Link)!
 //                        NSWorkspace.shared.open(url)
-                        if AIInfoManager.default().aiInfoValid {
+                        if KMMemberInfo.shared.isPermitAI {
                             self?.closeAction()
                         } else {
                             let singleTon = KMPurchaseCompareDMGWindowController.init()
@@ -118,7 +118,7 @@ class KMFunctionGuideWindowController: NSWindowController {
                     }
 #else
                     if controller.currentNameKEY == controller.AIInfoKey {
-                        if AIInfoManager.default().aiInfoValid {
+                        if KMMemberInfo.shared.isPermitAI {
                             self?.closeAction()
                         } else {
                             AIPurchaseWindowController.currentWC().showWindow(nil)

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -1578,7 +1578,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
                                         } else if dataInfo.keys.contains("ai_license") {
                                             let ai_license = dataInfo["ai_license"] as? [String]
                                             if ai_license!.count > 0 {
-                                                if !AIInfoManager.default().aiInfoValid {
+                                                if !KMMemberInfo.shared.isPermitAI {
                                                     self.verificationActivateAIInfo(license: ai_license![0])
                                                 }
 //                                                self.embeddedPaymentPopWC?.close()
@@ -1643,7 +1643,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             productID == "com.brother.pdfreaderpro.mac.product_1+com.brother.pdfreaderpro.ai.product_1" ||
             productID == "com.brother.pdfreaderpro.mac.product_3+com.brother.pdfreaderpro.ai.product_1" ||
             productID == "com.brother.pdfreaderpro.cross.platform.product_3+com.brother.pdfreaderpro.ai.product_1"{
-            if !AIInfoManager.default().aiInfoValid {
+            if !KMMemberInfo.shared.isPermitAI {
                 if self.embeddedPaymentPopWC != nil {
                     DispatchQueue.main.async { [weak self] in
                         guard let self = self else { return }

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

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

@@ -368,22 +368,33 @@ import Cocoa
     
     // 是否允许使用AI
     var isPermitAI: Bool {
-        let oldAIPoints = AIInfoManager.default().aiInfo.totalToken - AIInfoManager.default().aiInfo.usedTimes // 旧版AI点数
+//        let oldAIPoints = AIInfoManager.default().aiInfo.totalToken - AIInfoManager.default().aiInfo.usedTimes // 旧版AI点数
+//        if KMMemberInfo.shared.isLogin {
+//            if oldAIPoints > 0 {
+//                return true
+//            } else {
+//                if userScenarioType == .lite_type4 || userScenarioType == .lite_type5 || userScenarioType == .lite_type6 || userScenarioType == .lite_type12 {
+//                    if KMMemberInfo.shared.aiPoint > 0 {
+//                        return true
+//                    } else {
+//                        return false
+//                    }
+//                }
+//                return false
+//            }
+//        } else {
+//            if AIInfoManager.default().aiInfoValid && oldAIPoints > 0 {
+//                return true
+//            }
+//            return false
+//        }
         if KMMemberInfo.shared.isLogin {
-            if oldAIPoints > 0 {
+            if KMMemberInfo.shared.ai_productName != "" || AIInfoManager.default().aiInfoValid {
                 return true
-            } else {
-                if userScenarioType == .lite_type4 || userScenarioType == .lite_type5 || userScenarioType == .lite_type6 || userScenarioType == .lite_type12 {
-                    if KMMemberInfo.shared.aiPoint > 0 {
-                        return true
-                    } else {
-                        return false
-                    }
-                }
-                return false
             }
+            return false
         } else {
-            if AIInfoManager.default().aiInfoValid && oldAIPoints > 0 {
+            if AIInfoManager.default().aiInfoValid {
                 return true
             }
             return false

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

@@ -344,18 +344,19 @@ class KMUserInfoViewController: NSViewController {
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type1 {
-            lockedLabel.stringValue = NSLocalizedString("Permanent Plan", tableName: "MemberCenterLocalizable", comment: "")
-            lockedImageView.image = NSImage(named: "UpgradeImage2")
-            number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
-            number2Label.stringValue = NSLocalizedString("Advanced Version", tableName: "MemberCenterLocalizable", comment: "")
-            number1ImageView.isHidden = false
-            number1Label.isHidden = true
-            centerBackgroud.image = NSImage(named: "ButtonBackgroundImage4")
-            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")
+            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")
+            number2Label.textColor = NSColor(hex:"42464D")
+            number3Label.textColor = NSColor(hex:"42464D")
+            number4Label.textColor = NSColor(hex: "42464D")
+            number4_1Label.textColor = NSColor(hex: "42464D")
+            number5Label.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type2 {
             lockedLabel.stringValue = NSLocalizedString("Annual Plan", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -370,18 +371,19 @@ class KMUserInfoViewController: NSViewController {
             number4_1Label.textColor = NSColor(named: "FFFFFF")
             number5Label.textColor = NSColor(named: "FFFFFF")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type3 {
-            lockedLabel.stringValue = NSLocalizedString("Permanent Plan", tableName: "MemberCenterLocalizable", comment: "")
-            lockedImageView.image = NSImage(named: "UpgradeImage2")
-            number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
-            number2Label.stringValue = NSLocalizedString("Standard Version", tableName: "MemberCenterLocalizable", comment: "")
-            number1ImageView.isHidden = false
-            number1Label.isHidden = true
-            centerBackgroud.image = NSImage(named: "ButtonBackgroundImage4")
-            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")
+            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")
+            number2Label.textColor = NSColor(hex:"42464D")
+            number3Label.textColor = NSColor(hex:"42464D")
+            number4Label.textColor = NSColor(hex: "42464D")
+            number4_1Label.textColor = NSColor(hex: "42464D")
+            number5Label.textColor = NSColor(hex: "42464D")
         } else if KMMemberInfo.shared.userScenarioType == .pro_type4 {
             lockedLabel.stringValue = NSLocalizedString("Permanent Plan", tableName: "MemberCenterLocalizable", comment: "")
             lockedImageView.image = NSImage(named: "UpgradeImage2")
@@ -549,9 +551,6 @@ class KMUserInfoViewController: NSViewController {
             membershipLabel.textColor = NSColor(hex: "FCFDFF")
             lockedLabel.textColor = NSColor(hex: "FCFDFF")
             rightsBox.fillColor = NSColor(named: "7094F6_0.1") ?? .white
-//            buyBox.contentView = buyView2
-//            buyNow3ImageView.isHidden = true
-//            arrow3ImageView.image = NSImage(named: "BuyNewArrowImage2")
         }
         let platforms = viewModel.getPlatformsImages()
         if platforms.count == 4 {
@@ -586,8 +585,6 @@ class KMUserInfoViewController: NSViewController {
             guard let self = self else { return }
             if KMMemberInfo.shared.userScenarioType == .lite_type1 {
                 self.viewModel.skipCompare(.lite_Base)
-            } else if KMMemberInfo.shared.userScenarioType == .lite_type9 {
-                self.viewModel.skipCompare(.lite_MacWindows)
             }
         }
         
@@ -601,7 +598,7 @@ class KMUserInfoViewController: NSViewController {
         }
         buyNow2Box.downCallback = { [weak self](downEntered: Bool, mouseBox: KMBox, event) -> Void in
             guard let self = self else { return }
-            if KMMemberInfo.shared.userScenarioType == .lite_type1 || KMMemberInfo.shared.userScenarioType == .lite_type9 {
+            if KMMemberInfo.shared.userScenarioType == .lite_type1 {
                 self.viewModel.skipCompare(.trial)
             }
         }