【会员系统】- 整理用户中心+状态栏

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

@@ -155,6 +155,7 @@ NSPopoverDelegate>
     self.userButton.hidden = YES;
     self.signUpView.hidden = YES;
     self.signUpLabel.stringValue = NSLocalizedStringFromTable(@"Sign in", @"MemberCenterLocalizable", nil);
+    self.signUpLabel.font = [NSFont SFProTextSemiboldFont:11];
     [self.signUpLabel sizeToFit];
     CGFloat signUpWidth = self.signUpLabel.frame.size.width;
     signUpWidth += 4;

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

@@ -494,7 +494,7 @@ class KMUserInfoViewController: NSViewController {
             buyNow2Label.textColor = NSColor(hex: "FFFFFF")
             if((KMMemberInfo.shared.vip_status == 0 && KMMemberInfo.shared.canTrail == true)) { //会员是否可试用
 #if !VERSION_DMG
-                if IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.isTrialPeriod == true || isNoOldSubscribed {//Appid未试用过或者之前未订阅
+                if IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.isTrialPeriod == true || !isNoOldSubscribed {//Appid未试用过或者之前未订阅
                     buyNow2Box.isHidden = true
                     buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
                 }
@@ -516,11 +516,20 @@ class KMUserInfoViewController: NSViewController {
                  KMMemberInfo.shared.userScenarioType == .lite_type4 ||
                  KMMemberInfo.shared.userScenarioType == .lite_type6  ||
                  KMMemberInfo.shared.userScenarioType == .lite_type8 ||
+                 KMMemberInfo.shared.userScenarioType == .lite_type10 ||
                  KMMemberInfo.shared.userScenarioType == .lite_type12 ||
                  KMMemberInfo.shared.userScenarioType == .lite_type13 ||
                  KMMemberInfo.shared.userScenarioType == .pro_type2 ||
-                 KMMemberInfo.shared.userScenarioType == .pro_type5 { //有订阅
+                 KMMemberInfo.shared.userScenarioType == .pro_type5 { //有订阅+试用中
             
+        } else if KMMemberInfo.shared.userScenarioType == .lite_type7 ||
+                  KMMemberInfo.shared.userScenarioType == .lite_type3 { //试用过期+会员到期
+               buyBox.contentView = buyView1
+               arrow1ImageView.image = NSImage(named: "BuyNewArrowImage1")
+               buyNow1Label.textColor = NSColor(hex: "FFFFFF")
+
+               buyNow2Box.isHidden = true
+               buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
         } else {
             buyBox.contentView = buyView1
             buyNow2Box.isHidden = true