【订阅】编辑主页去除比较表界面

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

@@ -602,13 +602,6 @@ extension KMMainViewController {
     
     @objc func menuItemAnnotationClick_addStype(sender: NSMenuItem) {
         Task { @MainActor in
-            if (sender.tag == 7 || sender.tag == 8 || sender.tag == 9) {
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    let _ = KMComparativeTableViewController.show(window: self.view.window!)
-                    return
-                }
-            }
-            
             var point = mouseRightMenuEvent?.locationInWindow
             if (point == nil) {
                 point = NSZeroPoint
@@ -2235,10 +2228,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
 //            return
 //        }
         Task { @MainActor in
-            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                let _ = KMComparativeTableViewController.show(window: self.view.window!, .shareFlatten)
-                return
-            }
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
                 KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {
@@ -2372,51 +2361,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         
         Task { @MainActor in
             if (type == .compress) { /// 压缩
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    let _ = KMComparativeTableViewController.show(window: self.view.window!, .compress)
-                    
-                    self.toolbarController.cancelSelected(KMToolbarToolCompressItemIdentifier)
-                    return
-                    
-                }
-                
-                if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true, type: .compress) { isSubscribeSuccess, isWaterMarkExport, isClose in
-                        if (isClose) {
-                            return
-                        }
-                        if (isSubscribeSuccess) {
-                            self.showCompressWindow()
-                            return
-                        }
-                        if (isWaterMarkExport) {
-                            DispatchQueue.main.async {
-                                NSPanel.savePanel(self.view.window!, panel:{ panel in
-                                    panel.directoryURL = self.document?.documentURL.deletingLastPathComponent()
-                                    panel.nameFieldStringValue = (self.document?.documentURL.lastPathComponent)!
-                                }) { response, url in
-                                    if (response == .cancel) {
-                                        return
-                                    }
-                                    guard let _url = KMTools.saveWatermarkDocument(document: self.document!, to: url!, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
-                                        return
-                                    }
-                                    self.showCompressWindow(url: _url)
-                                }
-                            }
-                            return
-                        }
-                    }
-                    return
-                }
-                
-                if (self.needSaveDocument()) {                
-                    self.saveDocumentWithProgressAlert { [unowned self] params in
-                        self.showCompressWindow()
-                    }
-                    return
-                }
-                
                 self.showCompressWindow()
                 return
             }
@@ -2441,18 +2385,9 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     identifier = KMToolbarConversionImageItemIdentifier
                 }
                 
-//                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-//                    if (identifier != nil) {
-//                        self.toolbarController.cancelSelected(identifier!)
-//                    }
-//
-//                    let _ = KMComparativeTableViewController.show(window: self.view.window!, .convert)
-//                    return
-//                }
-                
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
                     let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true, type: type.toSubscribeWaterMarkType()) { isSubscribeSuccess, isWaterMarkExport, isClose in
-                        if (isClose) {
+                        if (isClose || isWaterMarkExport) {
                             return
                         }
                         if (isSubscribeSuccess) {
@@ -2495,13 +2430,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             }
             
             if (type == .merge) { /// 合并
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    let _ = KMComparativeTableViewController.show(window: self.view.window!, .merge)
-                    
-                    self.toolbarController.cancelSelected(KMToolbarToolMergeItemIdentifier)
-                    return
-                }
-                
                 if (self.listView.document.allowsCopying == false || self.listView.document.allowsPrinting == false) {
                     if await (KMLightMemberManager.manager.canPayFunction() == false) {
                         //FIXME: 方案待确认，先不处理保存
@@ -2567,36 +2495,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     return
                 }
                 
-//                if await (KMLightMemberManager.manager.canPayFunction() == false) {
-//                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true, type: .merge) { isSubscribeSuccess, isWaterMarkExport, isClose in
-//                        if (isClose) {
-//                            return
-//                        }
-//                        if (isSubscribeSuccess) {
-//                            self.showMergeWindow(self.listView.document.password)
-//                            return
-//                        }
-//                        if (isWaterMarkExport) {
-//                            DispatchQueue.main.async {
-//                                NSPanel.savePanel(self.view.window!, panel:{ panel in
-//                                    panel.directoryURL = self.document?.documentURL.deletingLastPathComponent()
-//                                    panel.nameFieldStringValue = (self.document?.documentURL.lastPathComponent)!
-//                                }) { response, url in
-//                                    if (response == .cancel) {
-//                                        return
-//                                    }
-//                                    guard let _url = KMTools.saveWatermarkDocument(document: self.document!, to: url!, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
-//                                        return
-//                                    }
-//                                    self.showMergeWindow(url: _url, self.listView.document.password)
-//                                }
-//                            }
-//                            return
-//                        }
-//                    }
-//                    return
-//                }
-                
                 if (self.needSaveDocument()) {
                     self.saveDocumentWithProgressAlert { [unowned self] params in
                         self.showMergeWindow(self.listView.document.password)
@@ -2608,10 +2506,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             }
             
             if (type == .crop) {
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    let _ = KMComparativeTableViewController.show(window: self.view.window!, .crop)
-                    return
-                }
                 self.recordSaveWatermarkFlag(type: .crop)
                 
                 if (index == 1) {
@@ -2861,11 +2755,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     return
                 }
             } else if (type == .secure) { /// 安全
-                if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
-                    let _ = KMComparativeTableViewController.show(window: self.view.window!, .secure)
-                    return
-                }
-                
                 if (index == 1) { /// 设置密码
                     if (!self.listView.document!.allowsCopying || !self.listView.document!.allowsPrinting) {
                         KMPasswordInputWindow.openWindow(window: self.view.window!, type: .owner, url: self.listView.document.documentURL) { [weak self]  result, password in