1.8(1)打包

AIRingtone.xcodeproj/project.pbxproj

@@ -1323,7 +1323,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;
@@ -1342,7 +1342,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/AIRingtone/Common/Tool/TSBandRingTool/libmp3",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = ai.ringtones.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1365,7 +1365,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;
@@ -1384,7 +1384,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/AIRingtone/Common/Tool/TSBandRingTool/libmp3",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = ai.ringtones.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

AIRingtone/Business/TSAIPhotoVC/TSGeneralPicVC/TSGeneralPicVC.swift

@@ -127,13 +127,19 @@ class TSGeneralPicVC: TSBottomAlertVC {
     func creatImage() {
         //判断 vip
         if kPurchaseToolShared.kJudgeVipFreeType(vipFreeNumType: vipFreeNumType, vc: self){ return }
+        
+        var oldModel:TSActionInfoModel? = nil
+        if let model = self.infoModel ,model.actionStatus == .failed{
+            oldModel = model
+        }
+        
         if gennerateType == .poster {
             let operation:TSGeneratePosterOperation = TSGeneratePosterOperationQueue.shared.creatOperation(uuid: UUID().uuidString) 
             operation.$stateDatauPblished.receive(on: DispatchQueue.main).sink {[weak self]  (state,model) in
                 guard let self = self else { return }
                 self.upDateView(state: state, model: model)
             }.store(in: &cancellable)
-            operation.creatPoster(oldModel: self.infoModel, prompt: prompt, promptSort: promptSort)
+            operation.creatPoster(oldModel: oldModel, prompt: prompt, promptSort: promptSort)
 
         }else if gennerateType == .photo {
             let operation:TSGeneratePhotoOperation = TSGeneratePhotoOperationQueue.shared.creatOperation(uuid: UUID().uuidString) 
@@ -141,7 +147,7 @@ class TSGeneralPicVC: TSBottomAlertVC {
                 guard let self = self else { return }
                 self.upDateView(state: state, model: model)
             }.store(in: &cancellable)
-            operation.creatPhoto(oldModel: self.infoModel, prompt: prompt, promptSort: promptSort)
+            operation.creatPhoto(oldModel: oldModel, prompt: prompt, promptSort: promptSort)
         }
     }
 }

AIRingtone/Business/TSAIRintoneVC/TSGeneralRintoneVC/TSGeneralRintoneVC.swift

@@ -151,7 +151,13 @@ class TSGeneralRintoneVC: TSBottomAlertVC {
             guard let self = self else { return }
             self.upDateView(state: state, model: model)
         }.store(in: &cancellable)
-        operation.creatRintone(oldModel: nil, prompt: prompt, promptSort: promptSort)
+        
+        var oldModel:TSActionInfoModel? = nil
+        if let model = self.infoModel ,model.actionStatus == .failed{
+            oldModel = model
+        }
+        
+        operation.creatRintone(oldModel: oldModel, prompt: prompt, promptSort: promptSort)
 //        operation.creatRintone(oldModel: self.infoModel, prompt: prompt, promptSort: promptSort)
     }
 }

AIRingtone/Business/TSTabBarController/TSTabBarController.swift

@@ -25,7 +25,7 @@ class TSTabBarController: UITabBarController {
 
     @objc private func setUpData() {
         viewControllerArray = ["TSDiscoverVC","TSAIRintoneVC","TSThemeVC","TSSetingVC"]
-        titleArray = ["Rintone","AI","Contact","Setting"]
+        titleArray = ["Ringtone","AI","Contact","Setting"]
         
         selectedImageArray = [
             "tabbar_select_rintone",