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

PDF Office/PDF Master/Class/AD/KMAdsWebView.swift

@@ -318,7 +318,6 @@ class KMAdsWebView: NSView, WKNavigationDelegate, CAAnimationDelegate {
             timer?.invalidate()
         }
 
-        closeButton.alphaValue = 0
     }
 
     func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {

PDF Office/PDF Master/Class/AIInfo/AIConfigWindowController/AINewConfigWindowController.swift

@@ -375,7 +375,7 @@ protocol AIConfigWindowDelegate: AnyObject {
             AIChatInfoManager.defaultManager.isAILoading = true
             
             //MARK: TestData
-//            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 13) {
+//            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 3) {
 //                DispatchQueue.main.async {
 //                    AIChatInfoManager.defaultManager.isAILoading = false
 //                    chatModel.chatResult = "AI Summary 返回的结果\nAI Summary 返回的结果\nAI Summary 返回的结果\nAI Summary 返回的结果\nAI Summary 返回的结果\nAI Summary 返回的结果\nAI Summary 返回的结果\nAI Summary 返回的结果"
@@ -384,7 +384,7 @@ protocol AIConfigWindowDelegate: AnyObject {
 //                    self.aiTypeItemView.reloadData()
 //                    self.aiInfoInputView.reloadData()
 //
-//                    DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 14) {
+//                    DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 4) {
 //                        DispatchQueue.main.async {
 //                            chatModel.chatInfoState = .stateFailed
 //                            chatModel.chatResult = "Unknown error"
@@ -411,6 +411,18 @@ protocol AIConfigWindowDelegate: AnyObject {
                     self.aiInfoInputView.reloadData()
                 }
             }
+        } else {
+            DispatchQueue.main.async {
+                AIChatInfoManager.defaultManager.isAILoading = false
+                
+                let resultStr = NSLocalizedString("File Not Exist", comment: "")
+                chatModel.chatResult = resultStr
+                chatModel.chatInfoState = .stateFailed
+                
+                self.aiChatView.reloadData()
+                self.aiTypeItemView.reloadData()
+                self.aiInfoInputView.reloadData()
+            }
         }
     }
     

PDF Office/PDF Master/Class/AIInfo/AIConfigWindowController/Views/AIChatView/AIChatView.swift

@@ -278,7 +278,7 @@ extension AIChatView: NSCollectionViewDelegateFlowLayout {
                     } else {
                         //文字
                         let height = self.sizeOfString(model.chatResult, NSFont.SFProTextRegularFont(13), 216).height
-                        return NSSize(width: CGRectGetWidth(self.collectionView.frame), height: 100+height)
+                        return NSSize(width: CGRectGetWidth(self.collectionView.frame), height: 120+height)
                     }
                 }
             }

PDF Office/PDF Master/Class/AIInfo/AIConfigWindowController/Views/AIChatView/CollectionViewItems/AIChatStringResultItem.xib

@@ -102,7 +102,7 @@
                                                 <rect key="frame" x="0.0" y="94" width="240" height="32"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Sgv-f1-xXt">
-                                                        <rect key="frame" x="12" y="5" width="15" height="15"/>
+                                                        <rect key="frame" x="12" y="9" width="15" height="15"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="15" id="Ich-sQ-Dy4"/>
                                                             <constraint firstAttribute="width" constant="15" id="RWC-iq-IHu"/>
@@ -126,7 +126,7 @@
                                                     <constraint firstItem="5bn-kF-Wge" firstAttribute="top" secondItem="Z4d-F0-7S2" secondAttribute="top" constant="8" id="BAk-MH-BFI"/>
                                                     <constraint firstItem="5bn-kF-Wge" firstAttribute="leading" secondItem="Sgv-f1-xXt" secondAttribute="trailing" constant="4" id="KBy-ZU-aQq"/>
                                                     <constraint firstAttribute="bottom" secondItem="5bn-kF-Wge" secondAttribute="bottom" constant="8" id="KyK-1T-e9t"/>
