【会员系统】DMG PDF To Office 升级内嵌网页补充回来

PDF Office/PDF Master/AppDelegate.swift

@@ -813,7 +813,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
 //        if tWorkSpace.open(url!) == false {
 //            tWorkSpace.open(url!)
 //        }
-        let embeddedWC = KMPurchaseEmbeddedWindowController.currentFirstTrialWC("com.brother.pdfreaderpro.mac.product_2")
+        let embeddedWC = DMGEmbeddedOldWC.currentFirstTrialWC("com.brother.pdfreaderpro.mac.product_2")
         embeddedWC.showWindow(nil)
         embeddedWC.window?.center()
 #endif

PDF Office/PDF Master/Class/GuideInfo/KMCouponDueWindowController.xib

@@ -1,8 +1,8 @@
 <?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="22505" 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="22505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -26,7 +26,7 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="196" y="240" width="660" height="443"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <value key="minSize" type="size" width="660" height="443"/>
             <value key="maxSize" type="size" width="660" height="443"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -59,7 +59,7 @@
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="IRn-Nx-1SH">
                                     <rect key="frame" x="336" y="21" width="266" height="338"/>
                                     <subviews>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mL0-nw-nO3">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mL0-nw-nO3">
                                             <rect key="frame" x="-2" y="313" width="172" height="25"/>
                                             <textFieldCell key="cell" alignment="left" title="Limited-time Offer" id="Dv5-Ir-uCY">
                                                 <font key="font" metaFont="system" size="21"/>
@@ -67,7 +67,7 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jjn-yZ-D7c">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jjn-yZ-D7c">
                                             <rect key="frame" x="-2" y="258" width="270" height="51"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="266" id="6J1-BA-Y1S"/>
@@ -117,7 +117,7 @@
                                             </constraints>
                                             <color key="fillColor" red="1" green="0.61799015410958902" blue="0.16566780821917809" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         </box>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VRY-Yk-fAD">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VRY-Yk-fAD">
                                             <rect key="frame" x="-2" y="20" width="270" height="14"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="266" id="5bJ-Fv-1Zy"/>

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMToolCompareWindowController.swift

@@ -237,7 +237,7 @@ var currentWindowController: KMToolCompareWindowController? = nil
     
     func verificationBuy() {
 #if VERSION_DMG
-        let embeddedWC = KMPurchaseEmbeddedWindowController.currentFirstTrialWC(KMAISubscriptionMonthCodeKey_DMG)
+        let embeddedWC = KMPurchaseEmbeddedWindowController.currentFirstTrialWC(KMStandardAnnualSubscriptionCodeKey_DMG)
         embeddedWC.showWindow(nil)
         embeddedWC.window?.center()
 #endif
@@ -248,7 +248,7 @@ var currentWindowController: KMToolCompareWindowController? = nil
 //        var url = URL(string: Store_Link + "?product_code=product_2&utm_source=MacAppDmg&utm_campaign=OfficeStoreLink&utm_medium=PdfOfficeStore")
 //        NSWorkspace.shared.open(url!)
 //        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_PDFtoOffice_Buy"])
-        let embeddedWC = KMPurchaseEmbeddedWindowController.currentFirstTrialWC("com.brother.pdfreaderpro.mac.product_2")
+        let embeddedWC = DMGEmbeddedOldWC.currentFirstTrialWC("com.brother.pdfreaderpro.mac.product_2")
         embeddedWC.showWindow(nil)
         embeddedWC.window?.center()
 #endif

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -498,11 +498,11 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
         abbreviation = @"￥";
     }
     if ([self.buySwitch state]) {
-        originalText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getPrice:@"com.brother.pdfreaderpro.mac.product_3"]];
-        discountText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getActivityPrice:@"com.brother.pdfreaderpro.mac.product_3"]];
+        originalText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getPrice:KMAdvancedAnnualSubscriptionCodeKey_DMG]];
+        discountText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getActivityPrice:KMAdvancedAnnualSubscriptionCodeKey_DMG]];
     } else {
-        originalText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getPrice:@"com.brother.pdfreaderpro.mac.product_1"]];
-        discountText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getActivityPrice:@"com.brother.pdfreaderpro.mac.product_1"]];
+        originalText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getPrice:KMStandardAnnualSubscriptionCodeKey_DMG]];
+        discountText = [NSString stringWithFormat:@"%@%@", abbreviation, [[KMDMGProductsManager shareInstance] getActivityPrice:KMStandardAnnualSubscriptionCodeKey_DMG]];
     }
 #endif
     NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString:originalText];
