2.0(3)上架

AIEmoji.xcodeproj/project.pbxproj

@@ -1808,7 +1808,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1847,7 +1847,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

AIEmoji/Assets.xcassets/Common/failed_big.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "failed_big@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "failed_big@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AIEmoji/Assets.xcassets/Common/submit_btn_dis_bg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "submit_btn_dis_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "submit_btn_dis_bg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AIEmoji/Business/TSGenmojiVC/TSGenmojiGennerateVC/TSGenmojiGennerateViewModel.swift

@@ -103,10 +103,11 @@ class TSGenmojiGennerateViewModel {
     
     @Published var stateDatauPblished:(TSProgressState,TSGenmojiModel?) = (TSProgressState.none,nil)
     var aiText:String = ""
-    
+    var generatingProgress = 0
     func creatImageEmoji(text:String) {
         stopNetwork = false
         aiText = text
+        generatingProgress = 0
         stateDatauPblished = (.start,nil)
         stateDatauPblished = (.progressString(generating(progress: 0.0)),nil)
         creatRequest = TSNetworkShared.post(urlType: .imageEmoji,parameters: ["prompt":text]) { [weak self] data,error in
@@ -133,8 +134,10 @@ class TSGenmojiGennerateViewModel {
                     case .success:
                         TSToastShared.hideLoading()
                         self.stateDatauPblished = (.success(nil),genmojiModel)
+                        generatingProgress = 0
                     case .failed:
                         self.stateDatauPblished = (.failed(kNetWorkMessage(data: data) ?? ""),nil)
+                        generatingProgress = 0
                     default:
                         stateDatauPblished = (.progressString(generating(progress: genmojiModel.percent)),nil)
                         if stopNetwork == false {
@@ -158,8 +161,19 @@ class TSGenmojiGennerateViewModel {
     }
     
     func generating(progress:Float) -> String {
+
         //Generating 0%-100%
-        let progressInt = Int(progress*100)
+        var progressInt = Int(progress*100)
+
+        if generatingProgress >= progressInt{
+            return "Generating \(generatingProgress)%"
+        }
+
+        if progressInt > 99 {
+            progressInt = 99
+        }
+        
+        generatingProgress = progressInt
         return "Generating \(progressInt)%"
     }
 }

AIEmoji/Business/TSGenmojiVC/TSGenmojiVC/View/TSGenmojiColSectionView.swift

@@ -43,7 +43,7 @@ class TSGenmojiColSectionView: TSBaseCollectionnReusableView {
             leftLab.text = componentReuseViewModel.sectionModel.name
             
             switch componentReuseViewModel.sectionModel.style {
-            case .history,.textPicHistory:
+            case .history,.textPicHistory,.ptpPicHistory:
                 delBtn.isHidden = false
             default:
                 delBtn.isHidden = true

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

@@ -18,6 +18,7 @@ class TSPTPGeneratorVM {
     var imageUrl:String?
     var upLoadImage:UIImage
     
+    var generatingProgress = 0
     init(prompt:String,upLoadImage:UIImage) {
         self.prompt = prompt
         self.upLoadImage = upLoadImage
@@ -25,9 +26,8 @@ class TSPTPGeneratorVM {
     
 
     func creatImage() {
-        
         guard let imageUrl = imageUrl else { return }
-        
+        generatingProgress = 0
         stopNetwork = false
         stateDatauPblished = (.start,nil)
         stateDatauPblished = (.progressString(generating(progress: 0.0)),nil)
@@ -55,8 +55,10 @@ class TSPTPGeneratorVM {
                     case .success:
                         TSToastShared.hideLoading()
                         self.stateDatauPblished = (.success(nil),genmojiModel)
+                        generatingProgress = 0
                     case .failed:
                         self.stateDatauPblished = (.failed(kNetWorkMessage(data: data) ?? ""),nil)
+                        generatingProgress = 0
                     default:
                         stateDatauPblished = (.progressString(generating(progress: genmojiModel.percent)),nil)
                         if stopNetwork == false {
@@ -93,7 +95,9 @@ class TSPTPGeneratorVM {
         stateDatauPblished = (.progressString(uploadingPhoto(progress: 0.0)),nil)
         uploadImage { [weak self]  progress in
             guard let self = self else { return }
-            stateDatauPblished = (.progressString(uploadingPhoto(progress: progress)),nil)
+            if generatingProgress == 0 {
+                stateDatauPblished = (.progressString(uploadingPhoto(progress: progress)),nil)
+            }
         } completion: { [weak self]  data, error in
             guard let self = self else { return }
             if let error = error {
@@ -110,13 +114,27 @@ class TSPTPGeneratorVM {
     
     func uploadingPhoto(progress:Float) -> String {
         //Uploading Photo 0%-100%
-        let progressInt = Int(progress*100)
+        var progressInt = Int(progress*100)
+        if progressInt > 99 {
+            progressInt = 99
+        }
         return "Uploading Photo \(progressInt)%"
     }
     
     func generating(progress:Float) -> String {
+
         //Generating 0%-100%
-        let progressInt = Int(progress*100)
+        var progressInt = Int(progress*100)
+
+        if generatingProgress >= progressInt{
+            return "Generating \(generatingProgress)%"
+        }
+
+        if progressInt > 99 {
+            progressInt = 99
+        }
+        
+        generatingProgress = progressInt
         return "Generating \(progressInt)%"
     }
 }

AIEmoji/Business/TSPTPGeneratorVC/TSPhotoToPhotoVC/VM/TSPhotoToPhotoVM.swift

@@ -180,7 +180,7 @@ extension TSPhotoToPhotoVM {
         }
           
         let colItemModel = TSGenmojiCoLItemModel()
-        colItemModel.style = .textPicHistory
+        colItemModel.style = .ptpPicHistory
         colItemModel.dataModel = model
         historySeciton.items.insert(colItemModel, at: 0)
         return isNeed

AIEmoji/Business/TSTextGeneralPictureVC/TSTextPicGennerateVC/TSTextPicGennerateVM.swift

@@ -20,9 +20,10 @@ class TSTextPicGennerateVM {
    
     @Published var stateDatauPblished:(TSProgressState,TSGenmojiModel?) = (TSProgressState.none,nil)
     var aiText:String = ""
-    
+    var generatingProgress = 0
     //width 和 height 必须是 32 的倍数
     func creatImageEmoji(text:String,width:Int = Int(kTextPicW) ,height:Int = Int(kTextPicH)) {
+        generatingProgress = 0
         aiText = text
         let postDict:[String : Any] = [
             "prompt":text,
@@ -54,8 +55,10 @@ class TSTextPicGennerateVM {
                     case .success:
                         TSToastShared.hideLoading()
                         self.stateDatauPblished = (.success(nil),genmojiModel)
+                        generatingProgress = 0
                     case .failed:
                         self.stateDatauPblished = (.failed(kNetWorkMessage(data: data) ?? ""),nil)
+                        generatingProgress = 0
                     default:
                         stateDatauPblished = (.progressString(generating(progress: genmojiModel.percent)),nil)
                         if stopNetwork == false {
@@ -78,8 +81,19 @@ class TSTextPicGennerateVM {
     }
     
     func generating(progress:Float) -> String {
+
         //Generating 0%-100%
-        let progressInt = Int(progress*100)
+        var progressInt = Int(progress*100)
+
+        if generatingProgress >= progressInt{
+            return "Generating \(generatingProgress)%"
+        }
+
+        if progressInt > 99 {
+            progressInt = 99
+        }
+        
+        generatingProgress = progressInt
         return "Generating \(progressInt)%"
     }
 }

AIEmoji/Business/VIewTool/TSCommonloadingView.swift

@@ -10,7 +10,7 @@ import Kingfisher
 class TSCommonloadingView: TSBaseView {
     
     lazy var imageView: UIImageView = {
-        let imageView = UIImageView.createImageView(imageName: "failed")
+        let imageView = UIImageView.createImageView(imageName: "failed_big")
         imageView.isHidden = true
         return imageView
     }()
@@ -114,7 +114,7 @@ class TSCommonloadingView: TSBaseView {
         animatedImageView.isHidden = true
         
         imageView.isHidden = false
-        imageView.image = UIImage(named: "failed")
+        imageView.image = UIImage(named: "failed_big")
         
         textLabel.text = text
         isRotating = false

AIEmoji/Business/VIewTool/TSViewTool.swift

@@ -26,9 +26,15 @@ func createBlurEffectView(style:UIBlurEffect.Style,backgroundColor:UIColor? = ni
 //常用提交按钮
 func kCreateNormalSubmitBtn(title:String, action: (() -> Void)? = nil) -> UIButton {
     let btn = UIButton.createButton(title:title,font: UIFont.font(size: 16,weight: .medium),titleColor:.black,corner: 30,action: action)
+    
     var buttonBgImage = UIImage(named: "submit_btn_bg")!
     buttonBgImage = buttonBgImage.resizableImage(withCapInsets: UIEdgeInsets(top:24, left: 24, bottom: 24, right: 24), resizingMode: .stretch)
     btn.setBackgroundImage(buttonBgImage, for: .normal)
+    
+    var buttonDisBgImage = UIImage(named: "submit_btn_dis_bg")!
+    buttonDisBgImage = buttonDisBgImage.resizableImage(withCapInsets: UIEdgeInsets(top:24, left: 24, bottom: 24, right: 24), resizingMode: .stretch)
+    btn.setBackgroundImage(buttonDisBgImage, for: .disabled)
+    
     return btn
 }
 //常用取消按钮