【综合】内嵌支付代码兼容AppStore版本

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

@@ -496,6 +496,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 - (void)updatePriceLabel {
     NSString *originalText = @"";
     NSString *discountText = @"";
+#if VERSION_DMG
     if ([@"USD" isEqualToString:NSLocalizedString(@"USD", nil)]) {
         if ([self.buySwitch state]) {
             originalText = [NSString stringWithFormat:@"$%@", [[KMDMGProductsManager shareInstance] getPrice:@"com.brother.pdfreaderpro.mac.product_3"]];
@@ -513,6 +514,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
             discountText = [NSString stringWithFormat:@"¥%@", [[KMDMGProductsManager shareInstance] getActivityPriceCNY:@"com.brother.pdfreaderpro.mac.product_1"]];
         }
     }
+#endif
     NSMutableAttributedString *attributedText = [[NSMutableAttributedString alloc] initWithString:originalText];
     [attributedText addAttribute:NSStrikethroughStyleAttributeName
                            value:@(NSUnderlineStyleSingle)
@@ -729,9 +731,11 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 //    
 //    [[FMTrackEventManager defaultManager] trackEventWithEvent:@"PUW" withProperties:@{@"PUW_Btn":@"PUW_Btn_BuyAITools"}];
     [self close];
+#if VERSION_DMG
     KMPurchaseEmbeddedWindowController *embeddedWC = [KMPurchaseEmbeddedWindowController currentFirstTrialWC:@"com.brother.pdfreaderpro.ai.product_1"];
     [embeddedWC showWindow:nil];
     [[embeddedWC window] center];
+#endif
 }
 
 - (IBAction)buySwitchAction:(NSSwitch *)sender {

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

@@ -7,6 +7,7 @@
 
 import Cocoa
 
+#if VERSION_DMG
 // paypal alipay wxpay paddle
 @objc enum KMPaymentType: UInt32 {
     case paypal = 0
@@ -1503,3 +1504,4 @@ extension KMPurchaseEmbeddedWindowController: NSWindowDelegate {
         KMPurchaseEmbeddedWindowController.currentWindowController = nil
     }
 }
+#endif

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

@@ -417,9 +417,11 @@ import Cocoa
 //        }
 //        callBack(self,sender,self.emailTextField.stringValue,self.nameTextField.stringValue)
 //        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_BuyNow"])
+#if VERSION_DMG
         let embeddedWC = KMPurchaseEmbeddedWindowController.currentFirstTrialWC("com.brother.pdfreaderpro.ai.product_1")
         embeddedWC.showWindow(nil)
         embeddedWC.window?.center()
+#endif
     }
     
     @IBAction func enterLicenseAction(_ sender: HyperLinkButton) {

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

@@ -161,9 +161,11 @@ class KMPurchaseLimitWindowController: NSWindowController {
 //        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"])
+#if VERSION_DMG
         let embeddedWC = KMPurchaseEmbeddedWindowController.currentFirstTrialWC("com.brother.pdfreaderpro.mac.product_2")
         embeddedWC.showWindow(nil)
         embeddedWC.window?.center()
+#endif
     }
     
     @IBAction func continueConvertAction(_ sender: Any) {

PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/KMDMGProductsManager.swift

@@ -7,6 +7,7 @@
 
 import Cocoa
 
+#if VERSION_DMG
 enum ProductType {
     case ipaConvert                     // 转档
     case ipaConvert_checkout            // 转档 单独
@@ -130,3 +131,4 @@ enum ProductType {
         }
     }
 }
+#endif

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

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		651A59822C8EA20F005A35FB /* KMPurchaseEmbeddedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3A48C32C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift */; };
+		651A59832C8EA210005A35FB /* KMPurchaseEmbeddedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3A48C32C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift */; };
 		652E953D2C6670CE0061FA40 /* KMFreehandAnnotationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 652E953C2C6670CE0061FA40 /* KMFreehandAnnotationController.swift */; };
 		652E953E2C6670CE0061FA40 /* KMFreehandAnnotationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 652E953C2C6670CE0061FA40 /* KMFreehandAnnotationController.swift */; };
 		652E953F2C6670CE0061FA40 /* KMFreehandAnnotationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 652E953C2C6670CE0061FA40 /* KMFreehandAnnotationController.swift */; };
@@ -327,7 +329,6 @@
 		9F080B24298FCB0D00FC27DA /* KMDesignToken+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B22298FCB0D00FC27DA /* KMDesignToken+Action.swift */; };
 		9F080B25298FCB0D00FC27DA /* KMDesignToken+Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B22298FCB0D00FC27DA /* KMDesignToken+Action.swift */; };
 		9F0ACC002C85CB22009574D5 /* KMDMGProductsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0ACBFD2C85CB22009574D5 /* KMDMGProductsManager.swift */; };
