Ver Fonte

修复增加多语言后,首页VM单例,不切换语言的问题

100Years há 6 dias atrás
pai
commit
08711069e4

+ 4 - 1
AIEmoji/Business/TSAILIstVC/TSPredictBabyVC/TSFutureBabyVC.swift

@@ -155,10 +155,13 @@ extension TSFutureBabyVC {
         if !getSex.isEmpty {
             additionalPrompt = additionalPrompt + " " + getSex
         }
+        
         if !ageStr.isEmpty {
             additionalPrompt = additionalPrompt + ", " + ageStr + " years old."
         }
-        if let promptModel = TSGenerateModel(json: kTSDiscoverVM.futureBaby){
+        
+        let discoverVM:TSDiscoverViewModel = TSDiscoverViewModel()
+        if let promptModel = TSGenerateModel(json: discoverVM.futureBaby){
             aiGeneratorModel.prompt = promptModel.prompt + additionalPrompt
             aiGeneratorModel.inputText = additionalPrompt
             aiGeneratorModel.model = promptModel.model

+ 15 - 3
AIEmoji/Business/TSSetingVC/SetingVC/TSSetingModel.swift

@@ -28,14 +28,26 @@ enum SettingType: String, CaseIterable {
     case agreement = "Terms of Service"
 //    case about = "About us"
     
-
     case videoTimes = "Video Effect Uses"
     case changeLanguage = "Change Language"
     case videoPackage = "Video Effect Use Pack"
-//#if DEBUG
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     case deleteAllData = "删除钥匙串和次数限制"
     case lookAllData = "查看目前的次数"
     case videoTimesAdd = "视频包次数+1"
     case videoTimesReduce = "视频包次数-1"
-//#endif
+
 }

+ 5 - 7
AIEmoji/Business/TSSetingVC/SetingVC/TSSetingViewModel.swift

@@ -97,11 +97,12 @@ class TSSetingViewModel: ObservableObject {
     }
     
     func purchaseVideoTimesVC(parent: UIViewController) {
-        kPresentModalVC(target: parent, modelVC: TSPurchaseVideoTimesVC(isShowAlertModel: true))
+        kPresentModalVC(target: parent, modelVC: TSPurchaseVideoTimesVC(isShowAlertModel: false))
     }
-    
-    
-//#if DEBUG
+}
+
+
+extension TSSetingViewModel {
     
     // todo.kailen-privacy
     func deleteAllData(parent: UIViewController) {
@@ -142,7 +143,6 @@ class TSSetingViewModel: ObservableObject {
         NotificationCenter.default.post(name: .kPurchaseVideoNumChanged, object: nil)
     }
     
-//#endif
 }
 
 
@@ -153,8 +153,6 @@ class TSSetingViewModel: ObservableObject {
 
 
 
-
-
 //首次点击保存弹出系统评分弹窗
 func kFirstSaveRateAction(){
     if UserDefaults.standard.string(forKey: "iskFirstSaveRateAction") == nil {

+ 2 - 4
AIEmoji/Business2/DisCover/Data/TSDiscoverViewModel+Data.swift

@@ -7,10 +7,9 @@
 
 // MARK: 组装数据
 
-let kTSDiscoverVM = TSDiscoverViewModel.shared
-class TSDiscoverViewModel {
-    static let shared: TSDiscoverViewModel = TSDiscoverViewModel()
 
+class TSDiscoverViewModel {
+    
     lazy var bannerItems: [TSDiscoverItemModel] = {
         [
             TSDiscoverItemModel(style: .videoV2,
@@ -178,7 +177,6 @@ class TSDiscoverViewModel {
         section.style = .styleMore
         section.setTitle(title: "Trending Video Effect".localized, imageNamed: "🏆", colors: ["#FCB728", "#FFFFFF"])
         section.items = [videoEffectItems.filter({ $0.showAtHome == true })]
-
         return section
     }()
     

+ 12 - 11
AIEmoji/Business2/DisCover/Data/TSFuncStyle.swift

@@ -150,29 +150,30 @@ enum TSFuncStyle:Int,Equatable,CaseIterable {
 extension TSFuncStyle {
     
     var generateModel:TSGenerateModel? {
+        let discoverVM:TSDiscoverViewModel = TSDiscoverViewModel()
         switch self {
         case .ageOld:
-            return TSGenerateModel(json: kTSDiscoverVM.ageOld)
+            return TSGenerateModel(json: discoverVM.ageOld)
         case .ageChild:
-            return TSGenerateModel(json: kTSDiscoverVM.ageChild)
+            return TSGenerateModel(json: discoverVM.ageChild)
         case .oldPhoto:
-            return TSGenerateModel(json: kTSDiscoverVM.oldPhoto)
+            return TSGenerateModel(json: discoverVM.oldPhoto)
         case .eyeOpen:
-            return TSGenerateModel(json: kTSDiscoverVM.eyeOpen)
+            return TSGenerateModel(json: discoverVM.eyeOpen)
         case .pretty:
-            return TSGenerateModel(json: kTSDiscoverVM.pretty)
+            return TSGenerateModel(json: discoverVM.pretty)
         case .photoLive:
-            return TSGenerateModel(json: kTSDiscoverVM.photoLive)
+            return TSGenerateModel(json: discoverVM.photoLive)
         case .photoExpand:
-            return TSGenerateModel(json: kTSDiscoverVM.photoExpand)
+            return TSGenerateModel(json: discoverVM.photoExpand)
         case .photoQuality:
-            return TSGenerateModel(json: kTSDiscoverVM.photoQuality)
+            return TSGenerateModel(json: discoverVM.photoQuality)
         case .motherDay:
-            return TSGenerateModel(json: kTSDiscoverVM.motherDay)
+            return TSGenerateModel(json: discoverVM.motherDay)
         case .catTohuman:
-            return TSGenerateModel(json: kTSDiscoverVM.catTohuman)
+            return TSGenerateModel(json: discoverVM.catTohuman)
         case .futureBaby:
-            return TSGenerateModel(json: kTSDiscoverVM.futureBaby)
+            return TSGenerateModel(json: discoverVM.futureBaby)
         default:
             return nil
         }

+ 1 - 1
AIEmoji/Business2/DisCover/TSDiscoverVC/TSDiscoverVC.swift

@@ -7,7 +7,7 @@
 
 class TSDiscoverVC: TSBaseVC {
 
-    let viewModel = kTSDiscoverVM
+    let viewModel:TSDiscoverViewModel = TSDiscoverViewModel()
     var hintBaseVC:TSAIListHintBaseVC = TSAIListHintBaseVC(config: .defaultConfig)
     lazy var photoPickerManager: TSPhotoPickerManager = TSPhotoPickerManager(viewController: self)
     

+ 6 - 4
AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSPTPUploadImageVC+View.swift

@@ -126,7 +126,8 @@ extension TSPTPUploadImageVC {
     
     func selectStyleVideoHandle()  {
         if isVideo{
-            var array:[TSDiscoverItemModel] = kTSDiscoverVM.bannerItems +  kTSDiscoverVM.videoEffectItems + kTSDiscoverVM.aiDanceItems + kTSDiscoverVM.creativeEffectItems
+            let discoverVM:TSDiscoverViewModel = TSDiscoverViewModel()
+            var array:[TSDiscoverItemModel] = discoverVM.bannerItems +  discoverVM.videoEffectItems + discoverVM.aiDanceItems + discoverVM.creativeEffectItems
             let model2 = array.first(where: { discoverItemModel in
                 return discoverItemModel.generateModel?.imageText == viewModel.selectedPTPStyleModel.imageText
             })
@@ -158,9 +159,10 @@ extension TSPTPUploadImageVC {
     
     //判断图片的尺寸是否错误
     static func judgeoImageSizeError(generateModel:TSGenerateModel,image:UIImage)->Bool{
-       if generateModel.imageText == kTSDiscoverVM.video_Subject3.safeString(forKey: "imageText")     ||
-        generateModel.imageText == kTSDiscoverVM.video_PUBGWinnerHit.safeString(forKey: "imageText")  ||
-        generateModel.imageText == kTSDiscoverVM.video_MotorDance.safeString(forKey: "imageText")
+        let discoverVM:TSDiscoverViewModel = TSDiscoverViewModel()
+       if generateModel.imageText == discoverVM.video_Subject3.safeString(forKey: "imageText")     ||
+        generateModel.imageText == discoverVM.video_PUBGWinnerHit.safeString(forKey: "imageText")  ||
+        generateModel.imageText == discoverVM.video_MotorDance.safeString(forKey: "imageText")
         {
            let size = image.size
            if size.width/size.height < 0.5 || size.width/size.height > 0.83 {

+ 2 - 1
AIEmoji/Business2/DisCover/TSPTPUploadImageVC/VM/TSPTPUploadImageVM.swift

@@ -41,6 +41,7 @@ class TSPTPUploadImageVM {
         return false
     }
     
+    let discoverVM:TSDiscoverViewModel = TSDiscoverViewModel()
     var isCanGennerateBlock:((Bool)->Void)?
     var style:TSFuncStyle
     init(style:TSFuncStyle,generateModel:TSGenerateModel,sectionModel: TSDiscoverSectionModel) {
@@ -57,7 +58,7 @@ class TSPTPUploadImageVM {
 //            }
 //        }
         self.style = style
-        let ptpStyleModels = kTSDiscoverVM.getAllGenerateModel(unionType: generateModel.unionType)
+        let ptpStyleModels = discoverVM.getAllGenerateModel(unionType: generateModel.unionType)
         let selectedStyleIndex = ptpStyleModels.firstIndex(where: {$0.imageText == generateModel.imageText}) ?? 0
         self.selectedStyleIndex = selectedStyleIndex
         self.ptpStyleModels = ptpStyleModels