Browse Source

【综合】首页转档修复crash

tangchao 1 year ago
parent
commit
f11c96b708

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

@@ -173,19 +173,19 @@ extension KMHomeViewController {
     }
     
     func showConvertWindow(type: KMPDFConvertType) {
-        Task { @MainActor in
-            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
-                    }
-                    self.km_secure_openPanel_convert(type: type)
-                }
-                return
-            }
+//        Task { @MainActor in
+//            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
+//                    }
+//                    self.km_secure_openPanel_convert(type: type)
+//                }
+//                return
+//            }
             
             self.km_secure_openPanel_convert(type: type)
-        }
+//        }
     }
     
     func km_secure_openPanel_convert(type: KMPDFConvertType) {
@@ -327,6 +327,7 @@ extension KMHomeViewController {
         } else if (type == .image) {
             windowController = KMConvertImageWindowController()
         }
+        windowController?.subscribeWaterMarkType = type.toSubscribeWaterMarkType()
         
         let model = KMDocumentModel(url: url)
         if (password != nil) {