3.6.16(2)修复 bug

TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1509,7 +1509,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1550,7 +1550,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

TSLiveWallpaper/Assets.xcassets/AIList/selectedPhotoStyleCamera/selectedPhotoStyleCamera.imageset/Contents.json

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

TSLiveWallpaper/Assets.xcassets/AIList/selectedPhotoStyleCamera/selectedPhotoStyleOldPhoto.imageset/Contents.json

@@ -10,6 +10,7 @@
       "scale" : "2x"
     },
     {
+      "filename" : "old photo@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

TSLiveWallpaper/Assets.xcassets/AIList/selectedPhotoStyleCamera/selectedPhotoStylePhoto.imageset/Contents.json

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

TSLiveWallpaper/Business/BusinessView/TSImagesComparisonView.swift

@@ -76,22 +76,21 @@ class TSImagesComparisonView: UIView {
         // 分割线样式
         lineView.backgroundColor = .white
         lineView.alpha = 0 // 初始隐藏
-//        lineView.isHidden = true
         addSubview(lineView)
-    }
-    
-    // MARK: - 布局
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        oldImageView.frame = bounds
-        newImageView.frame = bounds
+        
+        oldImageView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        newImageView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+
         lineView.frame = CGRect(x: 0, y: 0, width: 1, height: bounds.height)
     }
     
