Merge branch 'develop' of git.kdan.cc:Mac_PDF/PDF_Office into develop

PDF Office/PDF Office.xcodeproj/project.pbxproj

@@ -1103,6 +1103,18 @@
 		AD0FA51629A9FA8F00EDEB50 /* KMResetPasswordView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD0FA51529A9FA8F00EDEB50 /* KMResetPasswordView.xib */; };
 		AD0FA51729A9FA8F00EDEB50 /* KMResetPasswordView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD0FA51529A9FA8F00EDEB50 /* KMResetPasswordView.xib */; };
 		AD0FA51829A9FA8F00EDEB50 /* KMResetPasswordView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD0FA51529A9FA8F00EDEB50 /* KMResetPasswordView.xib */; };
+		AD2D74AD29F0CEB300EDC5E4 /* KMCancellationWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD2D74AB29F0CEB300EDC5E4 /* KMCancellationWindowController.swift */; };
+		AD2D74AE29F0CEB300EDC5E4 /* KMCancellationWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD2D74AB29F0CEB300EDC5E4 /* KMCancellationWindowController.swift */; };
+		AD2D74AF29F0CEB300EDC5E4 /* KMCancellationWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD2D74AB29F0CEB300EDC5E4 /* KMCancellationWindowController.swift */; };
+		AD2D74B029F0CEB300EDC5E4 /* KMCancellationWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD2D74AC29F0CEB300EDC5E4 /* KMCancellationWindowController.xib */; };
+		AD2D74B129F0CEB300EDC5E4 /* KMCancellationWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD2D74AC29F0CEB300EDC5E4 /* KMCancellationWindowController.xib */; };
+		AD2D74B229F0CEB300EDC5E4 /* KMCancellationWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD2D74AC29F0CEB300EDC5E4 /* KMCancellationWindowController.xib */; };
+		AD2D74B529F0D39500EDC5E4 /* KMCancellationSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD2D74B429F0D39500EDC5E4 /* KMCancellationSuccessView.swift */; };
+		AD2D74B629F0D39500EDC5E4 /* KMCancellationSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD2D74B429F0D39500EDC5E4 /* KMCancellationSuccessView.swift */; };
+		AD2D74B729F0D39500EDC5E4 /* KMCancellationSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD2D74B429F0D39500EDC5E4 /* KMCancellationSuccessView.swift */; };
+		AD2D74B929F0D3A100EDC5E4 /* KMCancellationSuccessView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD2D74B829F0D3A100EDC5E4 /* KMCancellationSuccessView.xib */; };
+		AD2D74BA29F0D3A100EDC5E4 /* KMCancellationSuccessView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD2D74B829F0D3A100EDC5E4 /* KMCancellationSuccessView.xib */; };
+		AD2D74BB29F0D3A100EDC5E4 /* KMCancellationSuccessView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AD2D74B829F0D3A100EDC5E4 /* KMCancellationSuccessView.xib */; };
 		AD3A3587294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */; };
 		AD3A3588294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */; };
 		AD3A3589294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */; };
