【综合】偏好设置，批注模块调式重置部分

PDF Office/PDF Master/Class/Common/DataManager/KMDataManager.swift

@@ -18,7 +18,7 @@ class KMDataManager: NSObject {
 
 extension KMDataManager {
     class func ud_object(forKey defaultName: String) -> Any? {
-        return self.userD_.bool(forKey: defaultName)
+        return self.userD_.object(forKey: defaultName)
     }
 
     class func ud_set(_ value: Any?, forKey defaultName: String, sync: Bool = true) {

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotation+PDFListView.swift

@@ -181,7 +181,6 @@ import Foundation
 @objc extension CPDFAnnotation {
     /*
      #define SKUseUserNameKey @"SKUseUserName"
-     #define SKUserNameKey @"SKUserName"
 
 
      NSString *SKPDFAnnotationScriptingBorderStyleKey = @"scriptingBorderStyle";

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/ComPDFUIConfig.swift

@@ -16,8 +16,6 @@ class ComPDFUIConfig: NSObject {
             // Set the defaults in the standard user defaults
             UserDefaults.standard.register(defaults: initialValuesDict)
             
-            // App启动后，恢复部分设置
-            KMPreferenceManager.shared.resumeDataToPDFView()
             UserDefaults.standard.setPDFListViewColor(NSColor.black, forKey: CFreeTextNoteFontColorKey)
             
             NSImage.makePDFListViewCursorImages()

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.swift

@@ -1288,7 +1288,8 @@ let KMPDFDynamicStampNeedAuthorKey1 = "km_pdfview_dynamic_stamp_need_author"
     
     @IBAction func dynamicStampButtonItemClicked_Author(_ sender: NSButton) {
         // 从沙盒中取出作者，如果没有
-        if let author = UserDefaults.standard.string(forKey: "SKUserName"), !author.isEmpty {
+        
+        if let author = KMDataManager.ud_string(forKey: KMUserNameKey), !author.isEmpty {
             self.authorTextField.placeholderString = author
         } else {
             self.authorTextField.placeholderString = NSFullUserName()
@@ -1300,7 +1301,7 @@ let KMPDFDynamicStampNeedAuthorKey1 = "km_pdfview_dynamic_stamp_need_author"
             self.authorTextField.stringValue = ""
             self.authorTextField.isEditable = false
         } else {
-            if let author = UserDefaults.standard.string(forKey: "SKUserName"), !author.isEmpty {
+            if let author = KMDataManager.ud_string(forKey: KMUserNameKey), !author.isEmpty {
                 self.authorTextField.stringValue = author
             } else {
                 self.authorTextField.stringValue = NSFullUserName()
@@ -1342,9 +1343,7 @@ let KMPDFDynamicStampNeedAuthorKey1 = "km_pdfview_dynamic_stamp_need_author"
         loadDynamicStamps()
         
         let userName = authorTextField.stringValue.isEmpty ? "" : authorTextField.stringValue
-        
-        UserDefaults.standard.set(userName, forKey: "SKUserName")
-        UserDefaults.standard.synchronize()
+        KMDataManager.ud_set(userName, forKey: KMUserNameKey)
         
         createStampTableView.reloadData()
     }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMDynamicStampViewController.swift

@@ -130,7 +130,6 @@ typealias UpdateStampCallBack = () -> Void
     
     func controlTextDidEndEditing(_ obj: Notification) {
         let userName = authorTextField.stringValue.isEmpty ? "" : authorTextField.stringValue
-        UserDefaults.standard.set(userName, forKey: "SKUserName")
-        UserDefaults.standard.synchronize()
+        KMDataManager.ud_set(userName, forKey: KMUserNameKey)
     }
 }

PDF Office/PDF Master/Class/Preference/Tools/KMPreferenceManager.swift

@@ -306,6 +306,7 @@ typealias KMPreference = KMPreferenceManager
         self.resetDataToPDFView()
         self._resetDataToUserDefault(group: .general)
         self._resetDataToUserDefault(group: .display)
+        self._resetDataToUserDefault(group: .markup)
         
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             var groppInfos: [KMPreferenceKey : Any] = [:]

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -611,5 +611,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "44337E05-94FF-4B8A-8AB7-5A77E6B1BE81"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Common/Category/NSUserDefaults_KMExtension.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "53"
+            endingLineNumber = "53"
+            landmarkName = "setColor(_:forKey:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "44337E05-94FF-4B8A-8AB7-5A77E6B1BE81 - a4a36b403e095cbc"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__C.NSUserDefaults.setColor(_: __C.NSColor, forKey: Swift.String) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Common/Category/NSUserDefaults_KMExtension.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "53"
+                  endingLineNumber = "53"
+                  offsetFromSymbolStart = "121">
+               </Location>
+               <Location
+                  uuid = "44337E05-94FF-4B8A-8AB7-5A77E6B1BE81 - a4a36b403e095cbc"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__C.NSUserDefaults.setColor(_: __C.NSColor, forKey: Swift.String) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Common/Category/NSUserDefaults_KMExtension.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "53"
+                  endingLineNumber = "53"
+                  offsetFromSymbolStart = "181">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>