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

PDF Office/PDF Master/Class/Batch/Operation/KMBatchConvertOperation.swift

@@ -265,7 +265,9 @@ class KMBatchConvertOperation: KMBatchOperation, CPDFConverterDelegate, CPDFConv
         }else {
             self.delegate?.fileOperateSuccessed?(self.operateFile!, info: (self.operateFile?.currentConvertParameter!)!)
         }
-        self.converter?.delegate = nil
+        if self.converter != nil && self.converter?.delegate != nil {
+            self.converter?.delegate = nil
+        }
         willChangeValue(forKey: "isFinished")
         hasFinished = true
         didChangeValue(forKey: "isFinished")

PDF Office/PDF Master/Class/PDFTools/Compare/View/KMCompareView.swift

@@ -132,6 +132,10 @@ class KMCompareView: KMBaseXibView {
         config.fileOldAttribute.password = password
     }
     
+    override func addNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(pageChangeNotification), name: NSNotification.Name.PDFViewPageChanged, object: nil)
+    }
+    
     override func setup() {
         fileQKNewSelectedBox.delegate = self
         oldFileQKSelectedBox.delegate = self
@@ -283,6 +287,11 @@ class KMCompareView: KMBaseXibView {
         self.updatePageState()
         self.updatePageState(isNew: true)
     }
+    
+    @objc func pageChangeNotification(notification: Notification) {
+        self.updatePageState()
+        self.updatePageState(isNew: true)
+    }
 }
 
 extension KMCompareView {

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/Common/KMPDFConvert.swift

@@ -346,7 +346,9 @@ class KMPDFConvert: Operation {
     func convertSuccessful(isSuccessful: Bool, errorInfo: Error!) {
         self.isSuccessful = isSuccessful
         self.errorInfo = errorInfo
-        self.converter.delegate = nil
+        if self.converter != nil && self.converter.delegate != nil{
+            self.converter.delegate = nil
+        }
         DispatchQueue.main.async { [self] in
             
             guard let callbackBlock = callback else {

PDF Office/PDF Master/Class/PDFTools/Watermark/New/View/KMWatermarkView.swift

@@ -827,22 +827,23 @@ extension KMWatermarkView {
 
         watermark.pagesString = pages.isEmpty ? "" : pages.map { "\($0)" }.joined(separator: ",")
         
-        if self.type == .edit || self.type == .add {
-            if needSave {
-                if self.templateNameTextField.stringValue.isEmpty {
-                    self.watermark.watermarkID = KMWatermarkManager.defaultManager.fetchAvailableName()
-                } else {
-                    self.watermark.watermarkID = self.templateNameTextField.stringValue
-                }
-                
-                if KMWatermarkManager.defaultManager.watermarks.contains(self.originalWatermark) {
-                    let _ = KMWatermarkManager.defaultManager.removeWatermark(watermark: self.originalWatermark)
-                    let _ = KMWatermarkManager.defaultManager.addWatermark(watermark: self.watermark)
-                } else {
-                    let _ = KMWatermarkManager.defaultManager.addWatermark(watermark: self.watermark)
-                }
+        
+        if needSave {
+            if self.templateNameTextField.stringValue.isEmpty {
+                self.watermark.watermarkID = KMWatermarkManager.defaultManager.fetchAvailableName()
+            } else {
+                self.watermark.watermarkID = self.templateNameTextField.stringValue
             }
             
+            if KMWatermarkManager.defaultManager.watermarks.contains(self.originalWatermark) {
+                let _ = KMWatermarkManager.defaultManager.removeWatermark(watermark: self.originalWatermark)
+                let _ = KMWatermarkManager.defaultManager.addWatermark(watermark: self.watermark)
+            } else {
+                let _ = KMWatermarkManager.defaultManager.addWatermark(watermark: self.watermark)
+            }
+        }
+        
+        if self.type == .edit || self.type == .add {
             if let operateCallBack = self.operateCallBack {
                 operateCallBack(self.watermark, currentType)
             }