1.解决首次安装,且不是 vip(没有主动恢复内购),情况下.后台图生图成功后,点击 view,黑色空页面问题

2.APP接口调整

AIEmoji/Business/TSAILIstVC/TSAIExpandImageVC/TSAIExpandImageVC.swift

@@ -11,11 +11,12 @@ class TSAIExpandImageVC: TSBaseVC {
     
     var upLoadImage:UIImage?{
         didSet{
+            submitBtn.isEnabled = !(upLoadImage == nil)
             expandAreaView.setImage(showImage: upLoadImage)
         }
     }
     
-    init(upLoadImage: UIImage) {
+    init(upLoadImage: UIImage?) {
         self.upLoadImage = upLoadImage
         super.init()
     }
@@ -137,8 +138,11 @@ extension TSAIExpandImageVC {
     }
     // MARK: - 更新扩图区域
     private func updateExpandArea() {
-        guard let upLoadImage = upLoadImage else { return }
-        let imageSize = upLoadImage.size
+        var imageSize = CGSizeMake(500, 500)
+        if let upLoadImage = upLoadImage {
+            imageSize = upLoadImage.size
+        }
+        
         let imageAspectRatio = imageSize.width / imageSize.height
         let targetAspectRatio = viewModel.currentRatio.value
         let maxSize = expandAreaView.maxSize

AIEmoji/Business/TSAILIstVC/TSAILIstVC/TSAILIstVC.swift

@@ -32,14 +32,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "",//"isFirstAIListQualityHintVC",
-                        maxBitSize: kUploadImageMaxBit10Size,
-                        config:.defaultConfig
-                    ) { image in
-                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: image,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .photoQuality)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "",//"isFirstAIListQualityHintVC",
+//                        maxBitSize: kUploadImageMaxBit10Size,
+//                        config:.defaultConfig
+//                    ) { image in
+                    let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .photoQuality)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
         }))
         
         sectionModel.addSubItemModel(
@@ -50,14 +50,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "",
-                        maxBitSize: kUploadImageMaxBit10Size,
-                         config:.getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit10Size)
-                    ) { image in
-                        let baseVc = TSAIExpandImageVC(upLoadImage: image)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "",
+//                        maxBitSize: kUploadImageMaxBit10Size,
+//                         config:.getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit10Size)
+//                    ) { image in
+                        let baseVc = TSAIExpandImageVC(upLoadImage: nil)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
         }))
         
         sectionModel.addSubItemModel(
@@ -68,14 +68,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "isFirstAILivePhoto",
-                        maxBitSize: kUploadImageMaxBit5Size,
-                         config:.getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
-                    ) { image in
-                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: image,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .photoLive)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "isFirstAILivePhoto",
+//                        maxBitSize: kUploadImageMaxBit5Size,
+//                         config:.getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
+//                    ) { image in
+                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .photoLive)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
         }))
         
         sectionModel.addSubItemModel(
@@ -86,14 +86,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "isFirstAIPrettyPhoto",
-                        maxBitSize: kUploadImageMaxBit5Size,
-                         config:.getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
-                    ) { image in
-                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: image,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .pretty)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "isFirstAIPrettyPhoto",
+//                        maxBitSize: kUploadImageMaxBit5Size,
+//                         config:.getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
+//                    ) { image in
+                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .pretty)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
         }))
         
         sectionModel.addSubItemModel(
@@ -104,14 +104,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "isFirstAIEyeOpenPhoto",
-                        maxBitSize: kUploadImageMaxBit5Size,
-                        config: .getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
-                    ) { image in
-                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: image,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .eyeOpen)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "isFirstAIEyeOpenPhoto",
+//                        maxBitSize: kUploadImageMaxBit5Size,
+//                        config: .getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
+//                    ) { image in
+                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .eyeOpen)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
         }))
         
         sectionModel.addSubItemModel(
@@ -122,14 +122,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "isFirstAIChangeRestOldPhoto",
-                        maxBitSize: kUploadImageMaxBit5Size,
-                        config: .getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
-                    ) { image in
-                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: image,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .oldPhoto)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "isFirstAIChangeRestOldPhoto",
+//                        maxBitSize: kUploadImageMaxBit5Size,
+//                        config: .getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit5Size)
+//                    ) { image in
+                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit5Size, generatorStyle: .oldPhoto)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
         }))
         
         sectionModel.addSubItemModel(
@@ -176,14 +176,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "isFirstAIListAgeOldHintVC",
-                        maxBitSize: kUploadImageMaxBit10Size,
-                        config:.defaultConfig
-                    ) { image in
-                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: image,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .ageOld)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "isFirstAIListAgeOldHintVC",
+//                        maxBitSize: kUploadImageMaxBit10Size,
+//                        config:.defaultConfig
+//                    ) { image in
+                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .ageOld)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
         }))
         
         sectionModel.addSubItemModel(
@@ -194,14 +194,14 @@ class TSAILIstVC: TSBaseVC {
                 rightViewStyle: 0,
                 tapBlock: { [weak self] model, _, _ in
                    guard let self = self else { return }
-                    enterSelectPhotos(
-                        userDefaultsKey: "isFirstAIListAgeChildHintVC",
-                        maxBitSize: kUploadImageMaxBit10Size,
-                        config:.defaultConfig
-                    ) { image in
-                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: image,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .ageChild)
+//                    enterSelectPhotos(
+//                        userDefaultsKey: "isFirstAIListAgeChildHintVC",
+//                        maxBitSize: kUploadImageMaxBit10Size,
+//                        config:.defaultConfig
+//                    ) { image in
+                        let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .ageChild)
                         kPushVC(target: self, modelVC: baseVc)
-                    }
+//                    }
                     
                                 
         }))

