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

PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.xib

@@ -71,7 +71,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="77" y="40" width="1114" height="720"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1800" height="1125"/>
             <value key="minSize" type="size" width="1114" height="720"/>
             <value key="maxSize" type="size" width="1114" height="720"/>
             <view key="contentView" wantsLayer="YES" misplaced="YES" id="se5-gp-TjO">

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

@@ -215,7 +215,7 @@
     self.subscribeLabel3.textColor = [KMAppearance KMColor_Interactive_M0];
     self.subscribeLabel4.textColor = [KMAppearance KMColor_Upgrade_Vip_BG_1];
     
-    if ([IAPProductsManager defaultManager].isAvailableAllFunction) {
+    if ([KMMemberInfo shared].isMemberAllFunction) {
         [self.subscribeBtn1 setEnabled:NO];
         [self.subscribeBtn2 setEnabled:NO];
     } else {

PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -700,10 +700,15 @@ import Cocoa
 #if VERSION_FREE
 #if VERSION_DMG
     // DMG
-            if KMMemberInfo.shared.isLogin {
-                
-            } else {
-                
+            if userScenarioType == .dmg_type1 ||
+                userScenarioType == .dmg_type4 ||
+                userScenarioType == .dmg_type11 ||
+                userScenarioType == .dmg_type18 ||
+                userScenarioType == .dmg_type16 ||
+                userScenarioType == .dmg_type17 { // 无高级功能权益
+                return false
+            } else { // 有高级功能权益
+                return true
             }
 #else
     // AppStore 免费版本
@@ -750,10 +755,26 @@ import Cocoa
 #if VERSION_FREE
 #if VERSION_DMG
     // DMG
-            if KMMemberInfo.shared.isLogin {
-                
+            if userScenarioType == .dmg_type1 ||
+                userScenarioType == .dmg_type2 ||
+                userScenarioType == .dmg_type4 ||
+                userScenarioType == .dmg_type8 ||
+                userScenarioType == .dmg_type9 ||
+                userScenarioType == .dmg_type11 ||
+                userScenarioType == .dmg_type16 ||
+                userScenarioType == .dmg_type17 ||
+                userScenarioType == .dmg_type18 ||
+                userScenarioType == .dmg_type19 ||
+                userScenarioType == .dmg_type20 ||
+                userScenarioType == .dmg_type21 ||
+                userScenarioType == .dmg_type22 ||
+                userScenarioType == .dmg_type31 ||
+                userScenarioType == .dmg_type32 ||
+                userScenarioType == .dmg_type33 { // 无转档权益
+                return false
+            } else { // 有转档权益
+                return true
             }
-            return false
 #else
     // AppStore 免费版本
             if KMMemberInfo.shared.isLogin {

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -630,6 +630,10 @@ class KMUserInfoViewController: NSViewController {
             number4_1Label.textColor = NSColor(hex: "FFFFFF")
             number5Label.textColor = NSColor(hex: "FFFFFF")
             membershipLabel.textColor = NSColor(hex: "FFFFFF")
+            
+            buyNow2Box.isHidden = true
+            buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
+
         } else if(KMMemberInfo.shared.userScenarioType == .lite_type9 ||
                   KMMemberInfo.shared.userScenarioType == .pro_type1) {
             if(KMMemberInfo.shared.vip_paymentModel == "2" && KMMemberInfo.shared.vip_levels != "1") { //永久