【综合】解决冲突

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

@@ -279,6 +279,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+<<<<<<< HEAD
             uuid = "2F73CA33-14D7-434F-A2C2-7267A1A1E1F3"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
@@ -327,6 +328,8 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+=======
+>>>>>>> develop
             uuid = "0546589D-0550-4D37-AD70-CD08C1BDA53B"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"

PDF Office/PDF Master/AppDelegate.swift

@@ -380,7 +380,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 
             } else {
                 if error != .restoreSuccess {
-                    KMComparativeTableViewController.purchasefailed(state: .restoreFailed)
+                    KMComparativeTableViewController.purchasefailed(state: error)
                 }
             }
         }

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) {

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift

@@ -229,7 +229,7 @@ class KMComparativeTableViewController: NSWindowController {
                         controller.close()
                     } else {
                         if error != .restoreSuccess {
-                            KMComparativeTableViewController.purchasefailed(state: .restoreFailed)
+                            KMComparativeTableViewController.purchasefailed(state: error)
                         }
                     }
                     controller.comparativeView.endLoading()
@@ -249,7 +249,7 @@ class KMComparativeTableViewController: NSWindowController {
                             }
                         }
                     } else {
-                        KMComparativeTableViewController.purchasefailed(state: .failed)
+                        KMComparativeTableViewController.purchasefailed(state: error)
                     }
                     //loading
                     controller.comparativeView.endLoading()

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -145,7 +145,7 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
                             }
                         }
                     } else {
-                        KMComparativeTableViewController.purchasefailed(state: .failed)
+                        KMComparativeTableViewController.purchasefailed(state: error)
                         completion(false, false, false)
                     }
                     
@@ -173,7 +173,7 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
                         }
                     } else {
                         if error != .restoreSuccess {
-                            KMComparativeTableViewController.purchasefailed(state: .restoreFailed)
+                            KMComparativeTableViewController.purchasefailed(state: error)
                         }
                         completion(false, false, false)
                     }

PDF Office/PDF Master/Class/KMLightMember/InAppPurchase/Appstore/KMInAppPurchaseManager.swift

@@ -43,22 +43,22 @@ let keychainAccessGroup = "your.keychain.access.group"
 let receiptDataLabel = "receiptData"
 
 enum KMInAppPurchaseState: String, CaseIterable {
-    case success = "success"//"购买成功"
-    case failed = "failed"//"购买失败"
-    case cancel = "cancel"//"取消购买"
-    case verFailed = "Order verification failure"//"订单校验失败"
-    case verSuccess = "Order verification successful"//"订单校验成功"
-    case verServerFailed = "Server order verification failed"//"服务器订单校验失败"
-    case notArrow = "Internal purchase is not allowed" //"不允许内购"
-    case productSuccess = "Failed to obtain product"//"获取产品失败"
-    case productFailed = "Get product Success"//"获取产品成功"
-    case productCorrespondenceFailed = "Product not found"//"未找到对应产品"
-    case restoreSuccess = "restore successfully"//"restore成功"
-    case restoreFailed = "restore Failed"//"restore失败"
-    case restoreVerSuccess = "restore secondary verification successful"//"restore二次验证成功"
-    case restoreVerFailed = "restore secondary validation failed"//"restore二次验证失败"
-    case noReceipt = "No ticket information"//"无票据信息"
-    case orderFailed = "Order creation failed"//"订单创建失败"
+    case success = "Purchase Successfully"//"购买成功"
+    case failed = "Purchase Failed"//"购买失败"
+    case cancel = "Cancel Purchase"//"取消购买"
+    case verFailed = "Order Verification Filed"//"订单校验失败"
+    case verSuccess = "Order Verification Successful"//"订单校验成功"
+    case verServerFailed = "Server Order Verification Failed"//"服务器订单校验失败"
+    case notArrow = "In-app Purchases not Allowed" //"不允许内购"
+    case productSuccess = "Failed to Access Product"//"获取产品失败"
+    case productFailed = "Access Product Successfully"//"获取产品成功"
+    case productCorrespondenceFailed = "Product not Found"//"未找到对应产品"
+    case restoreSuccess = "Restore Successfully"//"restore成功"
+    case restoreFailed = "Restore Failed"//"restore失败"
+    case restoreVerSuccess = "Restore 2-step Verification Successeful"//"restore二次验证成功"
+    case restoreVerFailed = "Restore 2-step Verification Failed"//"restore二次验证失败"
+    case noReceipt = "No Order Information"//"无票据信息"
+    case orderFailed = "Order Creation Failed"//"订单创建失败"
 }
 
 class KMInAppPurchaseManager: NSObject {

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 {