3.2(5)

AIEmoji.xcodeproj/project.pbxproj

@@ -2246,7 +2246,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2285,7 +2285,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

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

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

AIEmoji/Business/TSAILIstVC/TSAIChangeEmoteVC/TSAIChangeEmoteVC.swift

@@ -67,6 +67,7 @@ class TSAIChangeEmoteVC: TSBaseVC {
         let generateInView = TSGeneratorloadingView()
         generateInView.setBackgroundColor(color: UIColor.black.withAlphaComponent(0.8))
         generateInView.isHidden = true
+        generateInView.regenerateBtn.addTarget(self, action: #selector(uploadAndCreatImage), for: .touchUpInside)
         return generateInView
     }()
     
@@ -179,6 +180,11 @@ extension TSAIChangeEmoteVC {
         }
     }
     
+    @objc func uploadAndCreatImage() {
+        if kJudgeVip(externalBool: true, vc: self){ return }//判断 vip
+        viewModel.uploadAndCreatImage()
+    }
+    
     @objc func switchOriginalPictureTouchDown() {
         self.topImageView.image = upLoadImage
     }
@@ -264,12 +270,18 @@ extension TSAIChangeEmoteVC {
         generateInView.isHidden = false
         generateInView.showLoading(text: text)
         generateInView.isRotating = true
+        
+        generateInView.xBtn.isHidden = true
+        generateInView.regenerateBtn.isHidden = true
     }
     
     func showLoading(){
         generateInView.isHidden = false
         generateInView.showLoading(text: "Generating".localized + " ...".localized)
         generateInView.isRotating = true
+        
+        generateInView.xBtn.isHidden = true
+        generateInView.regenerateBtn.isHidden = true
    
     }
     
