【转档】权限弹窗文案调整

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

@@ -39,6 +39,13 @@ var subscribeWaterMarkMainWindow: NSWindow?
     case aiTranslate
     case aiRewrite
     case aiCorrect
+    
+    func isConvertType() -> Bool {
+        if (self == .toWord || self == .toExcel || self == .toPPT || self == .toRTF || self == .toCSV || self == .toHTML || self == .toText || self == .toImage) {
+            return true
+        }
+        return false
+    }
 }
 
 typealias KMSubscribeWaterMarkWindowControllerCloseAction = (_ controller: KMSubscribeWaterMarkWindowController) -> Void
@@ -151,6 +158,8 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
             } else {
                 if type == .merge {
                     subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Delete from the file list.", comment: "")
+                } else if type.isConvertType() {
+                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Convert First 10 Pages", comment: "")
                 } else {
                     subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
                 }

PDF Office/PDF Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift

@@ -56,6 +56,7 @@ class KMConvertBaseWindowController: KMBaseWindowController {
     
     var limit = true
     var oriDocumentUrl: URL?
+    var subscribeWaterMarkType: KMSubscribeWaterMarkType?
     
     deinit {
         KMPrint("KMConvertBaseWindowController 已释放")
@@ -343,26 +344,25 @@ class KMConvertBaseWindowController: KMBaseWindowController {
             return
         }
         
-//        Task { @MainActor in
-//            if await (KMLightMemberManager.manager.canPayFunction() == false) {
-//                let _ = KMSubscribeWaterMarkWindowController.show(window: self.window!) { isSubscribeSuccess, isWaterMarkExport, isClose in
-//                    if (isClose) {
-//                        return
-//                    }
-//                    if (isSubscribeSuccess) {
-//                        self._convertButtonAction()
-//                        return
-//                    }
-//                    if (isWaterMarkExport) {
-//                        self._convertButtonAction(limit: true)
-//                        return
-//                    }
-//                }
-//                return
-//            }
-//            self._convertButtonAction()
-//        }
-        self._convertButtonAction(limit: self.limit)
+        Task { @MainActor in
+            if await (KMLightMemberManager.manager.canPayFunction() == false) {
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.window!, type: self.subscribeWaterMarkType!) { isSubscribeSuccess, isWaterMarkExport, isClose in
+                    if (isClose) {
+                        return
+                    }
+                    if (isSubscribeSuccess) {
+                        self._convertButtonAction()
+                        return
+                    }
+                    if (isWaterMarkExport) {
+                        self._convertButtonAction(limit: true)
+                        return
+                    }
+                }
+                return
+            }
+            self._convertButtonAction()
+        }
     }
     
     func convertModelAppendParams(convert: KMPDFConvert) -> () {

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

@@ -1841,6 +1841,7 @@ extension KMMainViewController {
         } else if (type == .conversion_image) {
             windowController = KMConvertImageWindowController()
         }
+        windowController?.subscribeWaterMarkType = type.toSubscribeWaterMarkType()
         
         var url: URL?
         if (documentUrl != nil) {
@@ -2402,39 +2403,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     identifier = KMToolbarConversionImageItemIdentifier
                 }
                 
-//                if await (KMLightMemberManager.manager.canPayFunction() == false) {
-//                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true, type: type.toSubscribeWaterMarkType()) { isSubscribeSuccess, isWaterMarkExport, isClose in
-//                        if (isClose) {
-//                            return
-//                        }
-//                        if (isSubscribeSuccess) {
-//                            self.showConvertWindow(type: type, identifier: identifier)
-//                            return
-//                        }
-//                        if (isWaterMarkExport) {
-//                            DispatchQueue.main.async {
-//                                NSPanel.savePanel(self.view.window!, panel:{ panel in
-////                                    if (!self.my) {
-//                                    panel.directoryURL = self.document?.documentURL.deletingLastPathComponent()
-////                                    }
-//                                    
-//                                    panel.nameFieldStringValue = (self.document?.documentURL.lastPathComponent)!
-//                                }) { response, url in
-//                                    if (response == .cancel) {
-//                                        return
-//                                    }
-//                                    self.commitEditingIfNeed()
-//                                    guard let _url = KMTools.saveWatermarkDocument(document: self.document!, to: url!, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
-//                                        return
-//                                    }
-//                                    self.showConvertWindow(type: type, documentUrl: _url, identifier: identifier)
-//                                }
-//                            }
-//                            return
-//                        }
-//                    }
-//                    return
-//                }
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
                     guard let _url =  KMTools.saveWatermarkDocumentToTemp(document: self.listView.document, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
                         return