3.6.14(4)提审

TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1481,7 +1481,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1522,7 +1522,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

TSLiveWallpaper/Business/TSAIListVC/TSAIListHistoryVC/View/TSAIListHistoryCell.swift

@@ -82,17 +82,14 @@ class TSAIListHistoryCell: TSBaseCollectionCell {
     }()
     
     lazy var showImageView: UIImageView = {
-        let showImageView = UIImageView.createImageView(imageName:"",contentMode: .scaleAspectFill)
-        showImageView.backgroundColor = .gray
+        let showImageView = UIImageView.createImageView(contentMode: .scaleAspectFill)
         return showImageView
     }()
     
-//    lazy var hiddenImageView: UIImageView = {
-//        let hiddenImageView = UIImageView.createImageView(imageName:"",contentMode: .scaleAspectFill)
-//        hiddenImageView.backgroundColor = .gray
-//        hiddenImageView.isHidden = true
-//        return hiddenImageView
-//    }()
+    lazy var hiddenImageView: UIImageView = {
+        let hiddenImageView = UIImageView.createImageView(image:.clearBg,contentMode: .scaleAspectFill)
+        return hiddenImageView
+    }()
     
     lazy var videoIconImageView: UIImageView = {
         let videoIconImageView = UIImageView.createImageView(image:.videoIcon,contentMode: .scaleToFill,autoMirrored:false)
@@ -147,12 +144,12 @@ class TSAIListHistoryCell: TSBaseCollectionCell {
         contentView.layer.borderWidth = 3
         contentView.layer.borderColor = "#DFD7C0".uiCGColor
         
-//        contentView.addSubview(hiddenImageView)
-//        hiddenImageView.snp.makeConstraints { make in
-//            make.top.equalTo(0)
-//            make.leading.equalTo(0)
-//            make.trailing.bottom.equalTo(0)
-//        }
+        contentView.addSubview(hiddenImageView)
+        hiddenImageView.snp.makeConstraints { make in
+            make.top.equalTo(0)
+            make.leading.equalTo(0)
+            make.trailing.bottom.equalTo(0)
+        }
         
         contentView.addSubview(showImageView)
         showImageView.snp.makeConstraints { make in
@@ -238,27 +235,6 @@ extension TSAIListHistoryCell {
     }
 }
 
-
-//extension TSAIListHistoryCell {
-//    
-//    func setVideoHidden(){
-//        blurEffect.isHidden = true
-//        videoPlayerVC.view.removeFromSuperview()
-//    }
-//    
-//    func setVideoURL(){
-//        blurEffect.isHidden = kPurchaseBusiness.isVip
-//        self.videoPlayerVC.view.removeFromSuperview()
-//        self.videoPlayerVC = TSAIListVideoPlayerVC(videoURL: dataModel.response.videoURL)
-//        self.videoPlayerVC.videoGravity = .resizeAspectFill
-//        self.videoPlayerVC.viewFrame = self.contentView.bounds
-//        self.videoPlayerVC.view.frame = self.contentView.bounds
-//        self.showImageView.insertSubview(self.videoPlayerVC.view, at: 0)
-//        self.videoPlayerVC.runloppPlay()
-//        self.videoPlayerVC.view.isUserInteractionEnabled = false
-//    }
-//}
-
 extension TSAIListHistoryCell {
     
     func setVideoHidden(){

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIPhotoRemoveVC/View/TSAIPhotoRemoveBgView.swift

@@ -45,7 +45,7 @@ class TSAIPhotoRemoveBgView: TSBaseView {
     lazy var photoPickerManager = TSPhotoPickerManager(viewController: targetVC)
     lazy var cusStackView: TSCustomStackView = TSCustomStackView(axis: .vertical,spacing: 0)
     lazy var bgImageView: UIImageView = UIImageView.createImageView(image:.generateBackground,contentMode: .scaleAspectFill)//图片生成
-    lazy var frontImageView: UIImageView = UIImageView.createImageView()//图片生成
+    lazy var frontImageView: UIImageView = UIImageView.createImageView(contentMode: .scaleAspectFit)//图片生成
     lazy var topContentView: UIView = {
         let topContentView = UIView()
         
@@ -217,9 +217,11 @@ class TSAIPhotoRemoveBgView: TSBaseView {
             
             let bottomGradient = bgImageView.layer.sublayers?
                 .first { $0.isKind(of: CAGradientLayer.self) } as? CAGradientLayer
+            let bottomImage = bgImageView.asImage(opaque: false)
+        
             ImageCompositor.compositeImages(
                 topImage: frontImageView.image!,
-                bottomImage: bgImageView.image,
+                bottomImage: bottomImage,
                 bottomColor: bgImageView.backgroundColor,
                 bottomGradient: bottomGradient,
                 completion: completion)

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIPhotoRemoveVC/View/TSColorPickerVC.swift

@@ -14,6 +14,13 @@ class TSColorPickerManager:NSObject {
     
     var colorPicker: UIColorPickerViewController?
     
+    lazy var clearView: UIView = {
+        let clearView = UIView()
+        clearView.backgroundColor = .clear
+        clearView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(dismissColorPicker)))
+        return clearView
+    }()
+    
     // MARK: - Public Methods
     /// 打开照片选择器，单选一张照片
     func pickColor(completion: @escaping (UIColor?) -> Void) {
@@ -30,12 +37,20 @@ class TSColorPickerManager:NSObject {
         }
         self.colorPicker = colorPicker
         viewController?.present(colorPicker, animated: true, completion: nil)
+        
+        viewController?.view.addSubview(clearView)
+        clearView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
     }
     
-    
+    @objc func dismissColorPicker() {
+        dismissPageVC()
+    }
     func dismissPageVC(){
-        self.colorPicker?.view.isHidden = true
-        self.colorPicker?.dismiss(animated: true)
+        clearView.removeFromSuperview()
+//        self.colorPicker?.view.isHidden = true
+        self.colorPicker?.dismiss(animated: false)
         self.colorPicker = nil
     }
     
@@ -51,6 +66,6 @@ extension TSColorPickerManager : UIColorPickerViewControllerDelegate {
     
     func colorPickerViewControllerDidFinish(_ viewController: UIColorPickerViewController) {
         // 用户点击完成按钮
-        colorPicker?.dismiss(animated: true)
+        dismissPageVC()
     }
 }

TSLiveWallpaper/Business/TSAIResultsFrameVC/TSAIUsedPhotoVC/TSAIUsedPhotoVC.swift

@@ -245,9 +245,13 @@ class TSAIUsedPhotoVCCell: TSBaseCollectionCell {
         }
     }
     
+    lazy var hiddenImageView: UIImageView = {
+        let hiddenImageView = UIImageView.createImageView(image:.clearBg,contentMode: .scaleAspectFill)
+        return hiddenImageView
+    }()
+    
     lazy var showImageView: UIImageView = {
-        let showImageView = UIImageView.createImageView(imageName:"",contentMode: .scaleAspectFill)
-        showImageView.backgroundColor = .gray
+        let showImageView = UIImageView.createImageView(contentMode: .scaleAspectFill)
         return showImageView
     }()
 
@@ -265,6 +269,13 @@ class TSAIUsedPhotoVCCell: TSBaseCollectionCell {
         contentView.layer.borderWidth = 3
         contentView.layer.borderColor = "#DFD7C0".uiCGColor
    
+        contentView.addSubview(hiddenImageView)
+        hiddenImageView.snp.makeConstraints { make in
+            make.top.equalTo(0)
+            make.leading.equalTo(0)
+            make.trailing.bottom.equalTo(0)
+        }
+        
         contentView.addSubview(showImageView)
         showImageView.snp.makeConstraints { make in
             make.top.equalTo(0)