@@ -278,12 +290,18 @@ extension TSAIChangeEmoteVC {
         generateInView.isHidden = false
         generateInView.showError(text: msg)
         generateInView.isRotating = false
+        
+        generateInView.xBtn.isHidden = false
+        generateInView.regenerateBtn.isHidden = false
     }
     
     func showSuccess(model:TSActionInfoModel){
         generateInView.isHidden = true
         generateInView.isRotating = false
         
+        generateInView.xBtn.isHidden = true
+        generateInView.regenerateBtn.isHidden = true
+        
         viewModel.selectStyleModel?.actionInfoModel = model
 
         self.topImageView.setAsyncImage(urlString: model.response.resultUrl,placeholder:upLoadImage)

AIEmoji/Business/TSAILIstVC/TSAIChangeEmoteVC/View/TSAIChangeEmoteStyleView.swift

@@ -203,7 +203,6 @@ class TSAIChangeEmoteStyleCell: TSBaseCollectionCell {
  
         bgContentView.addSubview(textLabel)
         textLabel.snp.makeConstraints { make in
-//            make.top.equalTo(imageView.snp.bottom).offset(2)
             make.bottom.equalTo(0)
             make.height.equalTo(16.0)
             make.leading.trailing.equalToSuperview()

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

@@ -31,6 +31,12 @@ class TSAIChangeEmoteVM {
 
     var isSavePhotoMark:Bool = false
     var isNeedSavePhoto:Bool {
+        
+        if let selectStyleModel = selectStyleModel,
+           selectStyleModel.clickType == 1{
+            return false
+        }
+        
         if isSavePhotoMark == false{
             for model in selectStyleModels {
                 if let _ = model.actionInfoModel {
@@ -160,6 +166,35 @@ extension TSAIChangeEmoteVM {
         return "Changing".localized + " \(progressInt)%"
     }
     
+//    //模拟数据
+//    func uploadAndCreatImage() {
+//
+//        stateDatauPblished = (.start,nil)
+//        stateDatauPblished = (.progressString(generating(progress: 0.0)),nil)
+//
+//        kDelayOnMainThread(0.2) {
+//            self.stateDatauPblished = (.progressString(self.generating(progress: 0.2)),nil)
+//        }
+//
+//        kDelayOnMainThread(0.5) {
+//            self.stateDatauPblished = (.progressString(self.generating(progress: 0.5)),nil)
+//        }
+//
+//        kDelayOnMainThread(0.8) {
+//            self.stateDatauPblished = (.progressString(self.generating(progress: 0.8)),nil)
+//        }
+//
+//
+//        kDelayOnMainThread(2.0) {
+//            if kRandomBool() {
+//                let infoModel = TSActionInfoModel(JSON:actionInfoDictPoster )
+//                self.stateDatauPblished = (.success(nil),infoModel)
+//            }else{
+//                self.stateDatauPblished = (.failed("error?.localizedDescription"),nil)
+//            }
+//        }
+//
+//    }
     
     func uploadAndCreatImage() {
         

AIEmoji/Business/VIewTool/TSGeneratorloadingView.swift

@@ -44,6 +44,23 @@ class TSGeneratorloadingView: TSBaseView {
         return blurEffect
     }()
     
+    
+    lazy var regenerateBtn: UIButton = {
+        let regenerateBtn = UIButton.createButton(title: "Regenerate".localized,backgroundImage: kSubmitBtnNormalbg,font: .font(size: 12),titleColor: "#111111".uiColor,corner: 22)
+//        regenerateBtn.contentEdgeInsets = UIEdgeInsets(top: 0, left: 28, bottom: 0, right:28)
+        regenerateBtn.isHidden = true
+        return regenerateBtn
+    }()
+    
+    lazy var xBtn: UIButton = {
+        let xBtn = UIButton.createButton(image: UIImage(named: "close_gray")) { [weak self]  in
+            guard let self = self else { return }
+            self.isHidden = true
+        }
+        xBtn.isHidden = true
+        return xBtn
+    }()
+    
     override func creatUI() {
 
         contentView.addSubview(blurEffect)
@@ -68,6 +85,23 @@ class TSGeneratorloadingView: TSBaseView {
             make.leading.equalTo(16)
             make.trailing.equalTo(-16)
         }
+        
+        contentView.addSubview(regenerateBtn)
+        regenerateBtn.snp.makeConstraints { make in
+            make.top.equalTo(textLabel.snp.bottom).offset(20)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(44)
+            make.width.equalTo(126*kDesignScale)
+        }
+        
+        //关闭按钮
+        contentView.addSubview(xBtn)
+        xBtn.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_StatusBar + 4)
+            make.leading.equalTo(16)
+            make.width.equalTo(36)
+            make.height.equalTo(36)
+        }
     }
 
     override func dealThings() {

AIEmoji/Business/VIewTool/TSViewTool.swift

@@ -41,6 +41,11 @@ func kCreateNormalSubmitBtn(title:String, action: (() -> Void)? = nil) -> UIButt
     return btn
 }
 
+
+let kSubmitBtnbg = UIImage(named: "submit_btn_bg")
+let kSubmitBtnSmallBg = UIImage(named: "submit_btn_small_bg")
+let kSubmitBtnNormalbg = UIImage(named: "submit_btn_normal_bg")
+
 //常用取消按钮
 func kCreateNormalCancelBtn(title:String, action: (() -> Void)? = nil) -> UIButton {
     let btn = UIButton.createButton(title:title,backgroundColor: .fromHex("#FFFFFF", alpha: 0.4),font: UIFont.font(size: 14,weight: .medium),titleColor:.white,corner: 30,action: action)

AIEmoji/Common/Purchase/TSPurchaseManager.swift

@@ -143,9 +143,9 @@ public class PurchaseManager: NSObject {
     }
 
     @objc public var isVip: Bool {
-//        #if DEBUG
-//            return true
-//        #endif
+        #if DEBUG
+            return true
+        #endif
         guard let expiresDate = expiredDate else {
             return false
         }