-                                                    <constraint firstItem="Sgv-f1-xXt" firstAttribute="top" secondItem="Z4d-F0-7S2" secondAttribute="top" constant="12" id="OPQ-7S-NJS"/>
+                                                    <constraint firstItem="Sgv-f1-xXt" firstAttribute="top" secondItem="Z4d-F0-7S2" secondAttribute="top" constant="8" id="OPQ-7S-NJS"/>
                                                 </constraints>
                                             </customView>
                                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X0X-oC-au4">

PDF Office/PDF Master/Class/AIInfo/AIConfigWindowController/Views/AIHeaderView/AIHeaderView.swift

@@ -68,7 +68,7 @@ class AIHeaderView: NSView, NibLoadable {
         }
         
         controller.enterLicenseHandle = { vc in
-            let verifyVC = KMVerificationWindowController.verification(with: .activateExpired)
+            let verifyVC = KMVerificationWindowController.verification(with: .activateAIInfo)
             verifyVC?.callback = {
                 KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
             }

PDF Office/PDF Master/Class/AIInfo/AIConfigWindowController/Views/AITypeItemChooseView/AITypeItemChooseView.swift

@@ -135,7 +135,9 @@ class AITypeItemChooseView: NSView, NibLoadable {
                 
             } else {
                 self.closeBtn.image = NSImage(named: "AIChatInfoClear")
-                self.popOver.close()
+                if self.popOver != nil {
+                    self.popOver.close()
+                }
             }
         }
         

PDF Office/PDF Master/Class/GuideInfo/KMGuideInfoWindowController.swift

@@ -85,24 +85,20 @@ class KMGuideInfoWindowController: NSWindowController {
         }
     }
     
