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

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

@@ -516,10 +516,9 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
             abbreviation = "CNY"
         }
-        
-        let insting = Float(showSinglePriceString() ?? "0") ?? 0
-        
-        listPrice = Float(String(format: "%.2f", insting)) ?? 0  //单价*购买个数
+                
+        let insting = Float(showSinglePriceString())
+        listPrice = Float(String(format: "%.2f", Float((insting ?? 0) * Float(pdfCount)))) ?? 0  //单价*购买个数
         
         if _product_code == "advanced-annual-subscription-trail"       ||
             _product_code == "advanced-annual-subscription-blackFive"   ||

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

@@ -327,11 +327,19 @@ NSPopoverDelegate>
     }
 #else
     if ([[KMMemberInfo shared].isHaveAIDiscount isEqualToString:@"1"]) {
+#if VERSION_FREE
+        if(IAPProductsManager.defaultManager.aiAllAccessPack12month_lite.isTrialPeriod == false) {
+            self.aiContendView.hidden = NO;
+            totalWidth+=aiWidth;
+            totalWidth+=4;
+        }
+#else
         if(IAPProductsManager.defaultManager.aiAllAccessPack12month_pro.isTrialPeriod == false) {
             self.aiContendView.hidden = NO;
             totalWidth+=aiWidth;
             totalWidth+=4;
         }
+#endif
     }
     KMUserScenarioType type = [KMMemberInfo shared].userScenarioType;
 

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

@@ -380,7 +380,7 @@ class KMProductCompareWC: NSWindowController {
                         guard let productModels2 = results.listingProducts else { return }
                         for productModel2 in productModels2 {
                             if productModel2.code == "advanced-annual-subscription" {
-                                self.advancedPlanPurchaseLabel.stringValue = String(format: "%.2f", Float(productModel2.upgradePriceString ?? "") ?? 0)
+                                self.advancedPlanPurchaseLabel.stringValue = String(format: "USD $%.2f", Float(productModel2.upgradePriceString ?? "") ?? 0)
                             }
                         }
                     }
@@ -391,7 +391,7 @@ class KMProductCompareWC: NSWindowController {
                         guard let productModels2 = results.listingProducts else { return }
                         for productModel2 in productModels2 {
                             if productModel2.code == "advanced-annual-subscription-blackFive" {
-                                self.advancedPlanPurchaseLabel.stringValue = String(format: "%.2f", Float(productModel2.upgradePriceString ?? "") ?? 0)
+                                self.advancedPlanPurchaseLabel.stringValue = String(format: "USD $%.2f", Float(productModel2.upgradePriceString ?? "") ?? 0)
                             }
                         }
                     }