AIEmoji/Business/TSAILIstVC/TSAIUploadPhotoBaseVC/TSAIUploadPhotoBaseVC.swift

@@ -21,7 +21,7 @@ class TSAIUploadPhotoBaseVC: TSBaseVC {
     var generatorStyle:TSGeneratorImageStyle
     var titleString:String
     var imageMaxBitSize:Int
-    init(titleString:String,upLoadImage:UIImage,imageMaxBitSize:Int,generatorStyle:TSGeneratorImageStyle) {
+    init(titleString:String,upLoadImage:UIImage?,imageMaxBitSize:Int,generatorStyle:TSGeneratorImageStyle) {
         self.titleString = titleString
         self.upLoadImage = upLoadImage
         self.imageMaxBitSize = imageMaxBitSize

AIEmoji/Business/TSPTPGeneratorVC/TSPTPGeneratorVC/TSPTPGeneratorVC.swift

@@ -137,7 +137,6 @@ class TSPTPGeneratorVC: TSAIPhotoGeneratorBaseVC {
     @objc override func clickRegenerateBtn(){
         //判断 vip
         if kJudgeVip(externalBool: kPurchaseDefault.freeNumAvailable(type: .picToPic) == false, vc: self) { return }
-//        viewModel.uploadAndCreatImage()
         
         if let model = self.infoModel {
             if model.actionStatus == .success  {
@@ -164,18 +163,11 @@ class TSPTPGeneratorVC: TSAIPhotoGeneratorBaseVC {
     }
     
     override func dealThings() {
-//        viewModel.uploadAndCreatImage()
-//        viewModel.$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)
         creatImage()
     }
     
     
     func creatImage() {
-        //判断 vip
-        if kJudgeVipFreeType(vipFreeNumType: .picToPic, vc: self){ return }
         if let model = self.infoModel{
             if model.actionStatus == .failed{
                 creatOperation(infoModel: model)

AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -316,11 +316,13 @@ func kJudgeVip(externalBool:Bool,
 extension TSPurchaseVC{
     
     static func show(target:UIViewController,closePageBlock:(()->Void)?){
-        let vc = TSPurchaseVC()
-        vc.closePageBlock = closePageBlock
-        let navi = TSBaseNavigationC(rootViewController: vc)
-        navi.modalPresentationStyle = .overFullScreen
-        target.present(navi, animated: true)
+        kDelayMainShort {
+            let vc = TSPurchaseVC()
+            vc.closePageBlock = closePageBlock
+            let navi = TSBaseNavigationC(rootViewController: vc)
+            navi.modalPresentationStyle = .overFullScreen
+            target.present(navi, animated: true)
+        }
     }
 
 }