|
@@ -373,6 +373,10 @@ class KMProductCompareWC: NSWindowController {
|
|
|
|
|
|
subscribeType_ = type
|
|
|
}
|
|
|
+
|
|
|
+ public func closeWindow() {
|
|
|
+ window?.close()
|
|
|
+ }
|
|
|
|
|
|
// MARK: - Private Methods
|
|
|
|
|
@@ -1281,11 +1285,7 @@ class KMProductCompareWC: NSWindowController {
|
|
|
}
|
|
|
|
|
|
let info = KMMemberInfo.shared
|
|
|
- var expired = info.vip_status == 2 || info.vip_status == 4
|
|
|
- let state = info.userScenarioType
|
|
|
- let platforms = info.userPlatforms()
|
|
|
- let vip_levels = info.vip_levels
|
|
|
- let vip_paymentModel = info.vip_paymentModel
|
|
|
+ let expired = info.vip_status == 2 || info.vip_status == 4
|
|
|
if info.vip_levels == "1" || expired {
|
|
|
if self.model.isPurchaseSwitch { // 免费账户/订阅过期账户
|
|
|
IAPProductsManager.default().makeSubProduct(IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite, discount: self.model.isCancelAutoRenew)
|
|
@@ -1465,11 +1465,7 @@ class KMProductCompareWC: NSWindowController {
|
|
|
}
|
|
|
|
|
|
let info = KMMemberInfo.shared
|
|
|
- var expired = info.vip_status == 2 || info.vip_status == 4
|
|
|
- let state = info.userScenarioType
|
|
|
- let platforms = info.userPlatforms()
|
|
|
- let vip_levels = info.vip_levels
|
|
|
- let vip_paymentModel = info.vip_paymentModel
|
|
|
+ let expired = info.vip_status == 2 || info.vip_status == 4
|
|
|
if info.vip_levels == "1" || expired {
|
|
|
self.model.appstorePurchaseAction(sender.tag) { [weak self] success, msg in
|
|
|
|
|
@@ -1508,6 +1504,14 @@ class KMProductCompareWC: NSWindowController {
|
|
|
KMMainThreadExecute {
|
|
|
self.removeWaitingView(from: self.window?.contentView ?? NSView())
|
|
|
self.reloadData()
|
|
|
+
|
|
|
+ if KMMemberInfo.shared.isLogin {
|
|
|
+
|
|
|
+ } else {
|
|
|
+ if let _ = KMLoginWindowsController.shared.subscribeType { // 付费->比较表->购买回来后 需要关闭登陆窗口
|
|
|
+ KMLoginWindowsController.shared.closeWindow()
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
#if VERSION_FREE
|