Эх сурвалжийг харах

3.6.18(2)当不是会员时候,默认选中周订阅

100Years 1 сар өмнө
parent
commit
bd2b0ecce0

+ 2 - 2
AIEmoji.xcodeproj/project.pbxproj

@@ -2552,7 +2552,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2591,7 +2591,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				GENERATE_INFOPLIST_FILE = YES;

+ 3 - 0
AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -79,6 +79,9 @@ class TSPurchaseVC: TSBaseVC {
 //            viewModel.selectedType = .month
 //            viewModel.selectedType = .month
 //        }
 //        }
         
         
+        if PurchaseManager.default.vipType == .none {
+            viewModel.selectedType = .week
+        }
         let vc = UIHostingController(rootView: PurchaseView(viewModel: viewModel))
         let vc = UIHostingController(rootView: PurchaseView(viewModel: viewModel))
         vc.view.backgroundColor = .clear
         vc.view.backgroundColor = .clear
         return vc
         return vc

+ 6 - 6
AIEmoji/Common/Purchase/TSPurchaseManager.swift

@@ -203,9 +203,9 @@ public class PurchaseManager: NSObject {
     }
     }
 
 
     @objc public var isVip: Bool {
     @objc public var isVip: Bool {
-#if DEBUG
-        return vipType != .none
-#endif
+//#if DEBUG
+//        return vipType != .none
+//#endif
         guard let expiresDate = expiredDate else {
         guard let expiresDate = expiredDate else {
             return false
             return false
         }
         }
@@ -217,9 +217,9 @@ public class PurchaseManager: NSObject {
     }
     }
 
 
     public var vipType: PremiumPeriod {
     public var vipType: PremiumPeriod {
-#if DEBUG
-        return PremiumPeriod.year
-#endif
+//#if DEBUG
+//        return PremiumPeriod.none
+//#endif
         guard isVip, let type = vipInformation["type"] as? String else {
         guard isVip, let type = vipInformation["type"] as? String else {
             return .none
             return .none
         }
         }