【综合】比较表优惠价格调整

PDF Office/PDF Master/Class/AD/KMAdsWebView.swift

@@ -317,29 +317,25 @@ class KMAdsWebView: NSView, WKNavigationDelegate, CAAnimationDelegate {
                     KMMemberInfo.shared.advancedFunctionUsage(type: .adsWeb)
                 }
             } else {
-                if _isNowGotoPurcahseTable() {
-                    KMMemberInfo.shared.advancedFunctionUsage(type: .adsWeb)
-                } else {
-                    KMLoginWindowsController.shared.openWindow { success in
-                        if success {
-                            if KMMemberInfo.shared.vip_levels == "1" {
-                                KMProductCompareWC.shared.orientation = true
+                KMLoginWindowsController.shared.openWindow { success in
+                    if success {
+                        if KMMemberInfo.shared.vip_levels == "1" {
+                            KMProductCompareWC.shared.orientation = true
 #if VERSION_FREE
 #if VERSION_DMG
-                                // DMG
-                                KMProductCompareWC.shared.orientationType = .dmg_Base
+                            // DMG
+                            KMProductCompareWC.shared.orientationType = .dmg_Base
 #else
-                                // AppStore 免费版本
-                                KMProductCompareWC.shared.orientationType = .lite_Base
+                            // AppStore 免费版本
+                            KMProductCompareWC.shared.orientationType = .lite_Base
 #endif
 #else
-                                // AppStore 付费版
-                                KMProductCompareWC.shared.orientationType = .pro_Base
+                            // AppStore 付费版
+                            KMProductCompareWC.shared.orientationType = .pro_Base
 #endif
-                                KMProductCompareWC.shared.showWindow(nil)
-                            } else {
-                                KMMemberInfo.shared.advancedFunctionUsage(type: .adsWeb)
-                            }
+                            KMProductCompareWC.shared.showWindow(nil)
+                        } else {
+                            KMMemberInfo.shared.advancedFunctionUsage(type: .adsWeb)
                         }
                     }
                 }

PDF Office/PDF Master/Class/Purchase/IAPProductsManager.m

@@ -113,16 +113,39 @@ NSString * const KMMemberInfoChangeNotification = @"KMMemberInfoChangeNotificati
 - (NSString *)price {
     NSString *price = nil;
 #if !VERSION_DMG
-    if ([self.product.productIdentifier isEqualToString:KM4DevicesAllAccessPack12Months_Free]) {
+#if VERSION_FREE
+    NSString *productIdentifier = self.product.productIdentifier;
+    if ([productIdentifier isEqualToString:KM4DevicesAllAccessPack12Months_Free] || [productIdentifier isEqualToString:KM4DevicesAllAccessPackNew6Months_Free]) {
         SKProductDiscount *introductoryPrice = self.product.introductoryPrice;
-        if ([introductoryPrice paymentMode] == SKProductDiscountPaymentModePayUpFront) {
-            NSNumberFormatter *numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
-            [numberFormatter setFormatterBehavior:NSNumberFormatterBehavior10_4];
-            [numberFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
-            [numberFormatter setLocale:self.product.priceLocale];
-            return [numberFormatter stringFromNumber:introductoryPrice.price];
+        // 是否有 优惠价格
+        if (introductoryPrice != nil) {
+            SKProductDiscountPaymentMode paymentMode = [introductoryPrice paymentMode];
+            if (paymentMode == SKProductDiscountPaymentModePayUpFront || paymentMode == SKProductDiscountPaymentModePayAsYouGo) {
+                NSNumberFormatter *numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
+                [numberFormatter setFormatterBehavior:NSNumberFormatterBehavior10_4];
+                [numberFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
+                [numberFormatter setLocale:self.product.priceLocale];
+                return [numberFormatter stringFromNumber:introductoryPrice.price];
+            }
         }
     }
+#else
+    NSString *productIdentifier = self.product.productIdentifier;
+    if ([productIdentifier isEqualToString:KMStandardAddDevicesAllAccessPack_12Months_Pro]) {
+        SKProductDiscount *introductoryPrice = self.product.introductoryPrice;
+        // 是否有 优惠价格
+        if (introductoryPrice != nil) {
+            SKProductDiscountPaymentMode paymentMode = [introductoryPrice paymentMode];
+            if (paymentMode == SKProductDiscountPaymentModePayUpFront || paymentMode == SKProductDiscountPaymentModePayAsYouGo) {
+                NSNumberFormatter *numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
+                [numberFormatter setFormatterBehavior:NSNumberFormatterBehavior10_4];
+                [numberFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
+                [numberFormatter setLocale:self.product.priceLocale];
+                return [numberFormatter stringFromNumber:introductoryPrice.price];
+            }
+        }
+    }
+#endif
     if (self.product.price) {
         price = [self formattedPrice:NO];
     } else {