|
@@ -89,13 +89,6 @@ class KMUserInfoViewController: NSViewController {
|
|
|
@IBOutlet weak var arrow2ImageView: NSImageView!
|
|
|
@IBOutlet var buyNow1BoxLeftConst: NSLayoutConstraint!
|
|
|
|
|
|
-
|
|
|
- @IBOutlet var buyView2: NSView!
|
|
|
- @IBOutlet weak var buyNow3Box: KMBox!
|
|
|
- @IBOutlet weak var buyNow3ImageView: NSImageView!
|
|
|
- @IBOutlet weak var buyNow3Label: NSTextField!
|
|
|
- @IBOutlet weak var arrow3ImageView: NSImageView!
|
|
|
-
|
|
|
@IBOutlet weak var accountCenterBox: KMBox!
|
|
|
@IBOutlet weak var accountImageView: NSImageView!
|
|
|
@IBOutlet weak var accountLabel: NSTextField!
|
|
@@ -145,7 +138,7 @@ class KMUserInfoViewController: NSViewController {
|
|
|
endDateLabel.stringValue = String(format: "%@ %@", KMMemberInfo.shared.vip_endDate,NSLocalizedString("expires", tableName: "MemberCenterLocalizable", comment: ""))
|
|
|
|
|
|
membershipLabel.stringValue = NSLocalizedString("Membership Benefits", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
accountLabel.stringValue = NSLocalizedString("Account Center", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
signOutLabel.stringValue = NSLocalizedString("Sign out", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
if KMMemberInfo.shared.validFlag == "5" {
|
|
@@ -173,25 +166,25 @@ class KMUserInfoViewController: NSViewController {
|
|
|
buyNow2Label.stringValue = NSLocalizedString("7-Day Free Trial", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
} else if KMMemberInfo.shared.userScenarioType == .lite_type9 {
|
|
|
if(KMMemberInfo.shared.vip_status == 2) {
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Renew now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Renew now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
} else if (KMMemberInfo.shared.vip_status == 4) {
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Buy Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Buy Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
} else {
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
}
|
|
|
} else if KMMemberInfo.shared.userScenarioType == .lite_type3 {
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Buy Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Buy Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
} else if KMMemberInfo.shared.userScenarioType == .lite_type11 {
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
} else if KMMemberInfo.shared.userScenarioType == .lite_type5 ||
|
|
|
KMMemberInfo.shared.userScenarioType == .pro_type1 ||
|
|
|
KMMemberInfo.shared.userScenarioType == .pro_type3 ||
|
|
|
KMMemberInfo.shared.userScenarioType == .pro_type4 {
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
} else if KMMemberInfo.shared.userScenarioType == .lite_type7 ||
|
|
|
KMMemberInfo.shared.userScenarioType == .lite_type8 ||
|
|
|
KMMemberInfo.shared.userScenarioType == .lite_type13 {
|
|
|
- buyNow3Label.stringValue = NSLocalizedString("Renew now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
+ buyNow1Label.stringValue = NSLocalizedString("Renew now", tableName: "MemberCenterLocalizable", comment: "")
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -553,15 +546,10 @@ class KMUserInfoViewController: NSViewController {
|
|
|
number5Label.font = NSFont.SFProTextRegularFont(12)
|
|
|
buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2")
|
|
|
buyNow2ImageView.image = NSImage(named: "ButtonBackgroundImage2")
|
|
|
- buyNow3ImageView.image = NSImage(named: "ButtonBackgroundImage2")
|
|
|
- buyNow3ImageView.wantsLayer = true
|
|
|
- buyNow3ImageView.layer?.cornerRadius = 4.0
|
|
|
buyNow1Label.textColor = NSColor(named: "FFFFFF")
|
|
|
buyNow1Label.font = NSFont.SFProTextRegularFont(14)
|
|
|
buyNow2Label.textColor = NSColor(named: "FFFFFF")
|
|
|
buyNow2Label.font = NSFont.SFProTextRegularFont(14)
|
|
|
- buyNow3Label.textColor = NSColor(named: "000000")
|
|
|
- buyNow3Label.font = NSFont.SFProTextRegularFont(14)
|
|
|
accountCenterBox.borderColor = NSColor(named: "3091FF") ?? .blue
|
|
|
accountCenterBox.fillColor = .clear
|
|
|
accountLabel.textColor = NSColor(named: "3091FF")
|
|
@@ -573,7 +561,6 @@ class KMUserInfoViewController: NSViewController {
|
|
|
closeAccountLabel.textColor = NSColor(named: "3091FF")
|
|
|
closeAccountLabel.font = NSFont.SFProTextRegularFont(14)
|
|
|
closeAccountImageView.image = NSImage(named: "CloseAccountImage")
|
|
|
- buyNow3Box.fillColor = NSColor(named: "FFFFFF") ?? .white
|
|
|
|
|
|
var isNoOldSubscribed = false
|
|
|
#if VERSION_FREE
|
|
@@ -581,20 +568,17 @@ class KMUserInfoViewController: NSViewController {
|
|
|
isNoOldSubscribed = IAPProductsManager.default().allAccessPack6months_lite.isSubscribed == false && IAPProductsManager.default().allAccessPack12months_lite.isSubscribed == false
|
|
|
#endif
|
|
|
#endif
|
|
|
+
|
|
|
if KMMemberInfo.shared.userScenarioType == .lite_type1 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type2 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type3 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type10 {
|
|
|
- rightsBox.fillColor = NSColor(named: "7094F6_0.1") ?? .white
|
|
|
- membershipLabel.textColor = NSColor(hex: "0E1114")
|
|
|
- lockedLabel.textColor = NSColor(hex: "42464D")
|
|
|
-
|
|
|
- if KMMemberInfo.shared.userScenarioType == .lite_type1 {
|
|
|
- buyBox.contentView = buyView1
|
|
|
- buyNow1ImageView.isHidden = false
|
|
|
- buyNow2ImageView.isHidden = false
|
|
|
- arrow1ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
- arrow2ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ KMMemberInfo.shared.userScenarioType == .pro_type1 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .pro_type3 { //未试用
|
|
|
+ buyBox.contentView = buyView1
|
|
|
+ buyNow1ImageView.isHidden = false
|
|
|
+ buyNow2ImageView.isHidden = false
|
|
|
+ arrow1ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ arrow2ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ buyNow1Label.textColor = NSColor(hex: "FFFFFF")
|
|
|
+ buyNow2Label.textColor = NSColor(hex: "FFFFFF")
|
|
|
#if !VERSION_DMG
|
|
|
if IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.isTrialPeriod == true {
|
|
|
buyNow2Box.isHidden = true
|
|
@@ -602,44 +586,67 @@ class KMUserInfoViewController: NSViewController {
|
|
|
}
|
|
|
#else
|
|
|
#endif
|
|
|
- } else if KMMemberInfo.shared.userScenarioType == .lite_type3{
|
|
|
- buyNow3Label.textColor = NSColor(named: "FFFFFF")
|
|
|
- buyBox.contentView = buyView2
|
|
|
- buyNow3ImageView.isHidden = false
|
|
|
- arrow3ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ } else if KMMemberInfo.shared.userScenarioType == .lite_type9 {
|
|
|
+ buyBox.contentView = buyView1
|
|
|
+ buyNow1ImageView.isHidden = false
|
|
|
+ buyNow2ImageView.isHidden = false
|
|
|
+ arrow1ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ arrow2ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ buyNow1Label.textColor = NSColor(hex: "FFFFFF")
|
|
|
+ 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未试用过或者之前未订阅
|
|
|
+ buyNow2Box.isHidden = true
|
|
|
+ buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
|
|
|
+ }
|
|
|
+#else
|
|
|
+#endif
|
|
|
}
|
|
|
- } else if KMMemberInfo.shared.userScenarioType == .lite_type4 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type5 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type6 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type12 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .pro_type1 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .pro_type2 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .pro_type3 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .pro_type4 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .pro_type5 {
|
|
|
- rightsBox.fillColor = NSColor(named: "FFFFFF_0.2") ?? .white
|
|
|
- if KMMemberInfo.shared.userScenarioType == .pro_type1 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .pro_type3 {
|
|
|
- buyBox.contentView = buyView2
|
|
|
- buyNow3Label.textColor = NSColor(named: "FFFFFF")
|
|
|
- arrow3ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ } else if KMMemberInfo.shared.userScenarioType == .lite_type11 {
|
|
|
+ if(!isNoOldSubscribed) {
|
|
|
+ buyBox.contentView = buyView1
|
|
|
+
|
|
|
+ buyNow1ImageView.isHidden = false
|
|
|
+ arrow1ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
+ buyNow1Label.textColor = NSColor(hex: "FFFFFF")
|
|
|
+
|
|
|
+ buyNow2Box.isHidden = true
|
|
|
+ buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
|
|
|
}
|
|
|
- } else if KMMemberInfo.shared.userScenarioType == .lite_type7 ||
|
|
|
- (KMMemberInfo.shared.userScenarioType == .lite_type9 && !(KMMemberInfo.shared.vip_status == 1 || KMMemberInfo.shared.vip_status == 4) && isNoOldSubscribed) || (KMMemberInfo.shared.userScenarioType == .lite_type11 && KMMemberInfo.shared.vip_paymentModel == "2" && isNoOldSubscribed) {
|
|
|
- membershipLabel.textColor = NSColor(hex: "0E1114")
|
|
|
- lockedLabel.textColor = NSColor(hex: "42464D")
|
|
|
+ } else {
|
|
|
+ buyBox.contentView = buyView1
|
|
|
+ buyNow2Box.isHidden = true
|
|
|
+ buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
|
|
|
|
|
|
- rightsBox.fillColor = NSColor(named: "7094F6_0.1") ?? .white
|
|
|
- buyBox.contentView = buyView2
|
|
|
- buyNow3ImageView.isHidden = false
|
|
|
- buyNow3Label.textColor = NSColor(named: "FFFFFF")
|
|
|
- arrow3ImageView.image = NSImage(named: "BuyNewArrowImage1")
|
|
|
- } else if KMMemberInfo.shared.userScenarioType == .lite_type8 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type13 {
|
|
|
- membershipLabel.textColor = NSColor(hex: "FCFDFF")
|
|
|
- lockedLabel.textColor = NSColor(hex: "FCFDFF")
|
|
|
- rightsBox.fillColor = NSColor(named: "7094F6_0.1") ?? .white
|
|
|
+ arrow1ImageView.image = NSImage(named: "BuyNewArrowImage2")
|
|
|
+ buyNow1Label.textColor = NSColor(hex: "42464D")
|
|
|
+ }
|
|
|
+
|
|
|
+ if KMMemberInfo.shared.userScenarioType == .lite_type2 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type4 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type5 ||
|
|
|
+ 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_type4 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .pro_type5 { //订阅或者买断
|
|
|
+ rightsBox.fillColor = NSColor(named: "FFFFFF_0.2") ?? .white
|
|
|
+ membershipLabel.textColor = NSColor(hex: "FFFFFF")
|
|
|
+ buyNow1ImageView.isHidden = true
|
|
|
+ buyNow1Box.fillColor = NSColor(hex: "FFFFFF")
|
|
|
+ } else {
|
|
|
+ rightsBox.fillColor = NSColor(named: "FFFFFF_0.2") ?? .white
|
|
|
+ membershipLabel.textColor = NSColor(hex: "42464D")
|
|
|
+ buyNow1ImageView.isHidden = false
|
|
|
+ buyNow1Box.fillColor = NSColor.clear
|
|
|
+
|
|
|
}
|
|
|
+ lockedLabel.textColor = NSColor(hex: "42464D")
|
|
|
+
|
|
|
let platforms = viewModel.getPlatformsImages()
|
|
|
if platforms.count == 4 {
|
|
|
iconBox.contentView = iconView1
|
|
@@ -663,16 +670,42 @@ class KMUserInfoViewController: NSViewController {
|
|
|
|
|
|
buyNow1Box.moveCallback = { [weak self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
|
|
|
guard let self = self else { return }
|
|
|
- if mouseEntered {
|
|
|
- self.buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2_Hov")
|
|
|
+
|
|
|
+ if KMMemberInfo.shared.userScenarioType == .lite_type3 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type9 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type11 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type1 {
|
|
|
+ if mouseEntered {
|
|
|
+ self.buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2_Hov")
|
|
|
+ } else {
|
|
|
+ self.buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2")
|
|
|
+ }
|
|
|
} else {
|
|
|
- self.buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2")
|
|
|
+ if mouseEntered {
|
|
|
+ self.buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2_Hov")
|
|
|
+ } else {
|
|
|
+ self.buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2")
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
buyNow1Box.downCallback = { [weak self](downEntered: Bool, mouseBox: KMBox, event) -> Void in
|
|
|
guard let self = self else { return }
|
|
|
if KMMemberInfo.shared.userScenarioType == .lite_type1 {
|
|
|
self.viewModel.skipCompare(.lite_Base)
|
|
|
+ } else if KMMemberInfo.shared.userScenarioType == .lite_type3 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type7 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type8 {
|
|
|
+ self.viewModel.skipCompare(.lite_Base)
|
|
|
+ } else if KMMemberInfo.shared.userScenarioType == .lite_type5 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type9 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type11 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .lite_type13 {
|
|
|
+ self.viewModel.skipCompare(.lite_MacWindows)
|
|
|
+ } else if KMMemberInfo.shared.userScenarioType == .pro_type1 ||
|
|
|
+ KMMemberInfo.shared.userScenarioType == .pro_type4 {
|
|
|
+ self.viewModel.skipCompare(.pro_Advanced)
|
|
|
+ } else if KMMemberInfo.shared.userScenarioType == .pro_type3 {
|
|
|
+ self.viewModel.skipCompare(.pro_Base)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -691,36 +724,6 @@ class KMUserInfoViewController: NSViewController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- buyNow3Box.moveCallback = { [weak self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
|
|
|
- guard let self = self else { return }
|
|
|
- if KMMemberInfo.shared.userScenarioType == .lite_type3 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type11 {
|
|
|
- if mouseEntered {
|
|
|
- self.buyNow3ImageView.image = NSImage(named: "ButtonBackgroundImage2_Hov")
|
|
|
- } else {
|
|
|
- self.buyNow3ImageView.image = NSImage(named: "ButtonBackgroundImage2")
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- buyNow3Box.downCallback = { [weak self](downEntered: Bool, mouseBox: KMBox, event) -> Void in
|
|
|
- guard let self = self else { return }
|
|
|
- if KMMemberInfo.shared.userScenarioType == .lite_type3 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type7 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type8 {
|
|
|
- self.viewModel.skipCompare(.lite_Base)
|
|
|
- } else if KMMemberInfo.shared.userScenarioType == .lite_type5 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type9 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type11 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .lite_type13 {
|
|
|
- self.viewModel.skipCompare(.lite_MacWindows)
|
|
|
- } else if KMMemberInfo.shared.userScenarioType == .pro_type1 ||
|
|
|
- KMMemberInfo.shared.userScenarioType == .pro_type4 {
|
|
|
- self.viewModel.skipCompare(.pro_Advanced)
|
|
|
- } else if KMMemberInfo.shared.userScenarioType == .pro_type3 {
|
|
|
- self.viewModel.skipCompare(.pro_Base)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
accountCenterBox.moveCallback = { [weak self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
|
|
|
guard let self = self else { return }
|
|
|
if mouseEntered {
|