Browse Source

【轻会员】v1.2新增了Flatten功能为付费功能,需要补充对应逻辑(已完成)

tangchao 1 year ago
parent
commit
11643e5626

+ 0 - 48
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -228,54 +228,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "EB85E381-4665-4798-9B71-97B1E242192C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2227"
-            endingLineNumber = "2227"
-            landmarkName = "toolbarViewController(_:shareFlatten:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "EB85E381-4665-4798-9B71-97B1E242192C - d35bfefb68ef0092"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMMainViewController.toolbarViewController(_: PDF_Master.KMToolbarViewController, shareFlatten: __C.NSMenuItem) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2227"
-                  endingLineNumber = "2227"
-                  offsetFromSymbolStart = "95">
-               </Location>
-               <Location
-                  uuid = "EB85E381-4665-4798-9B71-97B1E242192C - 35919fe73628a6f8"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 @Sendable () async -&gt; () in PDF_Master.KMMainViewController.toolbarViewController(_: PDF_Master.KMToolbarViewController, shareFlatten: __C.NSMenuItem) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2227"
-                  endingLineNumber = "2227"
-                  offsetFromSymbolStart = "0">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent

+ 1 - 1
PDF Office/PDF Master/AppDelegate.swift

@@ -107,7 +107,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                     if !KMLightMemberManager.manager.isLogin() && NSApp.mainWindow != nil {
                         KMLoginWindowController.show(window: NSApp.mainWindow!)
                     } else {
-                        KMPurchaseManager.manager.restorePurchases { isSuccess in
+                        KMPurchaseManager.manager.restorePurchases { isSuccess, _  in
                             if isSuccess {
                                 
                             } else {

+ 1 - 0
PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift

@@ -32,6 +32,7 @@ enum KMComparativeInputType: Int {
     case merge          = 12        // 合并
     case crop           = 13        // 裁切
     case thumb          = 14        // 缩略图列表
+    case shareFlatten   = 15        // 分享副本
     //后续添加
 }
 

+ 4 - 0
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -2225,6 +2225,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
 //            return
 //        }
         Task { @MainActor in
+            if await (KMLightMemberManager.manager.canUseAdvanced() == false) {
+                let _ = KMComparativeTableViewController.show(window: self.view.window!, .shareFlatten)
+                return
+            }
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
                 KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isContinue: true) { isSubscribeSuccess, isWaterMarkExport, isClose in
                     if (isClose) {