@@ -663,9 +663,9 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
     
     NSString *productID = @"";
     if ([self.buySwitch state]) {
-        productID = @"com.brother.pdfreaderpro.mac.product_3";
+        productID = KMAdvancedAnnualSubscriptionCodeKey_DMG;
     } else {
-        productID = @"com.brother.pdfreaderpro.mac.product_1";
+        productID = KMStandardAnnualSubscriptionCodeKey_DMG;
     }
     KMPurchaseEmbeddedWindowController *embeddedWC = [KMPurchaseEmbeddedWindowController currentFirstTrialWC:productID];
     embeddedWC.kEventName = thePaidEventName;

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseLimitWindowController.swift

@@ -162,7 +162,7 @@ class KMPurchaseLimitWindowController: NSWindowController {
 //        NSWorkspace.shared.open(url)
 //        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_PDFtoOffice_Buy"])
 #if VERSION_DMG
-        let embeddedWC = KMPurchaseEmbeddedWindowController.currentFirstTrialWC("com.brother.pdfreaderpro.mac.product_2")
+        let embeddedWC = DMGEmbeddedOldWC.currentFirstTrialWC("com.brother.pdfreaderpro.mac.product_2")
         embeddedWC.showWindow(nil)
         embeddedWC.window?.center()
 #endif

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -1220,6 +1220,12 @@
 		9FC3466F2CD35D2900F35823 /* KMUserInfoVCModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC3466C2CD35D2800F35823 /* KMUserInfoVCModel.swift */; };
 		9FC444FA2AA61EDE00D7187C /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FC444F82AA5F7D600D7187C /* ZipArchive.framework */; };
 		9FC444FB2AA61EDE00D7187C /* ZipArchive.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9FC444F82AA5F7D600D7187C /* ZipArchive.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		9FCF4F172CEC648000F0FB89 /* DMGEmbeddedOldWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCF4F152CEC648000F0FB89 /* DMGEmbeddedOldWC.swift */; };
+		9FCF4F182CEC648000F0FB89 /* DMGEmbeddedOldWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCF4F152CEC648000F0FB89 /* DMGEmbeddedOldWC.swift */; };
+		9FCF4F192CEC648000F0FB89 /* DMGEmbeddedOldWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCF4F152CEC648000F0FB89 /* DMGEmbeddedOldWC.swift */; };
+		9FCF4F1A2CEC648000F0FB89 /* DMGEmbeddedOldWC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FCF4F162CEC648000F0FB89 /* DMGEmbeddedOldWC.xib */; };
+		9FCF4F1B2CEC648000F0FB89 /* DMGEmbeddedOldWC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FCF4F162CEC648000F0FB89 /* DMGEmbeddedOldWC.xib */; };
+		9FCF4F1C2CEC648000F0FB89 /* DMGEmbeddedOldWC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FCF4F162CEC648000F0FB89 /* DMGEmbeddedOldWC.xib */; };
 		9FCFEC682AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFEC672AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift */; };
 		9FCFEC692AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFEC672AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift */; };
 		9FCFEC6A2AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFEC672AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift */; };
@@ -6247,6 +6253,8 @@
 		9FC346652CD22F1000F35823 /* KMUserInfoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMUserInfoViewController.xib; sourceTree = "<group>"; };
 		9FC3466C2CD35D2800F35823 /* KMUserInfoVCModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMUserInfoVCModel.swift; sourceTree = "<group>"; };
 		9FC444F82AA5F7D600D7187C /* ZipArchive.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ZipArchive.framework; sourceTree = "<group>"; };
+		9FCF4F152CEC648000F0FB89 /* DMGEmbeddedOldWC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DMGEmbeddedOldWC.swift; sourceTree = "<group>"; };
+		9FCF4F162CEC648000F0FB89 /* DMGEmbeddedOldWC.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DMGEmbeddedOldWC.xib; sourceTree = "<group>"; };
 		9FCFEC672AC2EAD500EAD2CB /* CPDFListViewColorMenuItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPDFListViewColorMenuItemView.swift; sourceTree = "<group>"; };
 		9FCFEC6B2AC3D96800EAD2CB /* CPDFListViewAnimatedBorderlessWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPDFListViewAnimatedBorderlessWindow.swift; sourceTree = "<group>"; };
 		9FCFEC6F2AC40F9B00EAD2CB /* CStampSignatureObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CStampSignatureObject.swift; sourceTree = "<group>"; };
@@ -13918,6 +13926,8 @@
 				9F3A48C42C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.xib */,
 				9F0ACC022C883464009574D5 /* KMEmbeddedPaymentPopWC.swift */,
 				9F0ACC032C883464009574D5 /* KMEmbeddedPaymentPopWC.xib */,
+				9FCF4F152CEC648000F0FB89 /* DMGEmbeddedOldWC.swift */,
+				9FCF4F162CEC648000F0FB89 /* DMGEmbeddedOldWC.xib */,
 				9FDDFDBE2C93E4DC0051B6FC /* paddle.js */,
 				BB183DD72B4EBDD300F99C7E /* Verification */,
 			);
