Эх сурвалжийг харах

解决文生图,photo,每次生成新图片,最后一个示例图会显示成一样的问题

100Years 3 долоо хоног өмнө
parent
commit
cdfe8f1996

+ 4 - 4
AIRingtone.xcodeproj/project.pbxproj

@@ -1325,7 +1325,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;
@@ -1344,7 +1344,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/AIRingtone/Common/Tool/TSBandRingTool/libmp3",
 				);
-				MARKETING_VERSION = 1.5;
+				MARKETING_VERSION = 1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = ai.ringtones.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1367,7 +1367,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;
@@ -1386,7 +1386,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/AIRingtone/Common/Tool/TSBandRingTool/libmp3",
 				);
-				MARKETING_VERSION = 1.5;
+				MARKETING_VERSION = 1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = ai.ringtones.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

+ 0 - 2
AIRingtone/Business/Data/TSUserDefaultData.swift

@@ -288,11 +288,9 @@ class TSMineRintoneHistory{
     }()
     
     static func saveModel(model:TSRingModel){
-        //若存在,则不保存
         if let _ = self.listModelArray.first(where: { $0.audioUrl == model.audioUrl }) {
             return
         }
-//        TSToastShared.showToast(text: "保存成功")
         self.listModelArray.insert(model, at: 0)
         self.saveHistoryString()
         isHaveNew = true

+ 48 - 3
AIRingtone/Business/TSAIPhotoVC/TSAIPhotoChildVC/View/TSAIPhotoImageCell.swift

@@ -4,7 +4,7 @@
 //
 //  Created by 100Years on 2025/3/5.
 //
-
+import Kingfisher
 class TSAIPhotoImageCell: TSBaseCollectionCell {
     
     
@@ -17,6 +17,11 @@ class TSAIPhotoImageCell: TSBaseCollectionCell {
         return showImageView
     }()
     
+    lazy var exampleImageView: UIImageView = {
+        let showImageView = UIImageView.createImageView(imageName:"",contentMode: .scaleAspectFill)
+        showImageView.backgroundColor = .gray
+        return showImageView
+    }()
     lazy var exampleView: UIView = {
         let exampleView = UIView()
         exampleView.backgroundColor = "#232323".uiColor.withAlphaComponent(0.3)
@@ -63,6 +68,13 @@ class TSAIPhotoImageCell: TSBaseCollectionCell {
             make.trailing.bottom.equalTo(0)
         }
         
+        contentView.addSubview(exampleImageView)
+        exampleImageView.snp.makeConstraints { make in
+            make.top.equalTo(0)
+            make.leading.equalTo(0)
+            make.trailing.bottom.equalTo(0)
+        }
+        
         if self.bounds.size.width == self.bounds.size.height {
             contentView.layer.cornerRadius = self.bounds.size.width/2
         }else{
@@ -122,6 +134,7 @@ class TSAIPhotoImageCell: TSBaseCollectionCell {
         if model.modelType == .example {
             model.actionStatus = .success
         }
+        showImageView.image = nil
         dePrint("updataActionInfoModelView model.actionStatus 收到 = \(model.actionStatus)")
         switch model.actionStatus {
         case .pending,.running:
@@ -129,9 +142,41 @@ class TSAIPhotoImageCell: TSBaseCollectionCell {
             generateView.setProgress(progress: model.percent)
         case .success:
             generateView.isHidden = true
+            showImageView.image = kPlaceholderImage
+            let urlString = model.response.resultUrl
+            if urlString.contains("http"), let url = URL(string: urlString) {
+                showImageView.kf.setImage(with: url)
+            }else {
+                if let image = UIImage(named: urlString) {
+                    showImageView.image = image
+                }
+            }
+            
+            if model.modelType == .example {
+                exampleView.isHidden = false
+                exampleImageView.isHidden = false
+                
+                if let image = UIImage(named: urlString) {
+                    exampleImageView.image = image
+                }else{
+                    exampleImageView.image = kPlaceholderImage
+                }
+                
+                showImageView.isHidden = true
+                showImageView.image = nil
+                
+            }else{
+        
+                exampleView.isHidden = true
+                exampleImageView.isHidden = true
+                exampleImageView.image = nil
+                
+                showImageView.isHidden = false
+                showImageView.setAsyncImage(urlString: model.response.resultUrl,placeholder: kPlaceholderImage,contentMode: .scaleAspectFill)
+            }
             
-            showImageView.setAsyncImage(urlString: model.response.resultUrl,placeholder: kPlaceholderImage,contentMode: .scaleAspectFill)
-            exampleView.isHidden = model.modelType == .example ? false : true
+//            showImageView.setAsyncImage(urlString: model.response.resultUrl,placeholder: kPlaceholderImage,contentMode: .scaleAspectFill)
+//            exampleView.isHidden = model.modelType == .example ? false : true
             
         case .failed:
             generateView.isHidden = false