Browse Source

【优化】禅道crash修复(尝试修复)
PDF_Reader_Pro.KMQucikToolsModel.iconImage(Swift.Bool) -> __C.NSImage
https://appcenter.ms/users/support-pdfreaderpro.com/apps/PDF-Reader-Pro-DMG/crashes/errors/193087323u/reports/2516788773490009999-e924670e-23f2-4b14-a1d7-926ce7fcf689/threads

lizhe 7 months ago
parent
commit
f4f1653f13

+ 13 - 15
PDF Office/PDF Master/Class/Home/View/HomeContentView/QucikTools/View/KMQucikToolCollectionViewItem.swift

@@ -97,38 +97,36 @@ class KMQucikToolCollectionViewItem: NSCollectionViewItem {
         self.subTitleLabel.textColor = KMAppearance.Layout.h1Color()
         self.contentBox.fillColor = KMAppearance.Layout.l1Color()
         self.contentBox.moveCallback = { [unowned self] mouseEntered, mouseBox in
+            guard let model = self.model else { return }
             if (mouseEntered) {
                 self.contentBox.fillColor = KMAppearance.Interactive.a0Color()
                 self.titleLabel.textColor = KMAppearance.Layout.w0Color()
                 self.subTitleLabel.textColor = KMAppearance.Layout.w70Color()
-                self.iconImageView.image = model?.iconImage(true)
-                
-                guard let model = self.model else { return }
+                self.iconImageView.image = model.iconImage(true)
                 self.handleView.isHidden = !model.canAdd()
             } else {
                 self.contentBox.fillColor = KMAppearance.Layout.l1Color()
                 self.titleLabel.textColor = KMAppearance.Layout.h0Color()
                 self.subTitleLabel.textColor = KMAppearance.Layout.h1Color()
-                self.iconImageView.image = model?.iconImage(false)
+                self.iconImageView.image = model.iconImage(false)
                 
                 self.handleView.isHidden = true
             }
         }
         
         self.contentBox.downCallback = { [unowned self] downEntered, mouseBox, event in
+            guard let model = self.model else { return }
             if downEntered {
-                if model != nil {
-                    if model?.type == .FileCompare {
-                        model?.isNew = false
-                        UserDefaults.standard.setValue(true, forKey: "QucikToolsModelFileCompareKey")
-                        UserDefaults.standard.synchronize()
-                    } else if model?.type == .AITools {
-                        model?.isNew = false
-                        UserDefaults.standard.setValue(true, forKey: "QucikToolsModelAIToolsKey")
-                        UserDefaults.standard.synchronize()
-                    }
+                if model.type == .FileCompare {
+                    model.isNew = false
+                    UserDefaults.standard.setValue(true, forKey: "QucikToolsModelFileCompareKey")
+                    UserDefaults.standard.synchronize()
+                } else if model.type == .AITools {
+                    model.isNew = false
+                    UserDefaults.standard.setValue(true, forKey: "QucikToolsModelAIToolsKey")
+                    UserDefaults.standard.synchronize()
                 }
-                self.downAction?(self, model!)
+                self.downAction?(self, model)
                 self.reloadData()
             }
         }