@@ -15199,6 +15209,7 @@
 				AD867F8B29D950B400F00440 /* KMBOTAOutlineView.xib in Resources */,
 				BBB376AA2B10A7FD009539CC /* a_3a.png in Resources */,
 				BB897259294C559F0045787C /* KMWatermarkPropertyCreateController.xib in Resources */,
+				9FCF4F1A2CEC648000F0FB89 /* DMGEmbeddedOldWC.xib in Resources */,
 				AD867FB729DFBB3200F00440 /* KMAnnotationOutlineCellView.xib in Resources */,
 				BB5DF1EC2959C5CB0025CDA1 /* KMHeaderFooterPreviewController.xib in Resources */,
 				ADD1B6CF29431D7100C3FFF7 /* KMPrintPreviewView.xib in Resources */,
@@ -15786,6 +15797,7 @@
 				AD8810A429A8459000178CA1 /* KMComparativeTableViewController.xib in Resources */,
 				AD0FA4F629A8582C00EDEB50 /* KMComparativeTableView.xib in Resources */,
 				AD3AAD4A2B0B7B8900DE5FE7 /* KMCompareToolbar.xib in Resources */,
+				9FCF4F1B2CEC648000F0FB89 /* DMGEmbeddedOldWC.xib in Resources */,
 				ADAFDA112AE8DD6600F084BC /* KMAdvertisementCollectionHeadView.xib in Resources */,
 				BB2F9AA72AFC8D5A00F9DD93 /* KMProfileInfoWindowController.xib in Resources */,
 				ADD1B6CC2942E85300C3FFF7 /* KMPrintBottomView.xib in Resources */,
@@ -16682,6 +16694,7 @@
 				AD3AAD202B0B5B4400DE5FE7 /* KMCompareCoveringWindowController.xib in Resources */,
 				BBFE6E842930EBD400142C01 /* KMCompressWindowController.xib in Resources */,
 				BB5F8A1E29BB15AD00365ADB /* KMEmailSubWindowController.xib in Resources */,
+				9FCF4F1C2CEC648000F0FB89 /* DMGEmbeddedOldWC.xib in Resources */,
 				AD867FB929DFBB3200F00440 /* KMAnnotationOutlineCellView.xib in Resources */,
 				BB8810812B4F7A1F00AFA63E /* KMActivityALertViewController.xib in Resources */,
 				ADE86A982B0226BB00414DFA /* KMRemovePasswordView.xib in Resources */,
@@ -17208,6 +17221,7 @@
 				BBBE20932B21B18900509C4E /* KMPDFInsertWindowController.swift in Sources */,
 				BBC28F4A2B0F509B00D73206 /* KMAnimatedBorderlessWindow.swift in Sources */,
 				BB74DA7B2AC41DE9006EDFE7 /* NSString+KMExtension.swift in Sources */,
+				9FCF4F172CEC648000F0FB89 /* DMGEmbeddedOldWC.swift in Sources */,
 				ADE86ADD2B0AF4B600414DFA /* KMCompareContentSettingWindowController.swift in Sources */,
 				AD1CA4112A061CCD0070541F /* KMAnnotationScreenColorViewItem.swift in Sources */,
 				ADDDCE242B43A32A005B4AB5 /* AppSandboxFileAccess.m in Sources */,
@@ -18901,6 +18915,7 @@
 				BB146FC4299DC0D100784A6A /* GTMReadMonitorInputStream.m in Sources */,
 				BBFA1CE32B60DD970053AD4A /* KMScreenShotEditViewController.swift in Sources */,
 				BB1B0AC02B4FC6E900889528 /* KMGuideInfoWindowController.swift in Sources */,
+				9FCF4F182CEC648000F0FB89 /* DMGEmbeddedOldWC.swift in Sources */,
 				BB1BFF7A2AEA0B8E003EB179 /* KMBatchOperateRightViewController.swift in Sources */,
 				BB1B0ADB2B4FC6E900889528 /* KMOpenFileGuideToolbar.swift in Sources */,
 				BB8115FC29924A5F0008F536 /* KMSecureEncryptCheckCellView.swift in Sources */,
@@ -20181,6 +20196,7 @@
 				F35B484D29A4903300756255 /* NSPointerArray+PDFListView.m in Sources */,
 				BBC70EB62AEA847500AC1585 /* KMToolbarCustomViewController.swift in Sources */,
 				89752E062939DB42003FF08E /* KMToolbarViewController.swift in Sources */,
+				9FCF4F192CEC648000F0FB89 /* DMGEmbeddedOldWC.swift in Sources */,
 				BB7185472C2B0AFD00C1156B /* KMEditPDFColorView.swift in Sources */,
 				89D2D2FD294C806000BFF5FE /* KMPDFThumbnailItem.swift in Sources */,
 				BBFBE74928DD7DB8008B2335 /* ViewController.swift in Sources */,