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

PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMConvertGuideView.swift

@@ -184,11 +184,24 @@ class KMConvertGuideView: NSView, NibLoadable {
     }
     
     @IBAction func convertAction(_ sender: Any) {
-        guard let callBack = self.clickHandle else {
-            return
+        if KMMemberInfo.shared.isLogin {
+            guard let callBack = self.clickHandle else {
+                return
+            }
+            callBack(self, .purchase)
+            FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_StartGuideConvert_Buy"])
+        } else {
+            KMLoginWindowsController.shared.openWindow() { [weak self] success in
+                guard let self = self else { return }
+                if success {
+                    guard let callBack = self.clickHandle else {
+                        return
+                    }
+                    callBack(self, .purchase)
+                    FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_StartGuideConvert_Buy"])
+                }
+            }
         }
-        callBack(self, .purchase)
-        FMTrackEventManager.defaultManager.trackOnceEvent(event: "PUW", withProperties: ["PUW_Btn":"Btn_PUW_StartGuideConvert_Buy"])
     }
     
     @objc func themeChange() {

PDF Office/PDF Master/Class/KMAdvertisement/Config/KMAdvertisementConfig.swift

@@ -114,15 +114,11 @@ import UIKit
     public var language: KMAdvertisementLanguageType = .unknow
     
     func activityBaseURL() -> String {
-#if DEBUG
         if kTestMode == 1 {
             return "http://test-store.kdan.cn:3019"
         } else {
             return "https://store.filmagepro.com:3018"
         }
-#else
-        return "https://store.filmagepro.com:3018"
-#endif
     }
     
     public func initParameters(appName: KMAdvertisementAppNameType, subscribeType:KMAdvertisementSubscribeType, platform: KMAdvertisementPlatformType) {

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -110,7 +110,7 @@ NSPopoverDelegate>
 #if VERSION_DMG
     tTips = @"";
 #else
-    tTips = [NSString stringWithFormat:@"%@\n%@", NSLocalizedString(@"Subscribe to All Access Pack to enjoy more expanded features.", nil), NSLocalizedString(@"Choose your favorite payment and enjoy flexible upgrades.", nil)];
+    tTips = [NSString stringWithFormat:@"%@\n%@", NSLocalizedString(@"Subscribe to All Access Pack to enjoy more expanded features.", nil)];
 #endif
 
     self.button.toolTip = tTips;

PDF Office/PDF Master/MemberCenter/KMMemberCenterConfig.swift

@@ -9,14 +9,10 @@ import Cocoa
 
 class KMMemberCenterConfig: NSObject {
     func activityBaseURL() -> String {
-        #if DEBUG
         if kTestMode == 1{
             return "https://test-pdf-pro.kdan.cn"
         } else {
             return "https://pdfmaster.pdfreaderpro.com"
         }
-        #else
-        return "https://pdfmaster.pdfreaderpro.com"
-        #endif
     }
 }

PDF Office/PDF Master/MemberCenter/ViewModel/KMUserInfoVCModel.swift

@@ -141,15 +141,11 @@ class KMUserInfoVCModel: ObservableObject {
      */
     func skipAccountCenter() -> Void {
         var urlPath = ""
-#if DEBUG
         if kTestMode == 1{
             urlPath = "http://test-pdf-pro.kdan.cn:3021/user-center/account-benefits"
         } else {
             urlPath = "https://pdfreaderpro.com/user-center/account-benefits"
         }
-#else
-        urlPath = "https://pdfreaderpro.com/user-center/account-benefits"
-#endif
         NSWorkspace.shared.open(URL(string: urlPath)!)
     }
     

PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -958,6 +958,10 @@ class KMProductCompareWC: NSWindowController {
     }
 
     func showDiscount() {
+        discountYearly.isHidden = true
+        discountPermanent.isHidden = true
+        discountPermanent2.isHidden = true
+        discountPermanent.isHidden = true
 #if VERSION_FREE
 #if VERSION_DMG
     // DMG
@@ -970,9 +974,6 @@ class KMProductCompareWC: NSWindowController {
     // AppStore 付费版
         if model.state != .pro_Base { return }
 #endif
-        discountYearly.isHidden = true
-        discountPermanent.isHidden = true
-
         let content = KMAdvertisementManager.manager.info.StoreUserRecovery?.content ?? []
         if content.count > 0 {
             for (index, item) in content.enumerated() {
@@ -980,11 +981,11 @@ class KMProductCompareWC: NSWindowController {
                 case 1:
                     configureDiscountView(discountYearly, with: item)
                 case 2:
-                    configureDiscountView(discountPermanent, with: item)
+                    configureDiscountView(discountPermanent4, with: item)
                 case 3:
                     configureDiscountView(discountPermanent2, with: item)
                 case 4:
-                    configureDiscountView(discountPermanent4, with: item)
+                    configureDiscountView(discountPermanent, with: item)
                 default:
                     break
                 }