+    
     func startAnimation(duration: TimeInterval = 2.0,direction:AnimationDirection = .leftToRight) {
-
         reset()
-        
         self.duration = duration
         self.direction = direction
         lineView.alpha = 0.8

TSLiveWallpaper/Business/BusinessView/TYCycleImageComparisonView.swift

@@ -156,7 +156,7 @@ class TSCycleImageComparisonCell: TSBaseCollectionCell {
     }
     
     lazy var comparisonView: TSImageComparisonView = {
-        let comparisonView = TSImageComparisonView(frame: CGRect(x: 0, y: 300, width: 300, height: 400))
+        let comparisonView = TSImageComparisonView(frame: CGRect(x: 0, y: 0, width: 300, height: 400))
         comparisonView.configure(
             oldImage: UIImage(named: "old_photo"),
             newImage: UIImage(named: "new_photo")

TSLiveWallpaper/Business/TSAIListVC/TSAIAgeImageHintVC/TSAIListHintBaseVC.swift

@@ -128,7 +128,7 @@ class TSAIListHintBaseVC: TSBaseVC {
             return Config(imageMaxBitSize: kUploadImageMaxBit10Size,
                           goodImageNamed: "hint_Animated_good",
                           badImageNamed: "hint_Animated_bad",
-                          titleText: "Upload your photos".localized,
+                          titleText: "Upload Photo".localized,
                           titleSubText: "",
                           goodText: "Suitable".localized,
                           goodInfoText: "Good quality portrair color photos".localized,

TSLiveWallpaper/Business/TSAIListVC/TSAIExpandImageVC/TSAIExpandImageVC.swift

@@ -126,14 +126,10 @@ extension TSAIExpandImageVC {
     }
     
     func pickSinglePhoto()  {
-        pickSinglePhoto{ [weak self] image in
+        TSAIListVC.pickPhotoListView(target: self, style: .photoExpand) { [weak self] images in
             guard let self = self else { return }
-            upLoadImage = image
-            viewModel.upLoadImage = image
-            updateExpandArea()
-            
-            if upLoadImage == nil {
-                pop()
+            if let image = images.first {
+                upLoadImage = image
             }
         }
     }

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/TSAIListStyleMoreVC/TSAIListStyleMoreVC.swift

@@ -224,7 +224,7 @@ class TSAILIstStyleMoreAnimationGifCell: TSAILIstStyleMoreBaseCell,AnimatedImage
 
 class TSAILIstStyleMoreComparisonCell: TSAILIstStyleMoreBaseCell {
     lazy var comparisonView: TSImagesComparisonView = {
-        let comparisonView = TSImagesComparisonView(frame: CGRect(x: 0, y: 300, width: 300, height: 400))
+        let comparisonView = TSImagesComparisonView(frame: CGRect(x: 0, y: 0, width: 300, height: 400))
         comparisonView.isRunloop = true
         comparisonView.cornerRadius = 0
         return comparisonView

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/View/TSAILIstBannerCell.swift

@@ -255,7 +255,7 @@ class TSAILIstBannerImageCellCell: TSAILIstBannerBaseCellCell {
 
 class TSAILIstBannerComparisonCellCell: TSAILIstBannerBaseCellCell {
     lazy var comparisonView: TSImagesComparisonView = {
-        let comparisonView = TSImagesComparisonView(frame: CGRect(x: 0, y: 300, width: 300, height: 400))
+        let comparisonView = TSImagesComparisonView(frame: CGRect(x: 0, y: 0, width: 300, height: 400))
         comparisonView.isRunloop = true
         comparisonView.cornerRadius = 0
         return comparisonView

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoGeneratorVC/TSAIPhotoDetailsVC/TSAIPhotoDetailsVC+Video.swift

@@ -37,19 +37,19 @@ extension TSAIPhotoDetailsVC {
 //            make.height.equalTo(48)
 //            make.bottom.equalTo(-12-k_Height_safeAreaInsetsBottom())
 //        }
-        updateVipView()
+//        updateVipView()
     }
      
-    func clickUnlockVipBtn() {
-        TSPurchaseVC.show(target: self, closePageBlock: nil)
-    }
+//    func clickUnlockVipBtn() {
+//        TSPurchaseVC.show(target: self, closePageBlock: nil)
+//    }
     
-    @objc func updateVipView() {
-        let isVip = kPurchaseBusiness.isVip
-//        unlockVipBtn.isHidden = isVip
-//        videoBlurEffect.isHidden = isVip
-        shareBtn.isHidden = !isVip
-        saveBtn.isHidden = !isVip
-    }
+//    @objc func updateVipView() {
+//        let isVip = kPurchaseBusiness.isVip
+////        unlockVipBtn.isHidden = isVip
+////        videoBlurEffect.isHidden = isVip
+//        shareBtn.isHidden = !isVip
+//        saveBtn.isHidden = !isVip
+//    }
     
 }

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoGeneratorVC/TSAIPhotoDetailsVC/TSAIPhotoDetailsVC+View.swift

@@ -17,14 +17,14 @@ extension TSAIPhotoDetailsVC{
         return saveBtn
     }
     
-    func creatUnlockVipBtn() -> UIButton {
-        let saveBtn = kCreateNormalSubmitBtn(title: "Unlock Result".localized) { [weak self]  in
-            guard let self = self else { return }
-            clickUnlockVipBtn()
-        }
-        kSetBtnVipIcon(btn: saveBtn, show: true)
-        return saveBtn
-    }
+//    func creatUnlockVipBtn() -> UIButton {
+//        let saveBtn = kCreateNormalSubmitBtn(title: "Unlock Result".localized) { [weak self]  in
+//            guard let self = self else { return }
+//            clickUnlockVipBtn()
+//        }
+//        kSetBtnVipIcon(btn: saveBtn, show: true)
+//        return saveBtn
+//    }
     
     func creatShareBtn() -> TSVerticalButton {
         let shareBtn = TSVerticalButton()

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoGeneratorVC/TSAIPhotoDetailsVC/TSAIPhotoDetailsVC.swift

@@ -149,7 +149,7 @@ class TSAIPhotoDetailsVC: TSBaseVC {
     
     
     override func dealThings() {
-        NotificationCenter.default.addObserver(self, selector: #selector(updateVipView), name: .kPurchaseDidChanged, object: nil)
+//        NotificationCenter.default.addObserver(self, selector: #selector(updateVipView), name: .kPurchaseDidChanged, object: nil)
     }
 }
 

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIUploadPhotoVC.swift

@@ -240,9 +240,11 @@ extension TSAIUploadPhotoVC {
     }
     
     func pickSinglePhoto()  {
-        pickSinglePhoto{ [weak self] image in
+        TSAIListVC.pickPhotoListView(target: self, style: generatorStyle) { [weak self] images in
             guard let self = self else { return }
-            upLoadImage = image
+            if let image = images.first {
+                upLoadImage = image
+            }
         }
     }
 }

TSLiveWallpaper/Business/TSAIListVC/TSEffectPreviewPageVC/TSEffectPreviewPageVC.swift

@@ -56,7 +56,7 @@ class TSEffectPreviewPageItemVC: TSBaseVC {
 class TSEffectPreviewPageItemComparisonVC: TSEffectPreviewPageItemVC {
     
     lazy var comparisonView: TSImagesComparisonView = {
-        let comparisonView = TSImagesComparisonView(frame: CGRect(x: 0, y: 300, width: 300, height: 400))
+        let comparisonView = TSImagesComparisonView(frame: CGRect(x: 0, y: 0, width: k_ScreenWidth, height: k_ScreenHeight))
         comparisonView.isRunloop = true
         comparisonView.cornerRadius = 0
         return comparisonView

TSLiveWallpaper/Business/TSAIListVC/TSEffectPreviewPageVC/TSEffectPreviewVC.swift

@@ -29,14 +29,14 @@ class TSEffectPreviewVC: TSBaseVC {
             if index == browserPageVC.currentIndex {
                 return
             }
-            
+             
             browserPageVC.goToPage(at: index, animated: true)
         }
         return styleBarView
     }()
     
     lazy var submitBtn: UIButton = {
-        let submitBtn = kCreateNormalSubmitBtn(title: "Generate".localized) { [weak self]  in
+        let submitBtn = kCreateNormalSubmitBtn(title: "Process".localized) { [weak self]  in
             guard let self = self else { return }
             pushUploadPhotoVC()
         }

TSLiveWallpaper/Business/TSAIListVC/TSEffectPreviewPageVC/View/TSEffectPreviewStyleView.swift

@@ -53,7 +53,7 @@ class TSEffectPreviewStyleView : TSBaseView {
 extension TSEffectPreviewStyleView: UICollectionViewDataSource ,UICollectionViewDelegate {
     
     func getReuseIdentifier(itemModel:TSDiscoverItemModel) -> String{
-        if let animationModel = itemModel.viewModel as? TSDiscoverAnimationItemVM {
+//        if let animationModel = itemModel.viewModel as? TSDiscoverAnimationItemVM {
 //            if animationModel.style == .gif {
 //                return "TSAILIstStyleMoreAnimationGifCell"
 //            }else if animationModel.style == .comparison {
@@ -61,7 +61,7 @@ extension TSEffectPreviewStyleView: UICollectionViewDataSource ,UICollectionView
 //            }else if animationModel.style == .crossDissolve {
 //                return "TSAILIstStyleMoreCrossDissolveCell"
 //            }
-        }
+//        }
         return "TSEffectPreviewStyleViewImageCell"
     }
     

TSLiveWallpaper/Business/TSAIListVC/TSSelectedPhotoStyleVC/TSSelectedPhotoStyleVC.swift

@@ -134,7 +134,7 @@ class TSSelectedPhotoStyleCell: TSSimpleTableViewCell {
     }()
     
     lazy var leftLab: UILabel = {
-        return UILabel.createLabel(font: .font(name:.ZillaSlab,size: 14,weight: .bold),textColor: .white)
+        return UILabel.createLabel(font: .font(name:.ZillaSlab,size: 16,weight: .bold),textColor: .white)
     }()
 
     override var itemModel:TSBasicItemModel{

TSLiveWallpaper/Common/Purchase/TSPurchaseManager.swift

@@ -90,9 +90,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
         }

TSLiveWallpaper/Common/ViewTool/TSTextToastView.swift

@@ -115,7 +115,7 @@ open class TSTextToastView {
                 make.width.lessThanOrEqualTo(k_ScreenWidth-32)
                 make.height.equalTo(48)
                 make.centerX.equalToSuperview()
-                make.top.equalTo(k_Nav_Height + 10)
+                make.top.equalTo(k_Height_StatusBar + 20)
             }