【综合】带水印权限弹窗兼容AI场景

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

@@ -228,12 +228,12 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "0351AA9B-986E-4553-8685-5A71EE4771C2 - 4b4b5d6e3d195f59"
+                  uuid = "0351AA9B-986E-4553-8685-5A71EE4771C2 - d6a94eca6fc0bdfa"
                   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"
@@ -243,12 +243,12 @@
                   offsetFromSymbolStart = "312">
                </Location>
                <Location
-                  uuid = "0351AA9B-986E-4553-8685-5A71EE4771C2 - 9ec3d8f8f83c7231"
+                  uuid = "0351AA9B-986E-4553-8685-5A71EE4771C2 - 6fe9b9739f2693c9"
                   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"
@@ -276,5 +276,211 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9FFFD3B2-65F1-4249-8F69-29142E952B6C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "399"
+            endingLineNumber = "399"
+            landmarkName = "aiTranslationAction(_:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "9FFFD3B2-65F1-4249-8F69-29142E952B6C - 423ce689b0272a1b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Master.KMAITranslationWindowController.aiTranslationAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "399"
+                  endingLineNumber = "399"
+                  offsetFromSymbolStart = "95">
+               </Location>
+               <Location
+                  uuid = "9FFFD3B2-65F1-4249-8F69-29142E952B6C - 1c1c703c37da5484"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(2) await resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Master.KMAITranslationWindowController.aiTranslationAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "399"
+                  endingLineNumber = "399"
+                  offsetFromSymbolStart = "35">
+               </Location>
+               <Location
+                  uuid = "9FFFD3B2-65F1-4249-8F69-29142E952B6C - cb1992ff82d37611"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(3) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Master.KMAITranslationWindowController.aiTranslationAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "399"
+                  endingLineNumber = "399"
+                  offsetFromSymbolStart = "165">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "95D7123B-304A-4E3C-A30A-D0E5AC9A8816"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "457"
+            endingLineNumber = "457"
+            landmarkName = "copyAction(_:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "95D7123B-304A-4E3C-A30A-D0E5AC9A8816 - 375a3c23834444df"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMAITranslationWindowController.copyAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "457"
+                  endingLineNumber = "457"
+                  offsetFromSymbolStart = "344">
+               </Location>
+               <Location
+                  uuid = "95D7123B-304A-4E3C-A30A-D0E5AC9A8816 - 7509e0ef10557f4c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 @Sendable () async -&gt; () in PDF_Master.KMAITranslationWindowController.copyAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "457"
+                  endingLineNumber = "457"
+                  offsetFromSymbolStart = "0">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A9AAC808-444E-47E8-B3E8-45D4B788FEA1"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/WindowController/KMAITranslationWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "393"
+            endingLineNumber = "393"
+            landmarkName = "aiTranslationAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "090117E4-7CB5-4B68-8189-F802C8572626"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/WindowController/KMAITranslationConfirmWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "140"
+            endingLineNumber = "140"
+            landmarkName = "translateAction(_:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "090117E4-7CB5-4B68-8189-F802C8572626 - 4da2dcba87d1e166"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Master.KMAITranslationConfirmWindowController.translateAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationConfirmWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "140"
+                  endingLineNumber = "140"
+                  offsetFromSymbolStart = "106">
+               </Location>
+               <Location
+                  uuid = "090117E4-7CB5-4B68-8189-F802C8572626 - c893ec5ae97157ed"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(2) await resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Master.KMAITranslationConfirmWindowController.translateAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationConfirmWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "140"
+                  endingLineNumber = "140"
+                  offsetFromSymbolStart = "35">
+               </Location>
+               <Location
+                  uuid = "090117E4-7CB5-4B68-8189-F802C8572626 - fecb9f51837f6d40"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(3) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Master.KMAITranslationConfirmWindowController.translateAction(__C.NSButton) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Home/WindowController/KMAITranslationConfirmWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "140"
+                  endingLineNumber = "140"
+                  offsetFromSymbolStart = "251">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "FA8A121A-9075-418F-BCB7-3EDF0746F041"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "120"
+            endingLineNumber = "120"
+            landmarkName = "aiFunctionShow(window:_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

PDF Office/PDF Master/Class/Home/ViewController/KMAIRewritingVC.swift

@@ -342,7 +342,10 @@ class KMAIRewritingVC: NSViewController {
 //            }
             Task { @MainActor in
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+//                    let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!) { isSub, _, isClose in
+                        
+                    }
                     return
                 }
                 
@@ -399,7 +402,10 @@ class KMAIRewritingVC: NSViewController {
 //            }
             Task { @MainActor in
                 if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                    let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+//                    let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+                    let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!) { isSub, _, isClose in
+                        
+                    }
                     return
                 }
                 let pasteboard = NSPasteboard.general

PDF Office/PDF Master/Class/Home/ViewController/KMAITranslationVC.swift

@@ -115,7 +115,10 @@ class KMAITranslationVC: NSViewController {
 //                }
                 Task { @MainActor in
                     if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                        let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+//                        let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+                        let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!, isAI: true) { isSub, _, isClose in
+                            
+                        }
                         return
                     }
                     

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

