根据版本号动态控制忽必烈gift开关

“张旭”
1 parent 1b2ce5b2
Showing 3 changed files with 36 additions and 6 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Extensions/String+Extension.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -2968,7 +2968,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.7.25.04.26.16;
+				CURRENT_PROJECT_VERSION = 1.1.8.25.04.27.12;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3041,7 +3041,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.7;
+				MARKETING_VERSION = 1.1.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -3224,7 +3224,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.7.25.04.26.16;
+				CURRENT_PROJECT_VERSION = 1.1.8.25.04.27.12;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -3296,7 +3296,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.7;
+				MARKETING_VERSION = 1.1.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -10,6 +10,27 @@ import UIKit
 import CommonCrypto
 extension String {
+    //比较两个版本号 //.orderedDescending前者version1版本更大 //.orderedAscending前者版本更小 //.orderedSame版本相等
+    func compareVersion(_ version2: String) -> ComparisonResult {
+        let v1Components = self.components(separatedBy: ".")
+        let v2Components = version2.components(separatedBy: ".")
+        let maxLength = max(v1Components.count, v2Components.count)
+        
+        for i in 0..<maxLength {
+            // 处理空位补 0
+            let v1 = i < v1Components.count ? (Int(v1Components[i]) ?? 0) : 0
+            let v2 = i < v2Components.count ? (Int(v2Components[i]) ?? 0) : 0
+            
+            if v1 > v2 {
+                return .orderedDescending // 当前版本更大
+            } else if v1 < v2 {
+                return .orderedAscending  // 当前版本更小
+            }
+        }
+        return .orderedSame // 版本相等
+    }
+    
+    
     /// Calculate text's height from `width` and `front`.
     func calculateHeightWith(width: CGFloat, font: UIFont)-> CGFloat {
         let attr = [NSAttributedString.Key.font: font]
@@ -882,8 +882,17 @@ class CNLiveMineViewModel: NSObject {
                         let userInfoModel = dictionaryToModel(resp as! [String : Any], UpdateInfoModel.self,"data") as! UpdateInfoModel
                         let ver1 = "\(userInfoModel.version.split(separator: "_").last ?? "0")"
                         let ver2 = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
-                        print("获取的新版本号=>\(ver1),原来的版本号=>\(ver2)")
-                        metaAppDelegate.isGift = userInfoModel.gift
+                        print("获取的新版本号=>\(ver1),本版本号=>\(ver2)")
+                        //ver1后台版本 ver2本版本
+                        let compareResult = ver1.compareVersion(ver2)
+                        if compareResult == .orderedAscending{
+                            //ver1后台版本 < ver2本版本
+                            metaAppDelegate.isGift = false
+                        }else{
+                            //ver1后台版本 >= ver2本版本
+                            metaAppDelegate.isGift = userInfoModel.gift
+                        }
+                        
                         if CNLiveMineViewModel.compare(v1: ver1, v2: ver2) {
                             resultBlock(userInfoModel,.success)
                         } else {