Browse Source

【综合】点击编辑工具显示新手引导crash问题修复

tangchao 7 months ago
parent
commit
e72d7ca0b1

+ 10 - 4
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -855,7 +855,7 @@ import Cocoa
             guideWC.window?.collectionBehavior = [.canJoinAllSpaces]
             guideWC.normalGuideFinishHandle = { [weak self] windowVC in
                 let rightPanelItem = self?.toolbarController.findItem(KMRightControlToolbarItemIdentifier)
-                let digitalPanelItem = self?.toolbarController.findItem(KMDocumentDigitalSignToolbarItemIdentifier)
+                let digitalPanelItem = self?.toolbarController.findItem(KMDocumentSignToolbarItemIdentifier)
                                 
                 windowVC.rightPanelRect = (self?.view.window?.contentView?.convert(rightPanelItem?.frame ?? .zero, from: rightPanelItem?.superview)) ?? .zero
                 guideWC.digitalBoxRect = (self?.view.window?.contentView?.convert(digitalPanelItem?.frame ?? .zero, from: digitalPanelItem?.superview)) ?? .zero
@@ -882,7 +882,9 @@ import Cocoa
             guard let guideWC = self.guideInfoWindowController else { return }
             
             guideWC.type = .digitalSignGuide
-            let digitalPanelItem:KMToolbarItemView = self.toolbarController.findItem(KMDocumentDigitalSignToolbarItemIdentifier)!
+            guard let digitalPanelItem = self.toolbarController.findItem(KMDocumentSignToolbarItemIdentifier) else {
+                return
+            }
             guideWC.digitalBoxRect = (self.view.window?.contentView?.convert(digitalPanelItem.frame, from: digitalPanelItem.superview))!
             guideWC.window?.collectionBehavior = [.canJoinAllSpaces]
             guideWC.finishHandle = { [weak self] windowVC, type in
@@ -903,7 +905,9 @@ import Cocoa
                 
                 guideWC.type = .pdfCompareGuide
                 
-                let digitalPanelItem:KMToolbarItemView = self.toolbarController.findItem(KMDocumentDigitalSignToolbarItemIdentifier)!
+                guard let digitalPanelItem = self.toolbarController.findItem(KMDocumentSignToolbarItemIdentifier) else {
+                    return
+                }
                 guideWC.digitalBoxRect = (self.view.window?.contentView?.convert(digitalPanelItem.frame, from: digitalPanelItem.superview))!
                 
                 let compareItem:KMToolbarItemView = self.toolbarController.findItem(KMToolbarComparisonItemIdentifier)!
@@ -924,7 +928,9 @@ import Cocoa
                 guard let guideWC = self.guideInfoWindowController else { return }
                 
                 guideWC.type = .convertGuide
-                let digitalPanelItem:KMToolbarItemView = self.toolbarController.findItem(KMDocumentDigitalSignToolbarItemIdentifier)!
+                guard let digitalPanelItem = self.toolbarController.findItem(KMDocumentSignToolbarItemIdentifier) else {
+                    return
+                }
                 guideWC.digitalBoxRect = (self.view.window?.contentView?.convert(digitalPanelItem.frame, from: digitalPanelItem.superview))!
                 guideWC.purchaseHandle = { [weak self] windowVC in
 #if VERSION_DMG