-		9F0ACC012C86A334009574D5 /* KMPurchaseEmbeddedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3A48C32C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift */; };
 		9F0ACC042C883464009574D5 /* KMEmbeddedPaymentPopWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0ACC022C883464009574D5 /* KMEmbeddedPaymentPopWC.swift */; };
 		9F0ACC052C883464009574D5 /* KMEmbeddedPaymentPopWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0ACC022C883464009574D5 /* KMEmbeddedPaymentPopWC.swift */; };
 		9F0ACC062C883464009574D5 /* KMEmbeddedPaymentPopWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0ACC022C883464009574D5 /* KMEmbeddedPaymentPopWC.swift */; };
@@ -690,8 +691,6 @@
 		9F39B9442A661ED500930ACA /* KMHomeScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F39B9432A661ED500930ACA /* KMHomeScrollView.swift */; };
 		9F39B9452A661ED500930ACA /* KMHomeScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F39B9432A661ED500930ACA /* KMHomeScrollView.swift */; };
 		9F39B9462A661ED500930ACA /* KMHomeScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F39B9432A661ED500930ACA /* KMHomeScrollView.swift */; };
-		9F3A48C52C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3A48C32C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift */; };
-		9F3A48C62C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3A48C32C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift */; };
 		9F3A48C72C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3A48C32C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift */; };
 		9F3A48C82C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F3A48C42C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.xib */; };
 		9F3A48C92C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F3A48C42C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.xib */; };
@@ -16430,7 +16429,6 @@
 				BBB9B310299A5D6D004F3235 /* KMCloudDownloadOperationQueue.m in Sources */,
 				ADBC375429CAE94700D93208 /* KMComparativeOutlineSectionCell.swift in Sources */,
 				9F0ACC042C883464009574D5 /* KMEmbeddedPaymentPopWC.swift in Sources */,
-				9F3A48C52C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift in Sources */,
 				BB328B702B565EC500B382C6 /* iVersion.m in Sources */,
 				BB8D52A52BA29A5C00D5CB31 /* SKVersionNumber.m in Sources */,
 				9F1FE4C329406E4700E952CA /* CTPageTransition.c in Sources */,
@@ -17471,6 +17469,7 @@
 				BB6B43662A04919200E02B54 /* KMBaseViewController.swift in Sources */,
 				AD3AAD412B0B7B6C00DE5FE7 /* KMCompareManager.swift in Sources */,
 				AD055EB92B8843FD0035F824 /* SKToolbarItem.m in Sources */,
+				651A59832C8EA210005A35FB /* KMPurchaseEmbeddedWindowController.swift in Sources */,
 				AD055E812B88294F0035F824 /* SKBookmarkController.m in Sources */,
 				ADE86AD12B04BAEA00414DFA /* KMCompareFilesView.swift in Sources */,
 				BB146FCF299DC0D100784A6A /* GTMMIMEDocument.m in Sources */,
@@ -17571,7 +17570,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9F0ACC012C86A334009574D5 /* KMPurchaseEmbeddedWindowController.swift in Sources */,
 				BBFBE6D028DD7B98008B2335 /* PDF_MasterTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -17857,6 +17855,7 @@
 				BB853C702AF879C1009C20C1 /* KMBatchRemoveWatermarkOperation.swift in Sources */,
 				9FBC48B9299B44C600CA39D7 /* KMSecondaryViewController.m in Sources */,
 				ADDF832D2B391A5C00A81A4E /* NSEvent+PDFListView.m in Sources */,
+				651A59822C8EA20F005A35FB /* KMPurchaseEmbeddedWindowController.swift in Sources */,
 				BB8810CB2B4F97D000AFA63E /* VerificationManager.m in Sources */,
 				ADAFD9F42AE68A7400F084BC /* KMCreatPDFView.swift in Sources */,
 				BBFDFA9F2AF3814000E08AA2 /* KMTextHintWindowController.swift in Sources */,
@@ -18050,7 +18049,6 @@
 				9F53D5482AD664C300CCF9D8 /* CPDFListHoverAnnotationViewController.swift in Sources */,
 				AD3AAD762B0DCEAA00DE5FE7 /* KMCompareSaveView.swift in Sources */,
 				9F9461852BD644BF0076574B /* KMTableDataManager.m in Sources */,
-				9F3A48C62C8017FA0047F565 /* KMPurchaseEmbeddedWindowController.swift in Sources */,
 				9FCFEC8D2AD10A4400EAD2CB /* KMTextFieldSheetController.swift in Sources */,
 				BBC8A7722B06408600FA9377 /* KMBotaSearchViewController.swift in Sources */,
 				BB49ECF2293F40F500C82CA2 /* KMConvertPageRangeSettingItemView.swift in Sources */,