Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/Batch/Tools/KMImageToPDFMethod.swift

@@ -194,7 +194,7 @@ class KMImageToPDFMethod: NSObject, KMGOCRManagerDelegate {
                     }
                 } else {
                     DispatchQueue.main.async {
-                        complete(path, self.errorArray as! Array<Any>, self.errorOCRArray as! Array<Any>)
+                        complete(newpath, self.errorArray as! Array<Any>, self.errorOCRArray as! Array<Any>)
                     }
                 }
 //            }

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

@@ -46,7 +46,7 @@ class KMBatchOperateCompressViewController: KMBatchOperateBaseViewController{
             super.interfaceStatus = newValue
             if newValue == .PrepareProcess {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
-                    var files = NSMutableArray()
+                    let files = NSMutableArray()
                     for url in self.successFilePathURLArray! {
                         if FileManager.default.fileExists(atPath: url.path) {
                             files.add(url)

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

@@ -41,7 +41,7 @@ class KMBatchOperateImageToPDFViewController: KMBatchOperateBaseViewController,
             super.interfaceStatus = newValue
             if newValue == .PrepareProcess {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
-                    var files = NSMutableArray()
+                    let files = NSMutableArray()
                     for url in self.successFilePathURLArray! {
                         if FileManager.default.fileExists(atPath: url.path) {
                             files.add(url)

PDF Office/PDF Master/Class/Home/View/HomeContentView/KMHomeContentView.swift

@@ -222,6 +222,7 @@ extension KMHomeContentView {
 
                     homeQuickToolsWindowController.dataChange = { [unowned self] controller in
                         self.qucikToolsView.reloadData()
+                        self.updatePageLabel()
                     }
                 }
                 

PDF Office/PDF Master/Class/PDFTools/OCRNew/Controller/KMOCRPDFWindowController.swift

@@ -97,7 +97,7 @@ class KMOCRPDFWindowController: NSWindowController, NSWindowDelegate, KMGOCRMana
         self.pdfDocument = cpdfDocument
         self.password = pwd ?? ""
         let url: URL? = cpdfDocument.documentURL
-        var lastPathComponent = url?.deletingPathExtension()
+        let lastPathComponent = url?.deletingPathExtension()
         if let str = lastPathComponent?.lastPathComponent {
             if str.count > 0 {
                 self.pathFile = str
@@ -110,7 +110,11 @@ class KMOCRPDFWindowController: NSWindowController, NSWindowDelegate, KMGOCRMana
         
         self._fileAttri = KMFileAttribute()
         self._fileAttri?.password = self.pdfDocument?.password ?? ""
-        self._fileAttri?.filePath = self.pdfDocument?.documentURL.path ?? ""
+        if self.pdfDocument?.documentURL != nil && self.pdfDocument?.documentURL.path != nil{
+            self._fileAttri?.filePath = self.pdfDocument?.documentURL.path ?? ""
+        }else {
+            self._fileAttri?.filePath = ""
+        }
     }
     
     convenience init(filePath: String, pwd: String?) {

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

@@ -1035,16 +1035,8 @@ extension KMBatchOperateAddWatermarkViewController: NSCollectionViewDelegate, NS
             }
             for i in 0 ..< self.files!.count {
                 let file = self.files![i]
-//                file.addBackgroundInfo.pageChoice = background.pageRangeType;
-//                if (file.addBackgroundInfo.pageChoice == KMBatchOperatePageChoice_Input) {
-//                    NSArray *arr = [self allPageNumbers:background.pagesString];
-//                    NSArray *sortedArray = [file pagesArrayIntersectWithArray:arr];
-//                    if (sortedArray.count < 1) {
-//                        file.addBackgroundInfo.pageChoice = KMBatchOperatePageChoice_All;
-//                    } else {
-//                        file.addBackgroundInfo.pageRangeString = [sortedArray componentsJoinedByString:@","];
-//                    }
-//                }
+                file.addBackgroundInfo.pageChoice = KMBatchOperatePageChoice.init(rawValue: (background?.pageRangeType.rawValue)!)!
+                file.addBackgroundInfo.pageRangeString = background?.pageRangeString
             }
       
         } else {
@@ -1059,7 +1051,8 @@ extension KMBatchOperateAddWatermarkViewController: NSCollectionViewDelegate, NS
             
             for i in 0 ..< self.files!.count {
                 let file = self.files![i]
-//                file.addWatermarkInfo.pageChoice = waterMark.pageRangeType;
+                file.addWatermarkInfo.pageChoice = KMBatchOperatePageChoice.init(rawValue: (waterMark?.pageRangeType.rawValue)!)!
+                file.addWatermarkInfo.pageRangeString = waterMark?.pageRangeString
 //                if (file.addWatermarkInfo.pageChoice == KMBatchOperatePageChoice_Input) {
 //                    NSArray *arr = [self allPageNumbers:waterMark.pagesString];
 //                    NSArray *sortedArray = [file pagesArrayIntersectWithArray:arr];

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -28036,5 +28036,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "808F2AF8-E3D3-415A-A4D1-90A8DBB2D229"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/View/HomeContentView/KMHomeContentView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "175"
+            endingLineNumber = "175"
+            landmarkName = "reloadData()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "869D733D-71E1-4AF7-956C-FAB490CE1918"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/View/HomeContentView/KMHomeContentView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "224"
+            endingLineNumber = "224"
+            landmarkName = "moreButtonAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>