【订阅】权益弹窗弹出文案调整

PDF Office/PDF Master/AppDelegate.swift

@@ -314,7 +314,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // 有使用付费功能
         Task { @MainActor in
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMSubscribeWaterMarkWindowController.show_continue(window: NSApp.mainWindow!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                let _ = KMSubscribeWaterMarkWindowController.show(window: NSApp.mainWindow!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -979,7 +979,7 @@ extension KMHomeViewController {
             }
             
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+UI.swift

@@ -179,7 +179,7 @@ extension KMHomeViewController {
                 return
             }
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }
@@ -216,7 +216,7 @@ extension KMHomeViewController {
             }
             
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -36,101 +36,17 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
     }
     
     //MARK: 打开文件
-    static func show(window: NSWindow, completion: @escaping (_ isSubscribeSuccess: Bool, _ isWaterMarkExport: Bool, _ isClose: Bool) -> Void) -> KMSubscribeWaterMarkWindowController {
+    static func show(window: NSWindow, isContinue: Bool = false, completion: @escaping (_ isSubscribeSuccess: Bool, _ isWaterMarkExport: Bool, _ isClose: Bool) -> Void) -> KMSubscribeWaterMarkWindowController {
         let subscribeWaterMarkWindowController: KMSubscribeWaterMarkWindowController = KMSubscribeWaterMarkWindowController.init(windowNibName: "KMSubscribeWaterMarkWindowController")
         window.beginSheet(subscribeWaterMarkWindowController.window!)
         subscribeWaterMarkWindowController.window?.center()
         
-        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("带水印保存", comment: "")
-        
-        subscribeWaterMarkWindowController.closeAction = { controller in
-            completion(false, false, true)
-            subscribeWaterMarkMainWindow?.endSheet(controller.window!)
-            controller.window?.close()
-            
-            subscribeWaterMarkController = nil
-            subscribeWaterMarkMainWindow = nil
-        }
-        
-        subscribeWaterMarkWindowController.watermarkExportAction = { controller in
-            completion(false, true, false)
-            subscribeWaterMarkMainWindow?.endSheet(controller.window!)
-            controller.window?.close()
-            subscribeWaterMarkController = nil
-            subscribeWaterMarkMainWindow = nil
-        }
-        
-        subscribeWaterMarkWindowController.subscribeAction = { controller in
-            KMPrint("购买")
-            controller.waterMarkView.beginLoading(backgroundColor: NSColor.black.withAlphaComponent(0.2))
-            KMPurchaseManager.manager.purchaseProduct(productIdentifier: PRODUCT_1) { isSuccess, error in
-                if isSuccess {
-                    KMPrint("购买成功")
-                    subscribeWaterMarkMainWindow?.endSheet(controller.window!)
-                    controller.window?.close()
-                    subscribeWaterMarkController = nil
-                    subscribeWaterMarkMainWindow = nil
-                    
-                    DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1) {
-                        if NSApp.mainWindow != nil {
-                            let controller = KMSubscribeSuccessWindowController.show(window: NSApp.mainWindow!)
-                            controller.closeAction = { controller in
-                                controller.closeWindow()
-                                completion(true, false, false)
-                            }
-                        }
-                    }
-                } else {
-                    KMPrint("购买失败")
-                    controller.purchasefailed()
-                    completion(false, false, false)
-                }
-                
-                controller.waterMarkView.endLoading()
-            }
-        }
-        
-        subscribeWaterMarkWindowController.restoreAction = { controller in
-            KMPrint("restore")
-            controller.waterMarkView.beginLoading(backgroundColor: NSColor.black.withAlphaComponent(0.2))
-            KMPurchaseManager.manager.restorePurchases { isSuccess in
-                if isSuccess {
-                    KMPrint("restore成功")
-                    subscribeWaterMarkMainWindow?.endSheet(controller.window!)
-                    controller.window?.close()
-                    subscribeWaterMarkController = nil
-                    subscribeWaterMarkMainWindow = nil
-                    
-                    if NSApp.mainWindow != nil {
-                        let controller = KMSubscribeSuccessWindowController.show(window: NSApp.mainWindow!)
-                        controller.closeAction = { controller in
-                            controller.closeWindow()
-                            completion(true, false, false)
-                        }
-                    }
-                } else {
-                    KMPrint("restore失败")
-                    controller.purchasefailed()
-                    completion(false, false, false)
-                }
-                controller.waterMarkView.endLoading()
-            }
+        if isContinue {
+            subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Continue", comment: "")
+        } else {
+            subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("带水印保存", comment: "")
         }
         
-        subscribeWaterMarkController = subscribeWaterMarkWindowController
-        subscribeWaterMarkMainWindow = window
-        return subscribeWaterMarkWindowController
-    }
-    
-    //MARK: - 打开文件
-    
-    static func show_continue(window: NSWindow, completion: @escaping (_ isSubscribeSuccess: Bool, _ isWaterMarkExport: Bool, _ isClose: Bool) -> Void) -> KMSubscribeWaterMarkWindowController {
-        let subscribeWaterMarkWindowController: KMSubscribeWaterMarkWindowController = KMSubscribeWaterMarkWindowController.init(windowNibName: "KMSubscribeWaterMarkWindowController")
-        window.beginSheet(subscribeWaterMarkWindowController.window!)
-        subscribeWaterMarkWindowController.window?.center()
-        
-        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Continue", comment: "")
-        
         subscribeWaterMarkWindowController.closeAction = { controller in
             completion(false, false, true)
             subscribeWaterMarkMainWindow?.endSheet(controller.window!)

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -366,7 +366,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
                 return
             }
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/Base/KMPDFThumbViewBaseController.swift

@@ -333,7 +333,7 @@ class KMPDFThumbViewBaseController: KMBaseViewController {
                 return
             }
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }

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

@@ -2175,7 +2175,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         }
         Task { @MainActor in
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }
@@ -2201,7 +2201,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         }
         Task { @MainActor in
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }
@@ -2227,7 +2227,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         }
         Task { @MainActor in
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
                         return
                     }
@@ -2329,7 +2329,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 }
                 
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                         if (isClose) {
                             return
                         }
@@ -2399,7 +2399,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 }
                 
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                         if (isClose) {
                             return
                         }
@@ -2454,7 +2454,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     if await (KMLightMemberManager.manager.canPayFunction() == false) {
                         //FIXME: 方案待确认，先不处理保存
 //                        self.showMergeWindow(password)
-                        let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                        let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                             if (isClose) {
                                 return
                             }
@@ -2516,7 +2516,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 }
                 
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    let _ = KMSubscribeWaterMarkWindowController.show_continue(window: self.view.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                         if (isClose) {
                             return
                         }