【综合】转档限制调整

PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift

@@ -613,10 +613,9 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
     }
     
     @IBAction func buttonClicked_MoreConvert(_ sender: NSButton) {
-        if KMMemberInfo.shared.isMemberAllFunction == true {
-            if(KMMemberInfo.shared.isLogin == false) {
-                KMLoginWindowsController.shared.showWindow(nil)
-            }
+        if KMMemberInfo.shared.isMemberAllFunction == false {
+            KMMemberInfo.shared.advancedFunctionUsage()
+            return
         }
     }
     

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -1032,8 +1032,6 @@ import Cocoa
                         if KMMemberInfo.shared.isPermitConvert == true {
                             
                         } else {
-//                            var vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 1)
-//                            vc.showWindow(nil)
                             let userScenarioType = KMMemberInfo.shared.userScenarioType
                             let platforms = KMMemberInfo.shared.vip_platforms
                             let platformsArray = platforms

PDF Office/PDF Master/MemberCenter/KMMemberCenterConfig.swift

@@ -9,10 +9,14 @@ import Cocoa
 
 class KMMemberCenterConfig: NSObject {
     func activityBaseURL() -> String {
+#if DEBUG
         if kTestMode == 1{
             return "https://test-pdf-pro.kdan.cn"
         } else {
             return "https://pdfmaster.pdfreaderpro.com"
         }
+#else
+        return "https://pdfmaster.pdfreaderpro.com"
+#endif
     }
 }

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

@@ -1719,6 +1719,13 @@ class KMMemberCenterManager: NSObject {
     
     // MARK: Error Code
     
+    static func quickShowAlert(result: KMMemberProductResult?, callback: ((NSApplication.ModalResponse?, Any ...)->Void)?) {
+        guard let data = result else {
+            return
+        }
+        showAlert(code: .init(rawValue: data.code ?? 0), message: data.msg, callback: callback)
+    }
+    
     static func showAlert(code: KMMemberCenterErrorCodeType?, message: String?, callback: ((NSApplication.ModalResponse?, Any ...)->Void)?) {
         let string = self.getCodeMessage(code: code, message: message)
         KMMainThreadExecute {

PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -1025,11 +1025,8 @@ class KMProductCompareWC: NSWindowController {
 
     private func handleVerificationFailure(msg: KMMemberProductResult?) {
         var message = msg?.msg ?? ""
-        if msg?.code == 344 {
-            message = NSLocalizedString("The current ticket has created an order.", tableName: "MemberCenterLocalizable", comment: "")
-        }
         if !message.isEmpty {
-            showAlert(message: message)
+            KMMemberCenterManager.quickShowAlert(result: msg, callback: nil)
         }
     }