3.6.25(3)修改 bug

AIEmoji.xcodeproj/project.pbxproj

@@ -3156,7 +3156,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;
@@ -3195,7 +3195,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/Discover/Style/discover_1_StickerMe.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "discover_0_StickerMe@2x.png",
+      "filename" : "discover_1_StickerMe@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "discover_0_StickerMe@3x.png",
+      "filename" : "discover_1_StickerMe@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

AIEmoji/Assets.xcassets/PTP/style/ptp_style_StickerMe.imageset/Contents.json

@@ -10,7 +10,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "ptp_style_StickerMe@3x.png",
+      "filename" : "ptp_style_StickerMe3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

AIEmoji/Business/TSAILIstVC/TSAIListVideoPlayerVC/TSAIListVideoPlayerVC.swift

@@ -226,6 +226,9 @@ class TSAIListVideoPlayerVC: UIViewController {
         controlsContainerView.snp.updateConstraints { make in
             make.bottom.equalTo(bottem)
         }
+        
+        controlsContainerView.layoutIfNeeded()
+        controlsContainerView.setNeedsLayout()
     }
     
     func runloppPlay() {

AIEmoji/Business2/DisCover/TSAIGenerateVC/TSAIGenerateBaseVC/TSAIGenerateBaseVC+Video.swift

@@ -18,7 +18,7 @@ extension TSAIGenerateBaseVC {
         self.addChild(self.videoPlayerVC)
         self.videoPlayerVC.view.frame = self.netWorkImageView.bounds
         self.netWorkImageView.addSubview(self.videoPlayerVC.view)
-        self.videoPlayerVC.setControlsBottom(bottem: -80-k_Height_safeAreaInsetsBottom())
+        self.videoPlayerVC.setControlsBottom(bottem: -20)
         self.videoPlayerVC.runloppPlay()
     }
 }

AIEmoji/Business2/DisCover/TSDiscoverVC/Cell/TSDiscoverBannerCell.swift