@@ -24,6 +24,9 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
     var watermarkExportAction: KMSubscribeWaterMarkWindowControllerWatermarkExportAction?
     var restoreAction: KMSubscribeWaterMarkWindowControllerRestoreAction?
     
+    var isContinue: Bool?
+    var isAI: Bool?
+    
     deinit {
         KMPrint("KMSubscribeWaterMarkWindowController 释放")
     }
@@ -35,9 +38,28 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
         // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
     }
     
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        if let data = self.isAI, data {
+            self.waterMarkView.waterExportButton.isHidden = true
+            self.waterMarkView.subTrailingConst.constant = 60
+            self.waterMarkView.subWidthConst.constant = 280
+            self.waterMarkView.preferentialImageTrailingConst.constant = 92
+        } else {
+            self.waterMarkView.waterExportButton.isHidden = false
+            self.waterMarkView.subTrailingConst.constant = 0
+            self.waterMarkView.subWidthConst.constant = 192
+            self.waterMarkView.preferentialImageTrailingConst.constant = 32
+        }
+    }
+    
     //MARK: 打开文件
-    static func show(window: NSWindow, isContinue: Bool = false, completion: @escaping (_ isSubscribeSuccess: Bool, _ isWaterMarkExport: Bool, _ isClose: Bool) -> Void) -> KMSubscribeWaterMarkWindowController {
+    static func show(window: NSWindow, isContinue: Bool = false, isAI: Bool = false, completion: @escaping (_ isSubscribeSuccess: Bool, _ isWaterMarkExport: Bool, _ isClose: Bool) -> Void) -> KMSubscribeWaterMarkWindowController {
         let subscribeWaterMarkWindowController: KMSubscribeWaterMarkWindowController = KMSubscribeWaterMarkWindowController.init(windowNibName: "KMSubscribeWaterMarkWindowController")
+
+        subscribeWaterMarkWindowController.isContinue = isContinue
+        subscribeWaterMarkWindowController.isAI = isAI
         window.beginSheet(subscribeWaterMarkWindowController.window!)
         subscribeWaterMarkWindowController.window?.center()
         

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -26,6 +26,10 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
     @IBOutlet weak var restoreButton: NSButton!
     @IBOutlet weak var discountImageView: NSImageView!
     
+    @IBOutlet weak var subTrailingConst: NSLayoutConstraint!
+    @IBOutlet weak var subWidthConst: NSLayoutConstraint!
+    @IBOutlet weak var preferentialImageTrailingConst: NSLayoutConstraint!
+    
     var closeAction: KMSubscribeWaterMarkViewCancelAction?
     var subscribeAction: KMSubscribeWaterMarkViewSubscribeAction?
     var waterMarkExportAction: KMSubscribeWaterMarkViewWaterMarkExportAction?

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.xib

@@ -13,8 +13,11 @@
                 <outlet property="collectionView" destination="G8e-lU-M2R" id="Unt-cd-UZq"/>
                 <outlet property="discountImageView" destination="XJT-Av-tgl" id="sML-AH-cZs"/>
                 <outlet property="lineView" destination="gPv-qb-Uay" id="6ri-1C-OKN"/>
+                <outlet property="preferentialImageTrailingConst" destination="bCN-ta-Soy" id="QW8-tJ-0FR"/>
                 <outlet property="restoreButton" destination="2p2-EB-ZME" id="4dk-gE-x5C"/>
                 <outlet property="scrollView" destination="iQs-EU-LBJ" id="bId-Pc-Y9u"/>
+                <outlet property="subTrailingConst" destination="jIh-lA-4Ob" id="Mw0-f0-CbW"/>
+                <outlet property="subWidthConst" destination="Lyq-wF-29b" id="69E-zv-tKK"/>
                 <outlet property="subscribeButton" destination="5tZ-H6-Dl5" id="xAN-0v-CEs"/>
                 <outlet property="textView" destination="1JL-8n-haM" id="k4I-1h-ol9"/>
                 <outlet property="titleLabel" destination="2cQ-02-iHc" id="tqt-eV-spv"/>
@@ -160,7 +163,7 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <textView wantsLayer="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="1JL-8n-haM">
-                                        <rect key="frame" x="0.0" y="0.0" width="333" height="40"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="0.0" height="40"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <color key="backgroundColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                         <size key="minSize" width="333" height="40"/>
@@ -173,11 +176,11 @@
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="0To-dz-J3l"/>
                             </constraints>
-                            <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="i2c-hF-Mg9">
+                            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="i2c-hF-Mg9">
                                 <rect key="frame" x="-100" y="-100" width="225" height="15"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
-                            <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="CvS-Pe-C54">
+                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="CvS-Pe-C54">
                                 <rect key="frame" x="-100" y="-100" width="15" height="24"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>

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

@@ -2148,7 +2148,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
 //        }
         Task { @MainActor in
             if await (KMLightMemberManager.manager.canPayFunction() == false) {
-                let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+//                let _ = KMComparativeTableViewController.aiFunctionShow(window: self.view.window!)
+                let _ = KMSubscribeWaterMarkWindowController.show(window: self.view.window!) { isSub, _, isClose in
+                    
+                }
                 return
             }
             let isExceedsLimit = self.isPDFPageCountExceedsLimit(filePath: (self.document?.documentURL.path)!)