+    static var currentWindowController: KMGuideInfoWindowController!
+    
     @objc static func currentWC() -> KMGuideInfoWindowController {
-        if let controller: KMGuideInfoWindowController = KMGuideInfoWindowController.fetchSampleController() {
-            return controller
+        if currentWindowController != nil {
+            return currentWindowController
         } else {
             let guideInfoWC: KMGuideInfoWindowController = KMGuideInfoWindowController.init(windowNibName: "KMGuideInfoWindowController")
+            currentWindowController = guideInfoWC;
             return guideInfoWC
         }
     }
     
-    static func fetchSampleController() -> KMGuideInfoWindowController? {
-        for window in NSApp.windows {
-            let controller = window.windowController
-            if controller is KMGuideInfoWindowController {
-                return controller as? KMGuideInfoWindowController
-            }
-        }
-        
-        return nil
+    deinit {
+        print("deinit Action")
     }
     
     //MARK: SystemMethod
@@ -199,7 +195,8 @@ class KMGuideInfoWindowController: NSWindowController {
                 }
                 self.openFileGuidePanel.frame = self.coverView.bounds
                 self.openFileGuidePanel.autoresizingMask = [.width, .height]
-                self.openFileGuidePanel.clickHandle = {[unowned self] view, actionType in
+                self.openFileGuidePanel.clickHandle = {[weak self] view, actionType in
+                    guard let self = self else { return }
                     if actionType == .skip {
                         //Skip->数字签名
                         //Skip->
@@ -244,7 +241,8 @@ class KMGuideInfoWindowController: NSWindowController {
                 }
                 self.openFileGuideProperty.frame = self.coverView.bounds
                 self.openFileGuideProperty.autoresizingMask = [.width, .height]
-                self.openFileGuideProperty.clickHandle = {[unowned self] view, actionType in
+                self.openFileGuideProperty.clickHandle = {[weak self] view, actionType in
+                    guard let self = self else { return }
                     if actionType == .skip {
                         //Skip->数字签名
                         //Skip->
@@ -297,7 +295,8 @@ class KMGuideInfoWindowController: NSWindowController {
                 }
                 self.openFileGuideToolbar.frame = self.coverView.bounds
                 self.openFileGuideToolbar.autoresizingMask = [.width, .height]
-                self.openFileGuideToolbar.clickHandle = {[unowned self] view, actionType in
+                self.openFileGuideToolbar.clickHandle = {[weak self] view, actionType in
+                    guard let self = self else { return }
                     if actionType == .skip {
                         //Skip->数字签名
                         //Skip->
@@ -360,7 +359,8 @@ class KMGuideInfoWindowController: NSWindowController {
                 self.openFileFunctionView.frame = self.coverView.bounds
                 self.openFileFunctionView.autoresizingMask = [.width, .height]
                 self.openFileFunctionView.type =  self.type
-                self.openFileFunctionView.clickHandle = {[unowned self] view, actionType in
+                self.openFileFunctionView.clickHandle = {[weak self] view, actionType in
+                    guard let self = self else { return }
                     if self.type == .digitalSignGuide {
                         guard let callBack = self.finishHandle else {
                             return
@@ -383,7 +383,8 @@ class KMGuideInfoWindowController: NSWindowController {
                 }
                 self.convertGuideView.frame = self.coverView.bounds
                 self.convertGuideView.autoresizingMask = [.width, .height]
-                self.convertGuideView.clickHandle = {[unowned self] view, actionType in
+                self.convertGuideView.clickHandle = {[weak self] view, actionType in
+                    guard let self = self else { return }
                     if actionType == .skip {
                         self.closeAction()
                     } else if actionType == .purchase {
@@ -419,7 +420,8 @@ class KMGuideInfoWindowController: NSWindowController {
                 }
                 self.aiIconGuideView.frame = self.coverView.bounds
                 self.aiIconGuideView.autoresizingMask = [.width, .height]
-                self.aiIconGuideView.clickHandle = {[unowned self] view, actionType in
+                self.aiIconGuideView.clickHandle = {[weak self] view, actionType in
+                    guard let self = self else { return }
                     if actionType == .getIt {
                         self.closeAction()
                     }

PDF Office/PDF Master/Class/Home/View/HomeContentView/QucikTools/KMQucikToolsView.swift

@@ -68,13 +68,14 @@ class KMQucikToolsView: KMBaseXibView {
         
         for type in KMQucikToolsModel.showType() {
             let model = KMQucikToolsModel.init(type: type)
-            if model.type == .FileCompare {
-                var isNew = false
-                if let isNewValue = UserDefaults.standard.object(forKey: "QucikToolsModelFileCompareKey") as? Bool {
-                    isNew = isNewValue
-                }
-                model.isNew = !isNew
-            } else if model.type == .AITools {
+//            if model.type == .FileCompare {
+//                var isNew = false
+//                if let isNewValue = UserDefaults.standard.object(forKey: "QucikToolsModelFileCompareKey") as? Bool {
+//                    isNew = isNewValue
+//                }
+//                model.isNew = !isNew
+//            } else
+            if model.type == .AITools {
                 var isNew = false
                 if let isNewValue = UserDefaults.standard.object(forKey: "QucikToolsModelAIToolsKey") as? Bool {
                     isNew = isNewValue

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CStringConstants.m

@@ -132,46 +132,46 @@ NSString *CAnnotationTextWidgetLineWidthKey = @"CAnnotationTextWidgetLineWidthKe
 NSString *CAnnotationTextWidgetBorderColorKey = @"CAnnotationTextWidgetBorderColor";
 NSString *SKAnnotationTextWidgetFontNameKey = @"SKAnnotationTextWidgetFontNameKey";
 NSString *SKAnnotationTextWidgetFontSizeKey = @"SKAnnotationTextWidgetFontSizeKey";
-NSString *CAnnotationTextWidgetFontColorKey = @"CAnnotationTextWidgetFontColor";
-NSString *CAnnotationTextWidgetAlignmenKey = @"CAnnotationTextWidgetAlignmen";
-NSString *CAnnotationTextWidgetBackgroundColorKey = @"CAnnotationTextWidgetBackgroundColor";
+NSString *CAnnotationTextWidgetFontColorKey = @"SKAnnotationTextWidgetFontColorKey";
+NSString *CAnnotationTextWidgetAlignmenKey = @"SKAnnotationTextWidgetAlignmenKey";
+NSString *CAnnotationTextWidgetBackgroundColorKey = @"SKAnnotationTextWidgetBackgroundColorKey";
 NSString *CAnnotationTextWidgetBackgroundOpacityKey = @"CAnnotationTextWidgetBackgroundOpacity";
-NSString *CAnnotationTextWidgetMultilineKey = @"CAnnotationTextWidgetMultiline";
+NSString *CAnnotationTextWidgetMultilineKey = @"SKAnnotationTextMultilineKey";
 NSString *CDefaultTextWidgetWidthKey = @"CDefaultTextWidgetWidth";
 NSString *CDefaultTextWidgetHeightKey = @"CDefaultTextWidgetHeight";
 
 NSString *CAnnotationCheckBoxWidgetLineStyleKey = @"CAnnotationCheckBoxWidgetLineStyle";
 NSString *CAnnotationCheckBoxWidgetLineWidthKey = @"CAnnotationCheckBoxWidgetLineWidth";
 NSString *CAnnotationCheckBoxWidgetBorderColorKey = @"CAnnotationCheckBoxWidgetBorderColor";
-NSString *CAnnotationCheckBoxWidgetBackgroundColorKey = @"CAnnotationCheckBoxWidgetBackgroundColor";
+NSString *CAnnotationCheckBoxWidgetBackgroundColorKey = @"SKAnnotationCheckBoxWidgetBackgroundColorKey";
 NSString *CAnnotationCheckBoxWidgetBackgroundOpacityKey = @"CAnnotationCheckBoxWidgetBackgroundOpacity";
 
 NSString *CAnnotationRadioButtonBoxWidgetLineStyleKey = @"CAnnotationRadioButtonBoxWidgetLineStyle";
 NSString *CAnnotationRadioButtonBoxWidgetLineWidthKey = @"CAnnotationRadioButtonBoxWidgetLineWidth";
 NSString *CAnnotationRadioButtonBoxWidgetBorderColorKey = @"CAnnotationRadioButtonBoxWidgetBorderColor";
-NSString *CAnnotationRadioButtonWidgetBackgroundColorKey = @"CAnnotationRadioButtonWidgetBackgroundColor";
+NSString *CAnnotationRadioButtonWidgetBackgroundColorKey = @"SKAnnotationRadioButtonWidgetBackgroundColorKey";
 NSString *CAnnotationRadioButtonWidgetBackgroundOpacityKey = @"CAnnotationRadioButtonWidgetBackgroundOpacity";
 NSString *CDefaultRadioButtonWidgetWidthKey = @"CDefaultRadioButtonWidgetWidth";
 NSString *CDefaultRadioButtonWidgetHeightKey = @"CDefaultRadioButtonWidgetHeight";
-NSString *CAnnotationRadioButtonWidgetFontNameKey = @"CAnnotationRadioButtonWidgetFontNameKey";
+NSString *CAnnotationRadioButtonWidgetFontNameKey = @"SKAnnotationRadioButtonWidgetFontNameKey";
 
 NSString *CAnnotationChoiceListWidgetLineStyleKey = @"CAnnotationChoiceListWidgetLineStyle";
 NSString *CAnnotationChoiceListWidgetLineWidthKey = @"CAnnotationChoiceListWidgetLineWidth";
 NSString *CAnnotationChoiceListWidgetBorderColorKey = @"CAnnotationChoiceListWidgetBorderColor";
-NSString *CAnnotationChoiceListWidgetFontNameKey = @"CAnnotationChoiceListWidgetFontNameKey";
-NSString *CAnnotationChoiceListWidgetFontSizeKey = @"CAnnotationChoiceWidgetFontSize";
-NSString *CAnnotationChoiceListWidgetFontColorKey = @"CAnnotationChoiceWidgetFontColor";
-NSString *CAnnotationChoiceListWidgetBackgroundColorKey = @"CAnnotationChoiceListWidgetBackgroundColor";
+NSString *CAnnotationChoiceListWidgetFontNameKey = @"SKAnnotationChoiceListWidgetFontNameKey";
+NSString *CAnnotationChoiceListWidgetFontSizeKey = @"SKAnnotationChoiceListWidgetFontSizeKey";
+NSString *CAnnotationChoiceListWidgetFontColorKey = @"SKAnnotationChoiceListWidgetFontColorKey";
+NSString *CAnnotationChoiceListWidgetBackgroundColorKey = @"SKAnnotationChoiceListWidgetBackgroundColorKey";
 NSString *CAnnotationChoiceListWidgetBackgroundOpacityKey = @"CAnnotationChoiceListWidgetBackgroundOpacity";
 NSString *CDefaultChoiceListWidgetWidthKey = @"CDefaultChoiceListWidgetWidth";
 NSString *CDefaultChoiceListWidgetHeightKey = @"CDefaultChoiceListWidgetHeight";
 NSString *CAnnotationChoiceWidgetLineStyleKey = @"CAnnotationChoiceWidgetLineStyle";
 NSString *CAnnotationChoiceWidgetLineWidthKey = @"CAnnotationChoiceWidgetLineWidth";
 NSString *CAnnotationChoiceWidgetBorderColorKey = @"CAnnotationChoiceWidgetBorderColor";
-NSString *CAnnotationChoiceWidgetFontNameKey = @"CAnnotationChoiceWidgetFontNameKey";
-NSString *CAnnotationChoiceWidgetFontSizeKey = @"CAnnotationChoiceWidgetFontSize";
-NSString *CAnnotationChoiceWidgetFontColorKey = @"CAnnotationChoiceWidgetFontColor";
-NSString *CAnnotationChoiceWidgetBackgroundColorKey = @"CAnnotationChoiceWidgetBackgroundColor";
+NSString *CAnnotationChoiceWidgetFontNameKey = @"SKAnnotationChoiceWidgetFontNameKey";
+NSString *CAnnotationChoiceWidgetFontSizeKey = @"SKAnnotationChoiceWidgetFontSizeKey";
+NSString *CAnnotationChoiceWidgetFontColorKey = @"SKAnnotationChoiceWidgetFontColorKey";
+NSString *CAnnotationChoiceWidgetBackgroundColorKey = @"SKAnnotationChoiceWidgetBackgroundColorKey";
 NSString *CAnnotationChoiceWidgetBackgroundOpacityKey = @"CAnnotationChoiceWidgetBackgroundOpacity";
 NSString *CDefaultChoiceWidgetWidthKey = @"CDefaultChoiceWidgetWidth";
 NSString *CDefaultChoiceWidgetHeightKey = @"CDefaultChoiceWidgetHeight";
@@ -179,10 +179,10 @@ NSString *CDefaultChoiceWidgetHeightKey = @"CDefaultChoiceWidgetHeight";
 NSString *CAnnotationActionButtonWidgetLineStyleKey = @"CAnnotationActionButtonWidgetLineStyle";
 NSString *CAnnotationActionButtonWidgetLineWidthKey = @"CAnnotationActionButtonWidgetLineWidth";
 NSString *CAnnotationActionButtonWidgetBorderColorKey = @"CAnnotationActionButtonWidgetBorderColor";
-NSString *CAnnotationActionButtonWidgetFontNameKey = @"CAnnotationActionButtonWidgetFontName";
-NSString *CAnnotationActionButtonWidgetFontSizeKey = @"CAnnotationActionButtonWidgetFontSize";
-NSString *CAnnotationActionButtonWidgetFontColorKey = @"CAnnotationActionButtonWidgetFontColor";
-NSString *CAnnotationActionButtonWidgetBackgroundColorKey = @"CAnnotationActionButtonWidgetBackgroundColor";
+NSString *CAnnotationActionButtonWidgetFontNameKey = @"SKAnnotationActionButtonWidgetFontNameKey";
+NSString *CAnnotationActionButtonWidgetFontSizeKey = @"SKAnnotationActionButtonWidgetFontSizeKey";
+NSString *CAnnotationActionButtonWidgetFontColorKey = @"SKAnnotationActionButtonWidgetFontColorKey";
+NSString *CAnnotationActionButtonWidgetBackgroundColorKey = @"SKAnnotationActionButtonWidgetBackgroundColorKey";
 NSString *CAnnotationActionButtonWidgetBackgroundOpacityKey = @"CAnnotationActionButtonWidgetBackgroundOpacity";
 NSString *CDefaultActionButtonWidgetWidthKey = @"CDefaultActionButtonWidgetWidth";
 NSString *CDefaultActionButtonWidgetHeightKey = @"CDefaultActionButtonWidgetHeight";
@@ -197,37 +197,37 @@ NSString *CDefaultSignatureWidgeHeightKey = @"CDefaultSignatureWidgeHeight";
 
 //Fill & Sign
 
-NSString *CAnnotationSelfSignTureColorKey = @"CAnnotationSelfSignTureColor";
+NSString *CAnnotationSelfSignTureColorKey = @"SKAnnotationSelfSignTureColorKey";
 
 NSString *CAnnotationSelfSignTureOpacityKey = @"CAnnotationSelfSignTureOpacity";
 
-NSString *CAnnotationSelfSignTureLineWidthKey = @"CAnnotationSelfSignTureLineWidth";
+NSString *CAnnotationSelfSignTureLineWidthKey = @"SKAnnotationSelfSignTureLineWidthKey";
 
-NSString *CAnnotationSelfSignFalseColorKey = @"CAnnotationSelfSignFalseColor";
+NSString *CAnnotationSelfSignFalseColorKey = @"SKAnnotationSelfSignFalseColorKey";
 
 NSString *CAnnotationSelfSignFalseOpacityKey = @"CAnnotationSelfSignFalseOpacity";
 
-NSString *CAnnotationSelfSignFalseLineWidthKey = @"CAnnotationSelfSignFalseLineWidth";
+NSString *CAnnotationSelfSignFalseLineWidthKey = @"SKAnnotationSelfSignFalseLineWidthKey";
 
-NSString *CAnnotationSelfSignCircleColorKey = @"CAnnotationSelfSignCircleColor";
+NSString *CAnnotationSelfSignCircleColorKey = @"SKAnnotationSelfSignCircleColorKey";
 
 NSString *CAnnotationSelfSignCircleOpacityKey = @"CAnnotationSelfSignCircleOpacity";
 
-NSString *CAnnotationSelfSignCircleLineWidthKey = @"CAnnotationSelfSignCircleLineWidth";
+NSString *CAnnotationSelfSignCircleLineWidthKey = @"SKAnnotationSelfSignCircleLineWidthKey";
 
-NSString *CAnnotationSelfSignLineColorKey = @"CAnnotationSelfSignLineColor";
+NSString *CAnnotationSelfSignLineColorKey = @"SKAnnotationSelfSignLineColorKey";
 
 NSString *CAnnotationSelfSignLineOpacityKey = @"CAnnotationSelfSignLineOpacity";
 
-NSString *CAnnotationSelfSignLineLineWidthKey = @"CAnnotationSelfSignLineLineWidth";
+NSString *CAnnotationSelfSignLineLineWidthKey = @"SKAnnotationSelfSignLineLineWidthKey";
 
-NSString *CAnnotationSelfSignDotColorKey = @"CAnnotationSelfSignDotColor";
+NSString *CAnnotationSelfSignDotColorKey = @"SKAnnotationSelfSignDotColorKey";
 
 NSString *CAnnotationSelfSignDotOpacityKey = @"CAnnotationSelfSignDotOpacity";
 
-NSString *CAnnotationSelfSignDateFormatterKey = @"CAnnotationSelfSignDateFormatter";
+NSString *CAnnotationSelfSignDateFormatterKey = @"SKAnnotationSelfSignDateFormatterKey";
 
-NSString *CAnnotationSelfSignDateFormatterIncludeTimeKey = @"CAnnotationSelfSignDateFormatterIncludeTime";
+NSString *CAnnotationSelfSignDateFormatterIncludeTimeKey = @"SKAnnotationSelfSignDateFormatterIncludeTimeKey";
 
 NSString *CDefaultNoteWidthKey = @"SKDefaultNoteWidth";
 
@@ -288,15 +288,15 @@ NSString *CDefaultSignDotNoteHeightKey = @"CDefaultSignDotNoteHeight";
 //Redact
 NSString *CAnnotationRedactBorderColorKey = @"CAnnotationRedactBorderColor";
 
-NSString *CAnnotationRedactFillColorKey = @"CAnnotationRedactFillColor";
+NSString *CAnnotationRedactFillColorKey = @"KMPDFAnnotationRedactFillColor";
 
-NSString *CAnnotationRedactFontColorKey = @"CAnnotationRedactFontColor";
+NSString *CAnnotationRedactFontColorKey = @"KMPDFAnnotationRedactFontColor";
 
 NSString *CAnnotationRedactIsOverlayTextKey = @"CAnnotationRedactIsOverlayText";
 
-NSString *CAnnotationRedactTextAlignmentKey = @"CAnnotationRedactTextAlignment";
+NSString *CAnnotationRedactTextAlignmentKey = @"KMPDFAnnotationRedactTextAlignment";
 
-NSString *CAnnotationRedactFontSizeKey = @"CAnnotationRedactFontSize";
+NSString *CAnnotationRedactFontSizeKey = @"KMPDFAnnotationRedactFontSize";
 
 NSString *CAnnotationRedactOverlayStringKey = @"CAnnotationRedactOverlayString";
 

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMPropertiesViewPopController.swift

@@ -33,7 +33,7 @@ import Cocoa
 
     func showChangeColorDetailsView(_ view: NSView) {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-//            if KMGuideInfoWindowController.availableShow(.customColor) {
+            if KMGuideInfoWindowController.availableShow(.customColor) {
                 self.guideInfoWindowController = KMGuideInfoWindowController.currentWC()
                 guard let guideWC = self.guideInfoWindowController else { return }
                 
@@ -51,7 +51,7 @@ import Cocoa
                 view.window?.addChildWindow(guideWC.window!, ordered: .above)
                 guideWC.show()
             }
-//        }
+        }
     }
 
     override func viewDidLoad() {

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -12775,11 +12775,11 @@
 		BBB789642BE8BF2300F7E09C /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				BBB789702BE8BF2300F7E09C /* AIChatView */,
 				BBB789652BE8BF2300F7E09C /* AIHeaderView */,
 				BBB789682BE8BF2300F7E09C /* AITypeItemChooseView */,
 				BBB7896B2BE8BF2300F7E09C /* AIInfoInputView */,
 				BBB7896E2BE8BF2300F7E09C /* CornerView */,
-				BBB789702BE8BF2300F7E09C /* AIChatView */,
 				BBB7897E2BE8BF2300F7E09C /* AIRedoConfirmView */,
 			);
 			path = Views;