【页面编辑】从所有页面切换到自定义页面，需要直接进入输入状态（目前还需要用户点一下输入框）(已修复)

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -727,126 +727,48 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "63B50EFC-2F16-4526-BF65-81126D578239"
+            uuid = "F4E81D76-C9BD-495B-90E7-606CAB0FA98E"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/ChromiumTabs/KMBrowser.swift"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "53"
-            endingLineNumber = "53"
-            landmarkName = "closeTabViewItem()"
+            startingLineNumber = "454"
+            endingLineNumber = "454"
+            landmarkName = "openBlankPage(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "7A402926-04D2-44EA-9FF6-F5F088F76C0B"
+            uuid = "B1622699-E74E-4C1D-8C74-087A5D832AFC"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Document/KMMainDocument.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "140"
-            endingLineNumber = "140"
-            landmarkName = "save(to:ofType:for:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "7A402926-04D2-44EA-9FF6-F5F088F76C0B - 9cc187e01228fc29"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for PDF_Master.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType) async throws -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "140"
-                  endingLineNumber = "140"
-                  offsetFromSymbolStart = "239">
-               </Location>
-               <Location
-                  uuid = "7A402926-04D2-44EA-9FF6-F5F088F76C0B - 1b26284899bc4487"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(2) await resume partial function for PDF_Master.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType) async throws -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "140"
-                  endingLineNumber = "140"
-                  offsetFromSymbolStart = "63">
-               </Location>
-               <Location
-                  uuid = "7A402926-04D2-44EA-9FF6-F5F088F76C0B - 27e4904a03948823"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(3) suspend resume partial function for PDF_Master.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType) async throws -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "140"
-                  endingLineNumber = "140"
-                  offsetFromSymbolStart = "71">
-               </Location>
-               <Location
-                  uuid = "7A402926-04D2-44EA-9FF6-F5F088F76C0B - eb99169f045ea25e"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(4) suspend resume partial function for PDF_Master.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType) async throws -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "140"
-                  endingLineNumber = "140"
-                  offsetFromSymbolStart = "123">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "CEB40184-2DF4-4354-A034-969A49B645C0"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Document/KMMainDocument.swift"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "147"
-            endingLineNumber = "147"
-            landmarkName = "write(to:ofType:for:originalContentsURL:)"
+            startingLineNumber = "623"
+            endingLineNumber = "623"
+            landmarkName = "menuItemAction_closeWindow(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "F4E81D76-C9BD-495B-90E7-606CAB0FA98E"
+            uuid = "4D6BB454-B8F1-45E1-A19B-412BCE565E48"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "454"
-            endingLineNumber = "454"
-            landmarkName = "openBlankPage(_:)"
+            startingLineNumber = "65"
+            endingLineNumber = "65"
+            landmarkName = "menuItemAction_closeWindow(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

PDF Office/PDF Master/Class/Common/OC/Tools/KMTools_OC.h

@@ -17,6 +17,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface KMTools_OC (Testing)
+
++ (NSData *)getPDFData;
+
+@end
+
 @interface KMPageSizeTool : NSObject
 
 + (NSString *)conversionWithUnit:(NSString *)unit value:(CGFloat)value;

PDF Office/PDF Master/Class/Common/OC/Tools/KMTools_OC.m

@@ -52,6 +52,32 @@
 
 @end
 
+@implementation KMTools_OC (Testing)
+
++ (NSData *)getPDFData {
+    NSMutableData *pdfData = [[NSMutableData alloc] init];
+    CGDataConsumerRef consumer = CGDataConsumerCreateWithCFData((CFMutableDataRef)pdfData);
+    CFMutableDictionaryRef myDictionary = CFDictionaryCreateMutable(NULL,
+                                                                    0,
+                                                                    &kCFTypeDictionaryKeyCallBacks,
+                                                                    &kCFTypeDictionaryValueCallBacks);
+    CFDictionarySetValue(myDictionary, kCGPDFContextCreator, CFSTR("PDF Master"));
+    CGRect mediaBox = CGRectMake(0, 0, 595, 842);
+    CGContextRef pdfContext = CGPDFContextCreate(consumer, &mediaBox, myDictionary);
+    CGContextSetRGBFillColor(pdfContext, 1.0, 0.0, 0.0, 0.0);
+    CGContextSetTextDrawingMode(pdfContext, kCGTextFill);
+    CFRelease(myDictionary);
+    CGContextBeginPage(pdfContext, &mediaBox);
+    CGContextEndPage(pdfContext);
+    CGPDFContextClose(pdfContext);
+    CGContextRelease (pdfContext);
+    CGDataConsumerRelease(consumer);
+    
+    return pdfData;
+}
+
+@end
+
 @implementation KMPageSizeTool
 
 + (NSString *)conversionWithUnit:(NSString *)unit value:(CGFloat)value

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -934,6 +934,7 @@ extension KMPDFEditViewController {
             self.clearSelectPages()
             DispatchQueue.main.async {
                 self.toolBar.pageRangeView?.stringValue = ""
+                self.view.window?.makeFirstResponder(self.toolBar.pageRangeView?.textField)
             }
         } else {
             self.pageEditThumbnailView.selectPages(at: indexpaths)

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift

@@ -576,15 +576,16 @@ extension KMLeftSideViewController {
 //MARK: Cache
 extension KMLeftSideViewController {
     func clearAnnotationFilterData() {
-        let userDefaults = UserDefaults.standard
-
-        let typeData = try?NSKeyedArchiver.archivedData(withRootObject: [Any](), requiringSecureCoding: false)
-        userDefaults.set(typeData, forKey: "KMNoteOutlineFilterSelectArray_Type" + self.listView.document.documentURL.path)
-        let colorData = try?NSKeyedArchiver.archivedData(withRootObject: [Any](), requiringSecureCoding: false)
-        userDefaults.set(colorData, forKey: "KMNoteOutlineFilterSelectArray_Color" + self.listView.document.documentURL.path)
-        let authorData = try?NSKeyedArchiver.archivedData(withRootObject: [Any](), requiringSecureCoding: false)
-        userDefaults.set(authorData, forKey: "KMNoteOutlineFilterSelectArray_Author" + self.listView.document.documentURL.path)
-        userDefaults.synchronize()
+        if let _key = self.listView?.document?.documentURL?.path {
+            let userDefaults = UserDefaults.standard
+            let typeData = try?NSKeyedArchiver.archivedData(withRootObject: [Any](), requiringSecureCoding: false)
+            userDefaults.set(typeData, forKey: "KMNoteOutlineFilterSelectArray_Type" + _key)
+            let colorData = try?NSKeyedArchiver.archivedData(withRootObject: [Any](), requiringSecureCoding: false)
+            userDefaults.set(colorData, forKey: "KMNoteOutlineFilterSelectArray_Color" + _key)
+            let authorData = try?NSKeyedArchiver.archivedData(withRootObject: [Any](), requiringSecureCoding: false)
+            userDefaults.set(authorData, forKey: "KMNoteOutlineFilterSelectArray_Author" + _key)
+            userDefaults.synchronize()
+        }
     }
     
     func clearNotification() {