3.6.9(2)打包

TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1573,7 +1573,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1613,7 +1613,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoGeneratorVC/TSAIListPhotoGeneratorVC.swift

@@ -141,11 +141,7 @@ class TSAIListPhotoGeneratorVC: TSAIPhotoDetailsVC {
     }
     //重新生成
     @objc func clickRegenerateBtn(){
-//        if generatorModel.generatorStyle == .creatVideo {
-//            if kJudgeVip(externalBool: true, vc: self){ return } //判断 vip
-//        }else{
-            if kPurchaseBusiness.kJudgeVipFreeType(vipFreeNumType: .general){ return }//判断 vip
-//        }
+        if kPurchaseBusiness.kJudgeVipFreeType(vipFreeNumType: generatorModel.generatorStyle == .creatVideo ? .generalVideo : .general){ return }//判断 vip
         generatorOperation()
     }
 

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIUploadPhotoVC+View.swift

@@ -78,25 +78,6 @@ extension TSAIUploadPhotoVC {
 extension TSAIUploadPhotoVC {
     
     func creatSubmitBtn() -> UIButton {
-//        let submitBtn = TSAppBtnView()
-//        submitBtn.setUpButton(title: generatorStyle.generatorBtnTitle, style: .vip) { [weak self]  in
-//            guard let self = self else { return }
-//            generateImage()
-//        }
-//        submitBtn.isIconVipBlock = { [weak self]  in
-//            guard let self = self else { return true}
-//            return self.generatorStyle == .creatVideo ? true: kPurchaseBusiness.generateVipShow(type: .general)
-//        }
-//        
-//        submitBtn.isClickVipBlock = { [weak self]  in
-//            guard let self = self else { return true}
-//            if generatorStyle == .creatVideo {
-//                return true
-//            }else{
-//                return  kPurchaseBusiness.freeNumAvailable(type: .general) == false
-//            }
-//        }
-        
         let submitBtn = kCreateNormalSubmitBtn(title: generatorStyle.generatorBtnTitle) { [weak self]  in
             guard let self = self else { return }
             generateImage()

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIUploadPhotoVC.swift

@@ -113,8 +113,7 @@ class TSAIUploadPhotoVC: TSBaseVC {
     
     @objc func updateVipView() {
         kExecuteOnMainThread {
-//            kSetBtnVipIcon(btn: self.submitBtn, show: self.generatorStyle == .creatVideo ? true: kPurchaseBusiness.generateVipShow(type: .general))
-            kSetBtnVipIcon(btn: self.submitBtn, show: kPurchaseBusiness.generateVipShow(type: .general))
+            kSetBtnVipIcon(btn: self.submitBtn, show: kPurchaseBusiness.generateVipShow(type: self.generatorStyle == .creatVideo ? .generalVideo :.general))
         }
     }
     
@@ -146,12 +145,8 @@ class TSAIUploadPhotoVC: TSBaseVC {
     
     
     func generateImage() {
-        
-//        if generatorStyle == .creatVideo {
-//            if kJudgeVip(externalBool: true, vc: self){ return } //判断 vip
-//        }else{
-            if kPurchaseBusiness.kJudgeVipFreeType(vipFreeNumType: .general){ return }//判断 vip
-//        }
+
+        if kPurchaseBusiness.kJudgeVipFreeType(vipFreeNumType: generatorStyle == .creatVideo ? .generalVideo : .general){ return }//判断 vip
         
         guard let upLoadImage = upLoadImage else { return }
         let generatorModel = TSAIListPhotoGeneratorModel(upLoadImage: upLoadImage, generatorStyle: generatorStyle,additionalPrompt: additionalPrompt)

TSLiveWallpaper/Common/Purchase/TSPurchaseBusiness.swift

@@ -11,6 +11,7 @@ private let kTotalUseNumKey = "kTotalUseNumKey"
 public enum VipFreeNumType: String, CaseIterable {
     case none = "kNone"
     case general = "kGeneralAI" //通用的 vip
+    case generalVideo = "kGeneralVideo" //通用的 vip
 }
 
 let kPurchaseBusiness = TSPurchaseBusiness.shared
@@ -87,7 +88,8 @@ class TSPurchaseBusiness {
             freeDict = dict
         }else{
             freeDict = [
-                VipFreeNumType.general.rawValue:1
+                VipFreeNumType.general.rawValue:1,
+                VipFreeNumType.generalVideo.rawValue:1
             ]
             saveForFree()
         }

TSLiveWallpaper/Common/Purchase/TSPurchaseManager.swift

@@ -82,9 +82,9 @@ public class PurchaseManager: NSObject {
     }
 
     @objc public var isVip: Bool {
-        #if DEBUG
-        return true
-        #endif
+//        #if DEBUG
+//        return true
+//        #endif
         guard let expiresDate = expiredDate else {
             return false
         }

TSLiveWallpaper/Data/OperationQueue/TSGenerateBaseOperation/TSGenerateBasePhotoOperation.swift

@@ -65,7 +65,12 @@ class TSGenerateBasePhotoOperation: TSGenerateBaseOperation , @unchecked Sendabl
         TSRMShared.aiListDB.updateData(currentActionInfoModel,uuid: uuid)
     }
     override func handleGenerateSuccess() {
-        kPurchaseBusiness.useOnceForFree(type: .general)
+        if currentActionInfoModel.request.generatorStyle == .creatVideo {
+            kPurchaseBusiness.useOnceForFree(type: .generalVideo)
+        }else{
+            kPurchaseBusiness.useOnceForFree(type: .general)
+        }
+        
         saveDataDB()
 
         //生成成功后,不再提示用户上传规则弹窗