Browse Source

【综合】修复页面编辑偶发crash

tangchao 1 year ago
parent
commit
439e7e8fa2

+ 12 - 60
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -276,54 +276,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2F73CA33-14D7-434F-A2C2-7267A1A1E1F3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Document/KMMainDocument.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "51"
-            endingLineNumber = "51"
-            landmarkName = "save(to:ofType:for:delegate:didSave:contextInfo:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "2F73CA33-14D7-434F-A2C2-7267A1A1E1F3 - 46b08a1ae816ed0f"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "51"
-                  endingLineNumber = "51"
-                  offsetFromSymbolStart = "944">
-               </Location>
-               <Location
-                  uuid = "2F73CA33-14D7-434F-A2C2-7267A1A1E1F3 - 275a987d5f5d9d68"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 () -&gt; () in PDF_Master_DMG.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "51"
-                  endingLineNumber = "51"
-                  offsetFromSymbolStart = "18">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -340,12 +292,12 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "0546589D-0550-4D37-AD70-CD08C1BDA53B - 66f1e85e7d93dc88"
+                  uuid = "0546589D-0550-4D37-AD70-CD08C1BDA53B - 62ab35cb2aa46459"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMMainDocument.saveAs(Swift.Optional&lt;Any&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
+                  symbolName = "PDF_Master.KMMainDocument.saveAs(Swift.Optional&lt;Any&gt;) -&gt; ()"
+                  moduleName = "PDF Master"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
                   startingColumnNumber = "9223372036854775807"
@@ -355,12 +307,12 @@
                   offsetFromSymbolStart = "150">
                </Location>
                <Location
-                  uuid = "0546589D-0550-4D37-AD70-CD08C1BDA53B - b6d2fdcf8a7e197d"
+                  uuid = "0546589D-0550-4D37-AD70-CD08C1BDA53B - b0181a647e19a750"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (Swift.Bool, Any...) -&gt; () in PDF_Master_DMG.KMMainDocument.saveAs(Swift.Optional&lt;Any&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
+                  symbolName = "closure #1 (Swift.Bool, Any...) -&gt; () in PDF_Master.KMMainDocument.saveAs(Swift.Optional&lt;Any&gt;) -&gt; ()"
+                  moduleName = "PDF Master"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
                   startingColumnNumber = "9223372036854775807"
@@ -388,12 +340,12 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "46837646-FF5A-4F7D-9187-94857C5E940A - 4b4b5d6e3d195fbe"
+                  uuid = "46837646-FF5A-4F7D-9187-94857C5E940A - d6a94eca6fc0bd1d"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMMainDocument.runModalSavePanel(for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
+                  symbolName = "PDF_Master.KMMainDocument.runModalSavePanel(for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
+                  moduleName = "PDF Master"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
                   startingColumnNumber = "9223372036854775807"
@@ -403,12 +355,12 @@
                   offsetFromSymbolStart = "312">
                </Location>
                <Location
-                  uuid = "46837646-FF5A-4F7D-9187-94857C5E940A - 9ec3d8f8f83c72d6"
+                  uuid = "46837646-FF5A-4F7D-9187-94857C5E940A - 6fe9b9739f26932e"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (Swift.Bool, Any...) -&gt; () in PDF_Master_DMG.KMMainDocument.runModalSavePanel(for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
+                  symbolName = "closure #1 (Swift.Bool, Any...) -&gt; () in PDF_Master.KMMainDocument.runModalSavePanel(for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
+                  moduleName = "PDF Master"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
                   startingColumnNumber = "9223372036854775807"

+ 2 - 0
PDF Office/PDF Master/Class/Analytics/KMAnalytics.swift

@@ -92,6 +92,8 @@ extension KMAnalytics.Parameter {
 
     // 发送事件
     static func trackEvent(eventName: String, parameters: [String : Any]? = nil, platform: KMAnalyticsPlatform = .firebase, appTarget: AppTarget = [.free]) {
+        Swift.debugPrint("trackEvent: \(eventName)")
+        
         if (appTarget.contains(.free)) {
 #if VERSION_FREE
             if (platform == .firebase) {

+ 3 - 1
PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPDFEditToolbar.swift

@@ -21,8 +21,10 @@ enum KMPageEditType: Int {
     case zoomOut
     case zoomIn
     
+    case paste = 100
+    
     static let none: KMPageEditType = KMPageEditType(rawValue: 0)!
-    static let paste: KMPageEditType = KMPageEditType(rawValue: 100)!
+//    static let paste: KMPageEditType = KMPageEditType(rawValue: 100)!
     
     static var insert_files: Int {
         get {