Browse Source

【综合】AppCenter Crash问题规避

tangchao 6 months ago
parent
commit
e0fb467d48

+ 9 - 10
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -246,7 +246,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         self.initData()
 //        self.reloadData()
         self.updateLanguage()
-        self.updatePreviewImage()
+//        self.updatePreviewImage()
         self.updateUI()
         
         self.headerBox.isHidden = true
@@ -797,7 +797,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
                 self.alignment = alignment
                 self.selectAlignment(alignment: alignment)
                 
-                self.updatePreviewImage()
+//                self.updatePreviewImage()
                 
                 let opacity = self.listView.opacity(for: areas as? CPDFEditArea)
                 let sliderView = self.opacityBox.contentView as? KMSliderItemView
@@ -959,7 +959,7 @@ extension KMEditPDFTextPropertyViewController {
         } else {
             KMEditPDFTextManager.manager.setCommonlyFontColor(color: self.currentColor)
         }
-        self.updatePreviewImage()
+//        self.updatePreviewImage()
     }
     
     @objc func fontBoldAction(_ sender: AnyObject) {
@@ -1053,9 +1053,8 @@ extension KMEditPDFTextPropertyViewController {
         self.updateAlignment(alignment: .left)
         if let _ = sender {
             KMEditPDFPopToolBarWindow.shared.updateTextAlign(align: .left)
+            self._trackEvent()
         }
-        
-        self._trackEvent()
     }
     
     @objc func centerAlignmentAction(sender: NSButton?) {
@@ -1204,7 +1203,7 @@ extension KMEditPDFTextPropertyViewController {
                 KMEditPDFTextManager.manager.setFontAlignment(alignment: alignment)
             }
             self.alignment = alignment
-            self.updatePreviewImage()
+//            self.updatePreviewImage()
         }
     }
     
@@ -1245,7 +1244,7 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
             self.updateTextPresupposition(type: type)
         } else if obj == fontNameVC {
             self.updateFontNameAndStyle(name: obj.stringValue, style: fontStyle)
-            self.updatePreviewImage()
+//            self.updatePreviewImage()
             let win = KMEditPDFPopToolBarWindow.shared
             if win.isVisible {
                 (win.contentViewController as? KMEditPDFPopToolBarController)?.toolbarView?.reloadData()
@@ -1253,12 +1252,12 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
         } else if obj == fontSizeVC {
             let size = CGFloat(Float((obj.stringValue.replacingOccurrences(of: "pt", with: "")))!)
             self.updateFontSize(size: size)
-            self.updatePreviewImage()
+//            self.updatePreviewImage()
             
             KMEditPDFPopToolBarWindow.shared.updateFontSizeButtons(enable: true)
         } else if obj == fontStyleVC {
             self.updateFontNameAndStyle(name: fontName, style: obj.stringValue)
-            self.updatePreviewImage()
+//            self.updatePreviewImage()
         } else if obj == self.opacitVC {
             let stringValue = self.opacitVC?.stringValue ?? ""
             let value = (stringValue.components(separatedBy: "%").first?.stringToCGFloat() ?? 0) / 100
@@ -1396,7 +1395,7 @@ extension KMEditPDFTextPropertyViewController {
         
         self.updateFontNameAndStyle(name: fontName, style: style, needChangeListView: needChangeListView, needSave: false)
         self.updateFontSize(size: size, needChangeListView: needChangeListView, needSave: false)
-        self.updatePreviewImage()
+//        self.updatePreviewImage()
     }
     
     func resetTextPresuppositionData() {

+ 2 - 5
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -1283,10 +1283,6 @@ import Cocoa
     // MARK: - Toolbar
     
     func toolbarItemClickForExitMode(_ toolbarItem: KMToolbarItemView) {
-        if toolbarItem.itemIdentifier != KMDocumentEditToolbarItemIdentifier {
-            self.commitEditingIfNeed()
-        }
-        
         if(toolbarItem.itemIdentifier != KMDocumentPageToolbarItemIdentifier) {
             if (hasEnterPageEdit()) {
                 self.exitPageEdit()
@@ -1303,7 +1299,8 @@ import Cocoa
             }
         }
         if toolbarItem.itemIdentifier != KMDocumentEditToolbarItemIdentifier && toolbarItem.itemIdentifier != KMRightControlToolbarItemIdentifier && toolbarItem.itemIdentifier != KMLeftControlToolbarItemIdentifier {
-            self.editPDFHanddler.clearData()
+//            self.editPDFHanddler.clearData()
+            self.commitEditingIfNeed()
         }
     }