@@ -257,7 +257,7 @@ class TSDiscoverBannerViewImageCell: TSBaseCollectionCell {
         textLabel.snp.makeConstraints { make in
             make.leading.equalTo(16)
             make.trailing.equalTo(-111)
-            make.bottom.equalTo(-58)
+            make.bottom.equalTo(-65)//58
             make.height.equalTo(52)
         }
 

AIEmoji/Business2/DisCover/TSDiscoverVC/TSDiscoverVC.swift

@@ -339,17 +339,23 @@ extension TSDiscoverVC{
     static var hintBaseVC:TSAIListHintBaseVC?
     static var photoPickerManager:TSPhotoPickerManager?
     
-    static func enterSelectPhotos(target:UIViewController,style:TSFuncStyle,hintType:Int = 0,complete: @escaping (UIImage)->Void){
+    static func enterSelectPhotos(
+        target:UIViewController,
+        style:TSFuncStyle,
+        hintType:Int = 0,
+        interceptSelectedPictureBlock:((UIImage) -> Bool)? = nil,
+        complete: @escaping (UIImage)->Void)
+    {
         let userDefaultsKey = style.getHintKey(hintType: hintType)
         if userDefaultsKey.count == 0 || style == .ptp {
-            self.pickSinglePhoto(target:target,complete:complete)
+            self.pickSinglePhoto(target:target,interceptSelectedPictureBlock: interceptSelectedPictureBlock,complete:complete)
         }else{
             TSAIListHintBaseVC.userDefaultsKey = userDefaultsKey
             if TSAIListHintBaseVC.isShowUploadImageHint{
                 TSAIListHintBaseVC.isShowUploadImageHint = false
                 self.presentModalHintVC(target:target,config:style.getConfig(hintType: hintType),complete:complete)
             }else {
-                self.pickSinglePhoto(target:target,complete:complete)
+                self.pickSinglePhoto(target:target,interceptSelectedPictureBlock: interceptSelectedPictureBlock,complete:complete)
             }
         }
     }
@@ -373,8 +379,9 @@ extension TSDiscoverVC{
         Self.hintBaseVC = hintBaseVC
     }
     
-    static func pickSinglePhoto(target:UIViewController,complete: @escaping (UIImage)->Void)  {
+    static func pickSinglePhoto(target:UIViewController,interceptSelectedPictureBlock:((UIImage) -> Bool)? = nil,complete: @escaping (UIImage)->Void)  {
         let photoPickerManager = TSPhotoPickerManager(viewController: target)
+        photoPickerManager.interceptSelectedPictureBlock = interceptSelectedPictureBlock
         photoPickerManager.pickCustomSinglePhoto() { image, errorString in
             if let errorString = errorString {
                 TSToastShared.showToast(text: errorString)

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSPTPUploadImageVC+View.swift

@@ -143,24 +143,30 @@ extension TSPTPUploadImageVC {
     }
     
     
-    func judgeVideoImagesize()->Bool{
-        if isVideo,
-           viewModel.selectedPTPStyleModel.imageText == kTSDiscoverVM.video_Subject3.safeString(forKey: "imageText")     ||
-            viewModel.selectedPTPStyleModel.imageText == kTSDiscoverVM.video_PUBGWinnerHit.safeString(forKey: "imageText")  ||
-            viewModel.selectedPTPStyleModel.imageText == kTSDiscoverVM.video_MotorDance.safeString(forKey: "imageText"){
-           let size = viewModel.generatorModel.upLoadImage.size
+    func judgeVideoImagesizeError(image:UIImage)->Bool{
+        if isVideo,Self.judgeoImageSizeError(generateModel: viewModel.selectedPTPStyleModel, image: image){
+            TSCustomAlertController.show(in: self, config: TSCustomAlertController.AlertConfig(
+                message: "Invalid aspect ratio. Must be 1:2 to 1:1.2".localized,
+                cancelTitle: "Got it".localized,
+                cancelColor: .white,
+                confirmTitle: ""
+            ))
+            return true
+        }
+        return false
+    }
+    
+    //判断图片的尺寸是否错误
+    static func judgeoImageSizeError(generateModel:TSGenerateModel,image:UIImage)->Bool{
+       if generateModel.imageText == kTSDiscoverVM.video_Subject3.safeString(forKey: "imageText")     ||
+        generateModel.imageText == kTSDiscoverVM.video_PUBGWinnerHit.safeString(forKey: "imageText")  ||
+        generateModel.imageText == kTSDiscoverVM.video_MotorDance.safeString(forKey: "imageText")
+        {
+           let size = image.size
            if size.width/size.height < 0.5 || size.width/size.height > 0.83 {
-               TSCustomAlertController.show(in: self, config: TSCustomAlertController.AlertConfig(
-                   message: "Invalid aspect ratio. Must be 1:2 to 1:1.2.".localized,
-                   cancelTitle: "Got it".localized,
-                   cancelColor: .white,
-                   confirmTitle: ""
-               ))
                return true
            }
         }
         return false
     }
-    
-    
 }

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSPTPUploadImageVC.swift

@@ -73,7 +73,7 @@ class TSPTPUploadImageVC: TSBaseVC {
 extension TSPTPUploadImageVC {
     func generateImage() {
 
-        if judgeVideoImagesize(){ return }
+        if judgeVideoImagesizeError(image: viewModel.generatorModel.upLoadImage){ return }
         
         let gennerateVC = TSAIGenerateVC(generatorModel: viewModel.generatorModel) { [weak self] _ in
             guard let self = self else { return }
@@ -91,7 +91,14 @@ extension TSPTPUploadImageVC {
 
 extension TSPTPUploadImageVC {
     @objc func pickSinglePhoto() {
-        TSDiscoverVC.enterSelectPhotos(target: self, style: viewModel.style, hintType: viewModel.selectedPTPStyleModel.hintType) { [weak self] image in
+        TSDiscoverVC.enterSelectPhotos(target: self, style: viewModel.style, hintType: viewModel.selectedPTPStyleModel.hintType,interceptSelectedPictureBlock: { [weak self] image in
+            guard let self = self else { return false}
+            if isVideo,Self.judgeoImageSizeError(generateModel: viewModel.selectedPTPStyleModel, image: image){
+                TSToastShared.showToast(text: "Invalid aspect ratio. Must be 1:2 to 1:1.2".localized)
+                return true
+            }
+            return false
+        }) { [weak self] image in
             guard let self = self else { return }
             viewModel.upLoadImage = image
             uploadView.upLoadImage = image

AIEmoji/Common/NetworkManager/TSNetWork/TSNetWork+Business.swift

@@ -96,8 +96,8 @@ let kGenerateFailed:String = "Sorry there was a slight problem with the image pr
 enum TSNetWorkCode : Int {
     case success = 200
     case fail = 0   //通用错误
-    case textSensitive = -10003    //文生图敏感错误
-    case imageSensitive = -10004   //图生图敏感错误
+    case textSensitive = -10003    //文字敏感错误
+    case imageSensitive = -10004   //图片敏感错误
     case networkError = -1005   //网络错误
     case generateTooMuch = -200   //单日生成次数过多
     case generateToMax = -221211   //会员成次次数超限

AIEmoji/Common/View/TSPhotoPickerManager/TSPhotoPickerManager.swift

@@ -15,6 +15,7 @@ class TSPhotoPickerManager: NSObject {
     private var completionHandler: ((UIImage?,PHAsset?) -> Void)?
     private var completionSizeHandler: ((UIImage?,String?) -> Void)?
     private var imagePicker = UIImagePickerController()
+    var interceptSelectedPictureBlock:((UIImage) -> Bool)? //拦截图片选择的判断
     // MARK: - Initializers
     init(viewController: UIViewController) {
         self.viewController = viewController
@@ -94,13 +95,20 @@ class TSPhotoPickerManager: NSObject {
 // MARK: - UIImagePickerControllerDelegate & UINavigationControllerDelegate (iOS 14 以下)
 extension TSPhotoPickerManager: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
-//        picker.dismiss(animated: true) {
+
             if let image = info[.originalImage] as? UIImage {
+                //拦截图片,看是否合格
+                if let interceptSelectedPictureBlock = interceptSelectedPictureBlock {
+                    if interceptSelectedPictureBlock(image) == true{
+                        return
+                    }
+                }
+                
                 self.completionHandler?(image,info[.phAsset] as? PHAsset )
             } else {
                 self.completionHandler?(nil,nil)
             }
-//        }
+
         
         if completionSizeHandler == nil {
             picker.dismiss(animated: true, completion: nil)