【转档工具】- 优化

PDF Office/PDF Master/Class/Batch/View/KMBatchoperateConvertCollectionViewItem.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/Class/Batch/View/KMConvertCollectionViewHeader.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateBaseWindowController.swift

@@ -71,18 +71,18 @@ class KMBatchOperateBaseWindowController: NSWindowController{
     func switchToConvertType(convertType: KMConvertWithPDFType) {
         (self.contentViewController as! KMBatchOperateSplitViewController).switchToConvertType(convertType)
     }
-//    func watermarkInterfaceSelectWatermark(watermark: KMPDFWatermarkData) {
-//        (self.contentViewController as! KMBatchOperateSplitViewController).watermarkInterfaceSelectWatermark(watermark: watermark)
-//    }
-//    func backgroundInterfaceSelectBackGround(background: KMBackgroundObject) {
-//        (self.contentViewController as! KMBatchOperateSplitViewController).backgroundInterfaceSelectBackGround(background: background)
-//    }
-//    func headerFooterInterfaceSelectHeaderFooter(headerFooter: KMHeaderFooterObject) {
-//        (self.contentViewController as! KMBatchOperateSplitViewController).headerFooterInterfaceSelectHeaderFooter(headerFooter: headerFooter)
-//    }
-//    func batesInterfaceSelectBates(headerFooter: KMHeaderFooterObject) {
-//        (self.contentViewController as! KMBatchOperateSplitViewController).headerFooterInterfaceSelectHeaderFooter(headerFooter: headerFooter)
-//    }
+    func watermarkInterfaceSelectWatermark(watermark: KMPDFWatermarkData) {
+        (self.contentViewController as! KMBatchOperateSplitViewController).watermarkInterfaceSelectWatermark(watermark)
+    }
+    func backgroundInterfaceSelectBackGround(background: KMBackgroundObject) {
+        (self.contentViewController as! KMBatchOperateSplitViewController).backgroundInterfaceSelectBackground(background)
+    }
+    func headerFooterInterfaceSelectHeaderFooter(headerFooter: KMHeaderFooterObject) {
+        (self.contentViewController as! KMBatchOperateSplitViewController).headerFooterInterfaceSelectHeaderFooter(headerFooter)
+    }
+    func batesInterfaceSelectBates(headerFooter: KMHeaderFooterObject) {
+        (self.contentViewController as! KMBatchOperateSplitViewController).headerFooterInterfaceSelectHeaderFooter(headerFooter)
+    }
     
     
     

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateSplitViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

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

@@ -370,20 +370,20 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController,NSCo
     }
     
     func convertActionVC() {
-//        KMToolCompareWindowController *vc = nil;
+        var vc: KMToolCompareWindowController? = nil
         if(.WordStandard == self.convertType ||
             .WordAdvance == self.convertType) {
-//             vc = [KMToolCompareWindowController toolCompareWithType:KMCompareWithToolType_Convert setSelectIndex:1];
+            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 1)
         } else if (.Excel == self.convertType) {
-//            vc = [KMToolCompareWindowController toolCompareWithType:KMCompareWithToolType_Convert setSelectIndex:2];
+            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 2)
         } else if (.PowerPoint == self.convertType) {
-//            vc = [KMToolCompareWindowController toolCompareWithType:KMCompareWithToolType_Convert setSelectIndex:3];
+            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 3)
         } else if (self.convertType == .JPG || self.convertType == .PNG || self.convertType == .GIF || self.convertType == .TIFF || self.convertType == .TGA || self.convertType == .BMP){
-//             vc = [KMToolCompareWindowController toolCompareWithType:KMCompareWithToolType_Convert setSelectIndex:4];
+            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 4)
         } else {
-//             vc = [KMToolCompareWindowController toolCompareWithType:KMCompareWithToolType_Convert setSelectIndex:0];
+            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 0)
         }
-//        [vc showWindow:nil];
+        vc?.showWindow(nil)
     }
     func prepareData() {
         let arr: [KMConvertWithPDFType] = [.Excel, .PowerPoint, .RTF, .CSV, .CSV, .HTML, .Text, .JPEG, .JPG, .PNG, .GIF, .TIFF, .TGA, .BMP, .JPEG2000]

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -744,7 +744,7 @@ class KMConvertWindowController: NSWindowController, NSTextFieldDelegate, NSWind
         //    #endif
         
         self.showWaitting()
-        var pages = NSMutableArray()
+        let pages = NSMutableArray()
         DispatchQueue.global(qos: .background).async {
             let filePath = kConvertFileSavePath
             if self.prePDFView.document.write(toFile: kConvertFileSavePath) {

PDF Office/PDF Master/Class/PDFTools/Watermark/Controller/KMBatchOperateAddWatermarkViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>

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

@@ -2606,13 +2606,13 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 #endif
 
                 
-                if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    guard let _url =  KMTools.saveWatermarkDocumentToTemp(document: self.listView.document, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
-                        return
-                    }
-                    self.showConvertWindow(type: type, documentUrl: _url, identifier: identifier)
-                    return
-                }
+//                if await (KMLightMemberManager.manager.canPayFunction() == false) {
+//                    guard let _url =  KMTools.saveWatermarkDocumentToTemp(document: self.listView.document, secureOptions: self.secureOptions, removePWD: self.removeSecureFlag) else {
+//                        return
+//                    }
+//                    self.showConvertWindow(type: type, documentUrl: _url, identifier: identifier)
+//                    return
+//                }
                 
                 if (self.needSaveDocument()) {
                     self.saveDocumentWithProgressAlert {  [unowned self] params in