3.6.18(1)

1.把上个版本新加的四个美人鱼 Style 挪到 Y2K 后面

AIEmoji.xcodeproj/project.pbxproj

@@ -2552,7 +2552,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2568,7 +2568,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.17;
+				MARKETING_VERSION = 3.6.18;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2591,7 +2591,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2607,7 +2607,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.17;
+				MARKETING_VERSION = 3.6.18;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

AIEmoji/Business/TSAILIstVC/TSAIChangeEmoteVC/ViewModel/TSAIChangeEmoteVM.swift

@@ -131,7 +131,7 @@ extension TSAIChangeEmoteVM {
                     switch genmojiModel.actionStatus {
                     case .success:
                         if let url = URL(string:genmojiModel.response.resultUrl) {
-                            UIImageView.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
+                            TSImageStoreTool.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
                                 guard let self = self else { return }
                         
                                 let progressInt = Int(progress*10.0)

AIEmoji/Business/TSAILIstVC/TSAIPhotoGeneratorBaseVC/TSAIListPhotoGeneratorBaseVC.swift

@@ -248,7 +248,7 @@ class TSAIListPhotoGeneratorBaseVC: TSAIPhotoGeneratorBaseVC {
                 }
             }
         }else{
-            UIImageView.downloadImageWithProgress(urlString: imageModel.response.resultUrl) { image in
+            TSImageStoreTool.downloadImageWithProgress(urlString: imageModel.response.resultUrl) { image in
                 if let image = image {
                     PhotoManagerShared.saveImageToAlbum(image) { [weak self] success, error in
                         guard let self = self else { return }
@@ -274,7 +274,7 @@ class TSAIListPhotoGeneratorBaseVC: TSAIPhotoGeneratorBaseVC {
                 }
             }
         }else{
-            UIImageView.downloadImageWithProgress(urlString: imageModel.response.resultUrl) { image in
+            TSImageStoreTool.downloadImageWithProgress(urlString: imageModel.response.resultUrl) { image in
                 if let image = image {
                     kShareContent(target: self, anyData: image)
                 }

AIEmoji/Business/TSAILIstVC/TSAIPhotoGeneratorBaseVC/TSAIPhotoGeneratorBaseVM/TSAIListPhotoGeneratorBaseVM.swift

@@ -276,7 +276,7 @@ class TSAIListPhotoGeneratorBaseVM {
     }
     
     func downloadImage(urlString:String,completion:@escaping ()->Void){
-        UIImageView.downloadImageWithProgress(urlString: urlString) { [weak self]  progress in
+        TSImageStoreTool.downloadImageWithProgress(urlString: urlString) { [weak self]  progress in
             guard let self = self else { return }
     
             let progressInt = Int(progress*10.0)

AIEmoji/Business/TSPTPGeneratorVC/TSAIPhotoGeneratorBaseVC/TSAIPhotoBrowseVC.swift

@@ -229,7 +229,7 @@ class TSAIPhotoBrowseVC: TSBaseVC {
                 }
             }
         }else{
-            UIImageView.downloadImageWithProgress(urlString: urlString) { image in
+            TSImageStoreTool.downloadImageWithProgress(urlString: urlString) { image in
                 if let image = image{
                     PhotoManagerShared.saveImageToAlbum(image) { success, error in
                         if success {
@@ -277,7 +277,7 @@ class TSAIPhotoBrowseVC: TSBaseVC {
                 }
             }
         }else{
-            UIImageView.downloadImageWithProgress(urlString: urlString) { image in
+            TSImageStoreTool.downloadImageWithProgress(urlString: urlString) { image in
                 if let image = image{
                     kShareContent(target: self, anyData: image)
                 }else{//如果服务器取不到,直接保存当前显示的图片

AIEmoji/Business/TSPTPGeneratorVC/TSPTPGeneratorVC/VM/TSPTPGeneratorVM.swift

@@ -186,7 +186,7 @@ class TSPTPGeneratorVM {
                     switch genmojiModel.actionStatus {
                     case .success:
                         if let url = URL(string:genmojiModel.response.resultUrl) {
-                            UIImageView.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
+                            TSImageStoreTool.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
                                 guard let self = self else { return }
                         
                                 let progressInt = Int(progress*10.0)

AIEmoji/Business/TSTextGeneralPictureVC/TSTextPicGennerateVC/TSTextPicGennerateVM.swift

@@ -105,7 +105,7 @@ class TSTextPicGennerateVM {
                     switch genmojiModel.actionStatus {
                     case .success:
                         if let url = URL(string:genmojiModel.response.resultUrl) {
-                            UIImageView.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
+                            TSImageStoreTool.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
                                 guard let self = self else { return }
                         
                                 let progressInt = Int(progress*10.0)

AIEmoji/Common/Tool/OperationQueue/TSGenerateBaseOperation/TSGenerateBaseOperation.swift

@@ -131,7 +131,7 @@ class TSGenerateBaseOperation: TSBaseOperation , @unchecked Sendable{
                         }
                         
                         if URL(string:genmojiModel.response.resultUrl) != nil {
-                            UIImageView.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
+                            TSImageStoreTool.downloadImageWithProgress(urlString: genmojiModel.response.resultUrl) { [weak self]  progress in
                                 guard let self = self else { return }
                                 let progressInt = Int(progress*10.0)
                                 let progressString = "Generating".localized + " \(90 + progressInt)%"

AIEmoji/Res/photo_to_photo_style.json

@@ -31,34 +31,6 @@
         "styleId": "ImageToImage-21",
         "isVip": false
     },
-    {
-        "imageName": "ptp_style_Mermaid",
-        "imageText": "Mermaid",
-        "prompt":"Please create my photo into a beautiful mermaid underwater with iridescent scales on body, keep my face suitable to the mermaid but do not change my face. Keep the photo has glowing and bright lights, ethereal ocean ambiance, ultra-detailed.",
-        "isVip": true,
-        "advance":true
-    },
-    {
-        "imageName": "ptp_style_CyberpunkMermaid",
-        "imageText": "Cyberpunk Mermaid",
-        "prompt":"Please create my photo into a cyberpunk mermaid with neon scales on body, keep my face suitable to the mermaid but do not change my face. Futuristic underwater city, holographic fish, glowing cyber tattoos, dark teal and pink lighting, sci-fi fantasy.",
-        "isVip": true,
-        "advance":true
-    },
-    {
-        "imageName": "ptp_style_CuteMermaid",
-        "imageText": "Cute Mermaid",
-        "prompt":"Please create my photo into enchanting mermaid princess in a magical underwater, flowing long hair, sparkling jewelry, keep my face suitable to the mermaid, soft pastel colors, dreamy atmosphere, Disney-style animation. Keep the photo has a bright light.",
-        "isVip": true,
-        "advance":true
-    },
-    {
-        "imageName": "ptp_style_DarkMermaid",
-        "imageText": "Dark Mermaid",
-        "prompt":"Create my photo into a dark fantasy mermaid with black and gold scales, keep my face suitable to the mermaid but do not change my face, deep ocean abyss, hauntingly beautiful, dark aesthetic, eerie glow, mysterious atmosphere.",
-        "isVip": true,
-        "advance":true
-    },
     {
         "imageName": "ptp_style_1",
         "imageText": "Cyberpunk",
@@ -305,6 +277,34 @@
         "styleId": "ImageToImage-24",
         "advance":true
     },
+    {
+        "imageName": "ptp_style_Mermaid",
+        "imageText": "Mermaid",
+        "prompt":"Please create my photo into a beautiful mermaid underwater with iridescent scales on body, keep my face suitable to the mermaid but do not change my face. Keep the photo has glowing and bright lights, ethereal ocean ambiance, ultra-detailed.",
+        "isVip": true,
+        "advance":true
+    },
+    {
+        "imageName": "ptp_style_CyberpunkMermaid",
+        "imageText": "Cyberpunk Mermaid",
+        "prompt":"Please create my photo into a cyberpunk mermaid with neon scales on body, keep my face suitable to the mermaid but do not change my face. Futuristic underwater city, holographic fish, glowing cyber tattoos, dark teal and pink lighting, sci-fi fantasy.",
+        "isVip": true,
+        "advance":true
+    },
+    {
+        "imageName": "ptp_style_CuteMermaid",
+        "imageText": "Cute Mermaid",
+        "prompt":"Please create my photo into enchanting mermaid princess in a magical underwater, flowing long hair, sparkling jewelry, keep my face suitable to the mermaid, soft pastel colors, dreamy atmosphere, Disney-style animation. Keep the photo has a bright light.",
+        "isVip": true,
+        "advance":true
+    },
+    {
+        "imageName": "ptp_style_DarkMermaid",
+        "imageText": "Dark Mermaid",
+        "prompt":"Create my photo into a dark fantasy mermaid with black and gold scales, keep my face suitable to the mermaid but do not change my face, deep ocean abyss, hauntingly beautiful, dark aesthetic, eerie glow, mysterious atmosphere.",
+        "isVip": true,
+        "advance":true
+    },
     {
         "imageName": "ptp_style_SoloLeveling",
         "imageText": "Solo Leveling",