@@ -3655,6 +3667,10 @@
 		AD0FA50D29A9E75000EDEB50 /* KMLoginInputPasswordView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLoginInputPasswordView.xib; sourceTree = "<group>"; };
 		AD0FA51129A9FA8600EDEB50 /* KMResetPasswordView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMResetPasswordView.swift; sourceTree = "<group>"; };
 		AD0FA51529A9FA8F00EDEB50 /* KMResetPasswordView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMResetPasswordView.xib; sourceTree = "<group>"; };
+		AD2D74AB29F0CEB300EDC5E4 /* KMCancellationWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCancellationWindowController.swift; sourceTree = "<group>"; };
+		AD2D74AC29F0CEB300EDC5E4 /* KMCancellationWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMCancellationWindowController.xib; sourceTree = "<group>"; };
+		AD2D74B429F0D39500EDC5E4 /* KMCancellationSuccessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCancellationSuccessView.swift; sourceTree = "<group>"; };
+		AD2D74B829F0D3A100EDC5E4 /* KMCancellationSuccessView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMCancellationSuccessView.xib; sourceTree = "<group>"; };
 		AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPrintPreviewPresenter.swift; sourceTree = "<group>"; };
 		AD44D651292C9E7900A94554 /* KMImageToPDFChooseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMImageToPDFChooseView.swift; sourceTree = "<group>"; };
 		AD44D655292C9E8C00A94554 /* KMImageToPDFChooseView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMImageToPDFChooseView.xib; sourceTree = "<group>"; };
@@ -5560,6 +5576,25 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		AD2D74AA29F0CE8500EDC5E4 /* Cancellation */ = {
+			isa = PBXGroup;
+			children = (
+				AD2D74B329F0D37900EDC5E4 /* View */,
+				AD2D74AB29F0CEB300EDC5E4 /* KMCancellationWindowController.swift */,
+				AD2D74AC29F0CEB300EDC5E4 /* KMCancellationWindowController.xib */,
+			);
+			path = Cancellation;
+			sourceTree = "<group>";
+		};
+		AD2D74B329F0D37900EDC5E4 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				AD2D74B429F0D39500EDC5E4 /* KMCancellationSuccessView.swift */,
+				AD2D74B829F0D3A100EDC5E4 /* KMCancellationSuccessView.xib */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		AD3A358B294C120B00D72802 /* Presenter */ = {
 			isa = PBXGroup;
 			children = (
@@ -6647,6 +6682,7 @@
 		ADE3C1E129A5AB8B00793B13 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				AD2D74AA29F0CE8500EDC5E4 /* Cancellation */,
 				AD8810AF29A8467100178CA1 /* VerificationCode */,
 				AD8810A629A845E600178CA1 /* AccountInfo */,
 				AD88109D29A8456100178CA1 /* ComparativeTable */,
@@ -8750,6 +8786,7 @@
 				ADB2D6E9294740F30029D2B3 /* KMPrintPaperSetWindowController.xib in Resources */,
 				BBA2109029ACBFDB00E6B346 /* nosign.pdf in Resources */,
 				8997012228F41AB8009AF911 /* KMLeftSideViewController.xib in Resources */,
+				AD2D74B029F0CEB300EDC5E4 /* KMCancellationWindowController.xib in Resources */,
 				ADD1B6F02946C06C00C3FFF7 /* KMPrintChoosePageSizeSizeView.xib in Resources */,
 				BBFE6E602930809A00142C01 /* KMMergeCollectionPageViewItem.xib in Resources */,
 				BBFBE6C228DD7B98008B2335 /* Assets.xcassets in Resources */,
@@ -8880,6 +8917,7 @@
 				BB7F7C0029AA586800A3E4E7 /* signAdd.png in Resources */,
 				9F0CB46A2967E5CB00007028 /* KMPropertiesPanelSubViewController.xib in Resources */,
 				9F0CB4722967E63100007028 /* KMPropertiesPanelNameSubVC.xib in Resources */,
+				AD2D74B929F0D3A100EDC5E4 /* KMCancellationSuccessView.xib in Resources */,
 				BB3AAB9329878CE000992A5A /* KMWatermarkAdjectivePropertyMainController.xib in Resources */,
 				ADD272D429B9CFE20032B5D6 /* KMLightNoNetworkView.xib in Resources */,
 				9F8539E7294712D600DF644E /* KMChromiumTabContents.xib in Resources */,
@@ -9150,6 +9188,7 @@
 				89E4E7302963FBA2002DBA6F /* KMPropertiesViewPopController.xib in Resources */,
 				ADE614B229779C6D00F62ED7 /* KMImageTitleButton.xib in Resources */,
 				9F221EDB29A9EC0900978A59 /* KMFillSignTextPanel.xib in Resources */,
+				AD2D74BA29F0D3A100EDC5E4 /* KMCancellationSuccessView.xib in Resources */,
 				BB2F61542966A91D001CB369 /* KMBackgroundPropertyHomeController.xib in Resources */,
 				9F0CB4632966C9E200007028 /* KMFormPropertPanelViewController.xib in Resources */,
 				ADB2D6FE294882B70029D2B3 /* KMTextFieldStepperView.xib in Resources */,
@@ -9169,6 +9208,7 @@
 				ADB1FEAB2975310A00ED072D /* KMBatchRemoveView.xib in Resources */,
 				9FBC48BC299B44C600CA39D7 /* KMSecondaryViewController.xib in Resources */,
 				8997012F28F42F15009AF911 /* Biochemistry.pdf in Resources */,
+				AD2D74B129F0CEB300EDC5E4 /* KMCancellationWindowController.xib in Resources */,
 				9F1FE4DF29406E4700E952CA /* .gclient in Resources */,
 				BB69C960299116FD0001A9B1 /* plaid.pdf in Resources */,
 				AD0FA4FF29A8DD8700EDEB50 /* KMRegisterSuccessView.xib in Resources */,
@@ -9363,6 +9403,7 @@
 				BB49ED03293F459500C82CA2 /* KMConvertPPTsWindowController.xib in Resources */,
 				BB89723F294B3C840045787C /* KMWatermarkPropertyController.xib in Resources */,
 				BB49ECFB293F44DC00C82CA2 /* KMConvertExcelWindowController.xib in Resources */,
+				AD2D74B229F0CEB300EDC5E4 /* KMCancellationWindowController.xib in Resources */,
 				ADB1FE9429752F7D00ED072D /* KMBatchBackgroundView.xib in Resources */,
 				9F853A042947137500DF644E /* default-icon.pdf in Resources */,
 				9F8539ED2947131F00DF644E /* KMChromiumTabView.xib in Resources */,
@@ -9448,6 +9489,7 @@
 				BB89721D294AED6C0045787C /* KMWatermarkAdjectivePreViewBaseController.xib in Resources */,
 				9FA693AD2987C0590055488A /* KMStepperView.xib in Resources */,
 				BB89721D294AED6C0045787C /* KMWatermarkAdjectivePreViewBaseController.xib in Resources */,
+				AD2D74BB29F0D3A100EDC5E4 /* KMCancellationSuccessView.xib in Resources */,
 				ADED71DB29B57C01005EEC0A /* Localizable.strings in Resources */,
 				9F72D20D2994BDAF00DCACF1 /* KMNotificationVC.xib in Resources */,
 				ADB2D6EB294740F30029D2B3 /* KMPrintPaperSetWindowController.xib in Resources */,
@@ -9708,6 +9750,7 @@
 				ADB1FE5D2975182100ED072D /* KMBatchProcessingDeleteTableCell.swift in Sources */,
 				BB162E9B295073B40088E9D1 /* KMWatermarkManager.swift in Sources */,
 				BB4BD9CC2909026500A66A65 /* KMRightSideViewController.swift in Sources */,
+				AD2D74B529F0D39500EDC5E4 /* KMCancellationSuccessView.swift in Sources */,
 				9F080B23298FCB0D00FC27DA /* KMDesignToken+Action.swift in Sources */,
 				ADC075C029866AE6006C752F /* KMBatchTextRecognitionView.swift in Sources */,
 				9F1FE4B429406E4700E952CA /* CTBrowser.m in Sources */,
@@ -9879,6 +9922,7 @@
 				BB8115FF2992682F0008F536 /* KMSecureLimitAlertView.swift in Sources */,
 				BBB14A5B2978EBBE00936EDB /* KMRedactMutilPageFlagContentView.swift in Sources */,
 				9F72D2032994A3B800DCACF1 /* KMDesignToken+Notification.swift in Sources */,
+				AD2D74AD29F0CEB300EDC5E4 /* KMCancellationWindowController.swift in Sources */,
 				9F1FE4B729406E4700E952CA /* CTBrowserFrameView.m in Sources */,
 				BB146FD8299DC0D100784A6A /* GTLRFramework.m in Sources */,
 				ADCB98C92924741B00B51A03 /* KMBatchProcessingView.swift in Sources */,
@@ -10459,6 +10503,7 @@
 				ADB1FE5E2975182100ED072D /* KMBatchProcessingDeleteTableCell.swift in Sources */,
 				9FDD0FAB29534FCC000C4DAD /* KMAliasLight.swift in Sources */,
 				BBF38A63294F53FD0086D025 /* KMWatermarkFileView.swift in Sources */,
+				AD2D74B629F0D39500EDC5E4 /* KMCancellationSuccessView.swift in Sources */,
 				9F080B24298FCB0D00FC27DA /* KMDesignToken+Action.swift in Sources */,
 				ADC075C129866AE6006C752F /* KMBatchTextRecognitionView.swift in Sources */,
 				F37322F4292DF9410013862C /* CSelfSignAnnotationFreeText.m in Sources */,
@@ -10630,6 +10675,7 @@
 				BB8116002992682F0008F536 /* KMSecureLimitAlertView.swift in Sources */,
 				BBB14A5C2978EBBE00936EDB /* KMRedactMutilPageFlagContentView.swift in Sources */,
 				9F72D2042994A3B800DCACF1 /* KMDesignToken+Notification.swift in Sources */,
+				AD2D74AE29F0CEB300EDC5E4 /* KMCancellationWindowController.swift in Sources */,
 				ADCB996C292C65EE00B51A03 /* KMGOCRManager.m in Sources */,
 				BB146FD9299DC0D100784A6A /* GTLRFramework.m in Sources */,
 				89752DB92936F9B9003FF08E /* NSButton+TitleColor.m in Sources */,
@@ -11350,6 +11396,7 @@
 				BB2EDF7B296ECE17003BCF58 /* KMPageEditThumbnailItem.swift in Sources */,
 				9FD0FA4D29D43D6800F2AB0D /* KMDeviceBrowserWindowController.swift in Sources */,
 				BB146FC2299DC0D100784A6A /* GTMSessionFetcherLogging.m in Sources */,
+				AD2D74AF29F0CEB300EDC5E4 /* KMCancellationWindowController.swift in Sources */,
 				AD0FA4F229A8580D00EDEB50 /* KMComparativeTableView.swift in Sources */,
 				BB49ED10293F462E00C82CA2 /* KMConvertImageWindowController.swift in Sources */,
 				BBF38A60294F42FF0086D025 /* KMWatermarkAdjectiveStepper.swift in Sources */,
@@ -11713,6 +11760,7 @@
 				9F8539CD29430BF300DF644E /* KMBrowserWindowController.swift in Sources */,
 				BB8F4567295AA3ED0037EA22 /* KMHeaderFooterManager.swift in Sources */,
 				9F705F78291A3A84005199AD /* KMHistoryFileDeleteWindowController.swift in Sources */,
+				AD2D74B729F0D39500EDC5E4 /* KMCancellationSuccessView.swift in Sources */,
 				ADE3C1FF29A5C44700793B13 /* KMLightMemberManager.swift in Sources */,
 				BB146FD7299DC0D100784A6A /* GTLRObject.m in Sources */,
 				BB6DD81A29348A00001F0544 /* KMSecureEncryptComboBoxCellView.swift in Sources */,

PDF Office/PDF Office.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2621,8 +2621,8 @@
             filePath = "PDF Office/Class/KMLightMember/Controller/VerificationCode/KMVerficationCodeWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "67"
-            endingLineNumber = "67"
+            startingLineNumber = "69"
+            endingLineNumber = "69"
             landmarkName = "setup()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2637,8 +2637,8 @@
             filePath = "PDF Office/Class/KMLightMember/Controller/VerificationCode/KMVerficationCodeWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "78"
-            endingLineNumber = "78"
+            startingLineNumber = "83"
+            endingLineNumber = "83"
             landmarkName = "setup()"
             landmarkType = "7">
          </BreakpointContent>

PDF Office/PDF Office/Class/KMLightMember/Controller/AccountInfo/KMAccountInfoWindowController.swift

@@ -40,7 +40,7 @@ class KMAccountInfoWindowController: NSWindowController {
             let controller: KMAccountInfoWindowController = KMAccountInfoWindowController.init(windowNibName: "KMAccountInfoWindowController")
             controller.inputType = type
             controller.cancellAtionAction = { controller in
-                KMVerficationCodeWindowController.show(window: NSApp.mainWindow!)
+                KMVerficationCodeWindowController.show(window: (accountInfoController?.window)!)
             }
             window.beginSheet(controller.window!)
             accountInfoController = controller
@@ -107,10 +107,10 @@ class KMAccountInfoWindowController: NSWindowController {
                     return
                 } else if result == .alertSecondButtonReturn {
                     guard let callBack = cancellAtionAction else { return }
-                    accountInfoMainWindow?.endSheet(view.window!)
-                    view.window?.close()
-                    accountInfoController = nil
-                    accountInfoMainWindow = nil
+//                    accountInfoMainWindow?.endSheet(view.window!)
+//                    view.window?.close()
+//                    accountInfoController = nil
+//                    accountInfoMainWindow = nil
                     callBack(self)
                 }
                 

PDF Office/PDF Office/Class/KMLightMember/Controller/Cancellation/KMCancellationWindowController.swift

@@ -0,0 +1,47 @@
+//
+//  KMCancellationWindowController.swift
+//  PDF Office
+//
+//  Created by lizhe on 2023/4/20.
+//
+
+import Cocoa
+
+var cancellationController: KMCancellationWindowController?
+var cancellationMainWindow: NSWindow?
+
+class KMCancellationWindowController: NSWindowController {
+    @IBOutlet weak var cancellationSuccessView: KMCancellationSuccessView!
+    
+    override func windowDidLoad() {
+        super.windowDidLoad()
+
+        // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+        self.setup()
+    }
+    
+    //MARK: 打开文件
+    static func show(window: NSWindow) -> KMCancellationWindowController {
+        let controller: KMCancellationWindowController = KMCancellationWindowController.init(windowNibName: "KMCancellationWindowController")
+        window.beginSheet(controller.window!)
+        controller.window?.center()
+        cancellationController = controller
+        cancellationMainWindow = window
+        return controller
+    }
+    
+    func setup() {
+        self.window?.contentView?.backgroundColor(NSColor(hex: "#FFFFFF"))
+        
+        self.cancellationSuccessView.cancelAction = { view in
+            verficationCodeMainWindow?.endSheet(view.window!)
+            view.window?.close()
+            verficationCodeController = nil
+            verficationCodeMainWindow = nil
+        }
+    }
+}
+
+extension KMCancellationWindowController {
+    
+}

PDF Office/PDF Office/Class/KMLightMember/Controller/Cancellation/KMCancellationWindowController.xib

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="KMCancellationWindowController" customModule="PDF_Office" customModuleProvider="target">
+            <connections>
+                <outlet property="cancellationSuccessView" destination="bC2-6O-qNO" id="3iN-wt-3PW"/>
+                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+            <windowStyleMask key="styleMask" titled="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="319" height="380"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <view key="contentView" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="0.0" width="319" height="380"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="bC2-6O-qNO" customClass="KMCancellationSuccessView" customModule="PDF_Office" customModuleProvider="target">
+                        <rect key="frame" x="0.0" y="0.0" width="319" height="380"/>
+                    </customView>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="bC2-6O-qNO" secondAttribute="trailing" id="1sy-91-Cgh"/>
+                    <constraint firstAttribute="bottom" secondItem="bC2-6O-qNO" secondAttribute="bottom" id="7Xk-nJ-37Y"/>
+                    <constraint firstItem="bC2-6O-qNO" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="ScW-6E-B8R"/>
+                    <constraint firstItem="bC2-6O-qNO" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="Uhq-vf-bt4"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
+            </connections>
+            <point key="canvasLocation" x="58.5" y="196"/>
+        </window>
+    </objects>
+</document>

PDF Office/PDF Office/Class/KMLightMember/Controller/Cancellation/View/KMCancellationSuccessView.swift

@@ -0,0 +1,76 @@
+//
+//  KMCancellationSuccessView.swift
+//  PDF Office
+//
+//  Created by lizhe on 2023/4/20.
+//
+
+import Cocoa
+
+typealias KMCancellationSuccessViewCancelAction = (_ view: KMCancellationSuccessView) -> Void
+
+class KMCancellationSuccessView: KMBaseXibView {
+
+    @IBOutlet weak var closeBox: KMBox!
+    @IBOutlet weak var closeButton: NSButton!
+    @IBOutlet weak var titleLabel: NSTextField!
+    @IBOutlet weak var subTitleLabel: NSTextField!
+    @IBOutlet weak var doneView: NSView!
+    var doneButtonVC: KMDesignButton!
+    
+    var cancelAction: KMCancellationSuccessViewCancelAction?
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+
+        // Drawing code here.
+    }
+    
+    override func setup() {
+        super.setup()
+        
+        self.closeBox.moveCallback = { [unowned self] (mouseEntered, mouseBox) in
+            if mouseEntered {
+                self.closeButton.image = NSImage(named: "control_btn_icon_close_hov")
+            } else {
+                self.closeButton.image = NSImage(named: "control_btn_icon_close")
+            }
+        }
+        
+        self.titleLabel.font = NSFont.SFProTextSemibold(19.0)
+        self.titleLabel.textColor = NSColor(hex: "#252629")
+        
+        self.subTitleLabel.font = NSFont.SFProTextRegular(14.0)
+        self.subTitleLabel.textColor = NSColor(hex: "#616469")
+        self.subTitleLabel.maximumNumberOfLines = 0
+        
+        self.doneButtonVC = KMDesignButton(withType: .Text)
+        self.doneView.addSubview(self.doneButtonVC.view)
+        self.doneButtonVC?.view.frame = self.doneView.bounds
+        self.doneButtonVC.target = self
+        self.doneButtonVC.action = #selector(closeButtonAction)
+        self.doneButtonVC.button(type: .Cta, size: .m)
+        self.doneButtonVC.button.keyEquivalent = KMKeyEquivalent.enter
+        self.doneButtonVC.stringValue = NSLocalizedString("OK", comment: "")
+        self.doneButtonVC.updateUI()
+    }
+        
+    override func reloadData() {
+        super.reloadData()
+        
+    }
+    
+    override func updateLanguage() {
+        super.updateLanguage()
+        self.titleLabel.stringValue = NSLocalizedString("Cancellation Submitted", comment: "")
+        self.subTitleLabel.stringValue = NSLocalizedString("Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again", comment: "")
+        self.doneButtonVC.stringValue = NSLocalizedString("OK", comment: "")
+    }
+}
+
+extension KMCancellationSuccessView {
+    @IBAction func closeButtonAction(_ sender: Any) {
+        guard let callBack = cancelAction else { return }
+        
+        callBack(self)
+    }
+}

PDF Office/PDF Office/Class/KMLightMember/Controller/Cancellation/View/KMCancellationSuccessView.xib

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="KMCancellationSuccessView" customModule="PDF_Office" customModuleProvider="target">
+            <connections>
+                <outlet property="closeBox" destination="Ews-5U-e3e" id="t0c-47-yxx"/>
+                <outlet property="closeButton" destination="Tx7-Ft-LhQ" id="ugb-xT-o47"/>
+                <outlet property="doneView" destination="ICE-z5-M1Q" id="3pB-il-NkF"/>
+                <outlet property="subTitleLabel" destination="iye-TR-Rcu" id="v1G-3q-xS3"/>
+                <outlet property="titleLabel" destination="i1q-1C-cVS" id="gZH-Jx-huE"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="326" height="408"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="M22-FE-Phc">
+                    <rect key="frame" x="48" y="122" width="230" height="238"/>
+                    <subviews>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="v3R-yS-PKg">
+                            <rect key="frame" x="70" y="148" width="90" height="90"/>
+                            <subviews>
+                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SAP-e1-U1t">
+                                    <rect key="frame" x="0.0" y="0.0" width="90" height="90"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="icon_success_tips" id="xEq-G7-TX4"/>
+                                </imageView>
+                            </subviews>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="90" id="XjS-oT-Mty"/>
+                                <constraint firstAttribute="width" constant="90" id="mqp-Wr-uiK"/>
+                            </constraints>
+                        </customView>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i1q-1C-cVS">
+                            <rect key="frame" x="-2" y="116" width="234" height="16"/>
+                            <textFieldCell key="cell" lineBreakMode="charWrapping" alignment="center" title="Cancellation Submitted" id="62J-pr-O9u">
+                                <font key="font" usesAppearanceFont="YES"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iye-TR-Rcu">
+                            <rect key="frame" x="-2" y="36" width="234" height="64"/>
+                            <textFieldCell key="cell" lineBreakMode="charWrapping" alignment="center" title="Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again" id="eGy-Ov-ABz">
+                                <font key="font" usesAppearanceFont="YES"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="iye-TR-Rcu" firstAttribute="top" secondItem="i1q-1C-cVS" secondAttribute="bottom" constant="16" id="8c4-Ho-aqf"/>
+                        <constraint firstItem="v3R-yS-PKg" firstAttribute="centerX" secondItem="M22-FE-Phc" secondAttribute="centerX" id="Z9v-OB-DWq"/>
+                        <constraint firstAttribute="height" constant="238" id="eYR-le-rcN"/>
+                        <constraint firstAttribute="width" constant="230" id="hec-4J-W5K"/>
+                        <constraint firstAttribute="trailing" secondItem="i1q-1C-cVS" secondAttribute="trailing" id="iib-xz-DN4"/>
+                        <constraint firstItem="iye-TR-Rcu" firstAttribute="centerX" secondItem="M22-FE-Phc" secondAttribute="centerX" id="jYH-Os-t3X"/>
+                        <constraint firstItem="iye-TR-Rcu" firstAttribute="leading" secondItem="M22-FE-Phc" secondAttribute="leading" id="lIZ-xc-68e"/>
+                        <constraint firstItem="i1q-1C-cVS" firstAttribute="top" secondItem="v3R-yS-PKg" secondAttribute="bottom" constant="16" id="ph2-LT-Tum"/>
+                        <constraint firstItem="v3R-yS-PKg" firstAttribute="top" secondItem="M22-FE-Phc" secondAttribute="top" id="qND-ac-gmc"/>
+                        <constraint firstItem="i1q-1C-cVS" firstAttribute="centerX" secondItem="M22-FE-Phc" secondAttribute="centerX" id="rdl-GI-BIU"/>
+                        <constraint firstItem="i1q-1C-cVS" firstAttribute="leading" secondItem="M22-FE-Phc" secondAttribute="leading" id="ucl-5D-jAo"/>
+                        <constraint firstAttribute="trailing" secondItem="iye-TR-Rcu" secondAttribute="trailing" id="vmJ-VK-75G"/>
+                    </constraints>
+                </customView>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="i4O-Wa-FiJ">
+                    <rect key="frame" x="0.0" y="380" width="326" height="28"/>
+                    <subviews>
+                        <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="Ews-5U-e3e" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                            <rect key="frame" x="8" y="8" width="12" height="12"/>
+                            <view key="contentView" id="k6j-Be-QCf">
+                                <rect key="frame" x="0.0" y="0.0" width="12" height="12"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            </view>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="12" id="Q3a-SF-zQB"/>
+                                <constraint firstAttribute="width" constant="12" id="YIj-ZS-wDh"/>
+                            </constraints>
+                        </box>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Tx7-Ft-LhQ">
+                            <rect key="frame" x="8" y="8" width="12" height="12"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="12" id="01y-7H-n7t"/>
+                                <constraint firstAttribute="width" constant="12" id="Ege-Ta-tLC"/>
+                            </constraints>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="control_btn_icon_close" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="jmB-Fp-WOg">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="closeButtonAction:" target="-2" id="4ZL-7U-SRB"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="Tx7-Ft-LhQ" firstAttribute="centerY" secondItem="i4O-Wa-FiJ" secondAttribute="centerY" id="EPh-9t-gTt"/>
+                        <constraint firstItem="Ews-5U-e3e" firstAttribute="leading" secondItem="i4O-Wa-FiJ" secondAttribute="leading" constant="8" id="Y1g-R1-5jT"/>
+                        <constraint firstAttribute="height" constant="28" id="eAM-wW-B3T"/>
+                        <constraint firstItem="Tx7-Ft-LhQ" firstAttribute="leading" secondItem="i4O-Wa-FiJ" secondAttribute="leading" constant="8" id="i6L-Gm-PVw"/>
+                        <constraint firstItem="Ews-5U-e3e" firstAttribute="centerY" secondItem="i4O-Wa-FiJ" secondAttribute="centerY" id="zxu-C4-nb6"/>
+                    </constraints>
+                </customView>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="ICE-z5-M1Q">
+                    <rect key="frame" x="32" y="50" width="262" height="32"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="32" id="36K-gi-LVF"/>
+                        <constraint firstAttribute="width" constant="262" id="CbA-10-CEc"/>
+                    </constraints>
+                </customView>
+            </subviews>
+            <constraints>
+                <constraint firstItem="M22-FE-Phc" firstAttribute="top" secondItem="i4O-Wa-FiJ" secondAttribute="bottom" constant="20" id="1ig-dk-AXZ"/>
+                <constraint firstItem="ICE-z5-M1Q" firstAttribute="centerX" secondItem="c22-O7-iKe" secondAttribute="centerX" id="6fF-3w-lD6"/>
+                <constraint firstAttribute="trailing" secondItem="i4O-Wa-FiJ" secondAttribute="trailing" id="Fqq-ST-fvm"/>
+                <constraint firstItem="M22-FE-Phc" firstAttribute="centerX" secondItem="c22-O7-iKe" secondAttribute="centerX" id="Mgj-Un-Tcx"/>
+                <constraint firstItem="i4O-Wa-FiJ" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="Ulf-QH-blD"/>
+                <constraint firstItem="i4O-Wa-FiJ" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="eza-Wo-ze3"/>
+                <constraint firstItem="ICE-z5-M1Q" firstAttribute="top" secondItem="M22-FE-Phc" secondAttribute="bottom" constant="40" id="t3h-Of-pUs"/>
+            </constraints>
+            <point key="canvasLocation" x="132" y="-72"/>
+        </customView>
+    </objects>
+    <resources>
+        <image name="control_btn_icon_close" width="12" height="12"/>
+        <image name="icon_success_tips" width="80" height="80"/>
+    </resources>
+</document>

PDF Office/PDF Office/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Office/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/KMComparativeOutlineView.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Office/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeTableView.xib

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -77,10 +76,10 @@
                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="background_comparative_bottom_Rectangle" id="U04-um-UqT"/>
                         </imageView>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fi1-h8-mNt">
-                            <rect key="frame" x="318" y="54" width="200" height="44"/>
+                            <rect key="frame" x="274" y="54" width="288" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="AIN-Cj-LFB"/>
-                                <constraint firstAttribute="width" constant="200" id="pzt-Mx-zXb"/>
+                                <constraint firstAttribute="width" constant="288" id="pzt-Mx-zXb"/>
                             </constraints>
                             <buttonCell key="cell" type="bevel" title="Login" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="ujH-rs-1q9">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

PDF Office/PDF Office/Class/KMLightMember/Controller/VerificationCode/KMVerficationCodeWindowController.swift

@@ -12,6 +12,7 @@ var verficationCodeMainWindow: NSWindow?
 class KMVerficationCodeWindowController: NSWindowController {
 
     @IBOutlet weak var verificationCodeView: KMVerificationCodeView!
+    @IBOutlet weak var networkView: KMLightNoNetworkView!
     
     var inputType: DataNavigationViewButtonActionType?
     
@@ -31,6 +32,7 @@ class KMVerficationCodeWindowController: NSWindowController {
         let controller: KMVerficationCodeWindowController = KMVerficationCodeWindowController.init(windowNibName: "KMVerficationCodeWindowController")
         controller.inputType = type
         window.beginSheet(controller.window!)
+        controller.window?.center()
         controller.verificationCodeView.inputType = .accountInfo
         controller.verificationCodeView.model.email = KMLightMemberManager.manager.info.email
         controller.sendVerifyCode(sender: nil)
@@ -65,6 +67,9 @@ class KMVerficationCodeWindowController: NSWindowController {
                     verficationCodeMainWindow?.endSheet(view.window!)
                     view.window?.close()
                     verficationCodeController = nil
+            
+                    KMCancellationWindowController.show(window: verficationCodeMainWindow!)
+                    verficationCodeMainWindow = nil
                 } else {
                     self.verificationCodeView.showAlert(result: result)
                 }
@@ -86,6 +91,16 @@ class KMVerficationCodeWindowController: NSWindowController {
                 }
             }
         }
+        
+        KMRequestServer.requestServer.reachabilityStatusChange { [weak self] status in
+            if status == .notReachable {
+                print("无网络")
+                self?.networkView.isHidden = false
+            } else {
+                print("有网络")
+                self?.networkView.isHidden = true
+            }
+        }
     }
     
     func sendVerifyCode(sender: NSTextView?) {

PDF Office/PDF Office/Class/KMLightMember/Controller/VerificationCode/KMVerficationCodeWindowController.xib

@@ -7,6 +7,7 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMVerficationCodeWindowController" customModule="PDF_Office" customModuleProvider="target">
             <connections>
+                <outlet property="networkView" destination="UNI-Yj-LyJ" id="lvY-N6-pJv"/>
                 <outlet property="verificationCodeView" destination="ksJ-GD-QC6" id="3YM-U7-z9q"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
@@ -25,10 +26,17 @@
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="ksJ-GD-QC6" customClass="KMVerificationCodeView" customModule="PDF_Office" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="0.0" width="326" height="368"/>
                     </customView>
+                    <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UNI-Yj-LyJ" customClass="KMLightNoNetworkView" customModule="PDF_Office" customModuleProvider="target">
+                        <rect key="frame" x="0.0" y="0.0" width="326" height="348"/>
+                    </customView>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="UNI-Yj-LyJ" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="7XQ-ZW-P5S"/>
                     <constraint firstAttribute="trailing" secondItem="ksJ-GD-QC6" secondAttribute="trailing" id="Gch-f0-mup"/>
+                    <constraint firstAttribute="trailing" secondItem="UNI-Yj-LyJ" secondAttribute="trailing" id="Jib-o9-cle"/>
+                    <constraint firstAttribute="bottom" secondItem="UNI-Yj-LyJ" secondAttribute="bottom" id="Y5X-J3-y85"/>
                     <constraint firstAttribute="bottom" secondItem="ksJ-GD-QC6" secondAttribute="bottom" id="kgQ-N6-vMG"/>
+                    <constraint firstItem="UNI-Yj-LyJ" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="20" id="poW-2z-1VQ"/>
                     <constraint firstItem="ksJ-GD-QC6" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="tF0-Hj-4i7"/>
                     <constraint firstItem="ksJ-GD-QC6" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="ztP-V6-0y2"/>
                 </constraints>

PDF Office/PDF Office/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift

@@ -209,14 +209,14 @@ class KMVerificationCodeView: KMBaseXibView {
             item?.isEnabled = !self.isNetworking
         }
         
-        if self.verificationCode.count == 6 &&
-//            self.time != -1 &&
-            self.codeIsTrue {
-            self.cancellationButtonVC.enabled = true
-        } else {
-            self.cancellationButtonVC.enabled = false
-            self.showAlert(result: Result(code: 0))
-        }
+//        if self.verificationCode.count == 6 &&
+////            self.time != -1 &&
+//            self.codeIsTrue {
+//            self.cancellationButtonVC.enabled = true
+//        } else {
+//            self.cancellationButtonVC.enabled = false
+//            self.showAlert(result: Result(code: 0))
+//        }
     }
     
     override func updateLanguage() {