3.6.13(2)提测

TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1465,7 +1465,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;
@@ -1506,7 +1506,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/Business/TSAIListVC/TSAIListVC/TSAIListVC.swift

@@ -11,39 +11,34 @@ class TSAIListVC: TSBaseVC {
     lazy var viewModel:TSAIListDataVM = TSAIListDataVM.shared
     
     //###################################### 导航栏 view ######################################
-    lazy var vipBtn: UIButton = {
-        let vipBtn = UIButton.createButton(image: UIImage(named: "nav_vip"),backgroundColor: "#010101".uiColor.withAlphaComponent(0.4),corner: 12) { [weak self] in
-            guard let self = self else { return }
-            TSPurchaseVC.show(target: self) {}
-        }
-        return vipBtn
-    }()
-    
-    lazy var navBarView: TSBaseNavContentBarView = {
-        let navBarView = TSBaseNavContentBarView()
-
-        let label = UILabel.createLabel(text: "Home".localized,font: .font(name: .Pacifico, size: 24))
-        label.textColor = .themeColor
-        label.addShadow(shadowColor: UIColor.black.cgColor, shadowOffset: CGSize(width: 2, height: 2), shadowRadius: 2, shadowOpacity: 0.3)
-        navBarView.barView.addSubview(label)
-        label.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.leading.equalTo(16)
-        }
-        
-        navBarView.barView.addSubview(vipBtn)
-        vipBtn.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
-            make.trailing.equalTo(-16)
-            make.width.height.equalTo(32)
-        }
-        
-//        kMainAsync {
-//            label.applyGradient(colors: ["#F1D3AB".uiColor,"#E4A858".uiColor])
+//    lazy var vipBtn: UIButton = {
+//        let vipBtn = UIButton.createButton(image: UIImage(named: "nav_vip"),backgroundColor: "#010101".uiColor.withAlphaComponent(0.4),corner: 12) { [weak self] in
+//            guard let self = self else { return }
+//            TSPurchaseVC.show(target: self) {}
 //        }
-
-       return navBarView
-    }()
+//        return vipBtn
+//    }()
+//    
+//    lazy var navBarView: TSBaseNavContentBarView = {
+//        let navBarView = TSBaseNavContentBarView()
+//
+//        let label = UILabel.createLabel(text: "Home".localized,font: .font(name: .Pacifico, size: 24))
+//        label.textColor = .themeColor
+//        label.addShadow(shadowColor: UIColor.black.cgColor, shadowOffset: CGSize(width: 2, height: 2), shadowRadius: 2, shadowOpacity: 0.3)
+//        navBarView.barView.addSubview(label)
+//        label.snp.makeConstraints { make in
+//            make.centerY.equalToSuperview()
+//            make.leading.equalTo(16)
+//        }
+//        
+//        navBarView.barView.addSubview(vipBtn)
+//        vipBtn.snp.makeConstraints { make in
+//            make.centerY.equalToSuperview()
+//            make.trailing.equalTo(-16)
+//            make.width.height.equalTo(32)
+//        }
+//       return navBarView
+//    }()
     
     //###################################### 导航栏 ######################################
     lazy var layout: UICollectionViewFlowLayout = {
@@ -67,10 +62,10 @@ class TSAIListVC: TSBaseVC {
 
     override func createView() {
         
-        navBarContentView.addSubview(navBarView)
-        navBarView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
-        }
+//        navBarContentView.addSubview(navBarView)
+//        navBarView.snp.makeConstraints { make in
+//            make.edges.equalToSuperview()
+//        }
         
         contentView.snp.updateConstraints { make in
             make.top.equalTo(0)
@@ -83,8 +78,8 @@ class TSAIListVC: TSBaseVC {
     }
     
     override func dealThings() {
-        NotificationCenter.default.addObserver(self, selector: #selector(updateVipView), name: .kPurchaseDidChanged, object: nil)
-        updateVipView()
+//        NotificationCenter.default.addObserver(self, selector: #selector(updateVipView), name: .kPurchaseDidChanged, object: nil)
+//        updateVipView()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -93,23 +88,23 @@ class TSAIListVC: TSBaseVC {
     override func viewWillDisappear(_ animated: Bool) {
         
     }
-    
-    @objc func updateVipView() {
-        kMainAsync{
-            self.vipBtn.isHidden = PurchaseManager.default.isVip
-        }
-    }
+   
+//    @objc func updateVipView() {
+//        kMainAsync{
+//            self.vipBtn.isHidden = PurchaseManager.default.isVip
+//        }
+//    }
 }
 
-extension TSAIListVC: UIScrollViewDelegate {
-    // 开始拖拽（用户开始滚动）
-    func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        let height:CGFloat = 280-k_Nav_Height
-        let alpha = scrollView.contentOffset.y/height
-        navBarView.backgroundColor = .mainBg.withAlphaComponent(alpha)
-//        navBarView.backgroundColor = scrollView.contentOffset.y >= height ? .mainBg : .clear
-    }
-}
+//extension TSAIListVC: UIScrollViewDelegate {
+//    // 开始拖拽（用户开始滚动）
+//    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+//        let height:CGFloat = 280-k_Nav_Height
+//        let alpha = scrollView.contentOffset.y/height
+//        navBarView.backgroundColor = .mainBg.withAlphaComponent(alpha)
+////        navBarView.backgroundColor = scrollView.contentOffset.y >= height ? .mainBg : .clear
+//    }
+//}
 
 extension TSAIListVC: UICollectionViewDataSource ,UICollectionViewDelegate,UICollectionViewDelegateFlowLayout{
     

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

@@ -34,7 +34,7 @@ class TSAILIstBannerCell: TSAILIstBaseCell {
         pageControl.currentPageIndicatorTintColor = .white
         pageControl.pageIndicatorTintColor = .white.withAlphaComponent(0.5)
         pageControl.pageIndicatorSpaing = 8
-        pageControl.contentHorizontalAlignment = .right
+        pageControl.contentHorizontalAlignment = .center
         return pageControl
     }()
     
@@ -54,9 +54,9 @@ class TSAILIstBannerCell: TSAILIstBaseCell {
 
         pagerView.addSubview(pageControl)
         pageControl.snp.makeConstraints { make in
-            make.bottom.equalTo(-24)
-            make.leading.equalTo(6)
-            make.trailing.equalTo(-16)
+            make.bottom.equalTo(-8)
+            make.leading.equalTo(0)
+            make.trailing.equalTo(0)
             make.height.equalTo(1)
         }
         

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIUploadPhotoVC+Style.swift

@@ -37,16 +37,22 @@ extension TSAIUploadPhotoVC {
             make.width.equalTo(k_ScreenWidth)
             make.height.equalTo(uploadImageViewMaxHeight)
         }
-        
         cusStackView.addSpacing(length: 14)
+        cusStackView.addSubviewToStack(self.styleBarView)
+        
+        kMainAsync {
+            self.setUpMoreStyleBarData(styleModels: styleModels)
+        }
+    }
+    
+    func setUpMoreStyleBarData(styleModels:[TSGenerateModel]){
+        
         self.styleBarView.modelArray = styleModels
         self.styleBarView.selectedIndex = styleModels.firstIndex(where: {$0.imageText == generateModel!.imageText}) ?? 0
         self.generateModel = styleModels.safeObj(At: self.styleBarView.selectedIndex)
-        cusStackView.addSubviewToStack(self.styleBarView)
         
         if let generateModel = self.generateModel {
             setTitleText(generateModel.imageText.localized)
         }
-
     }
 }

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIUploadPhotoVC+VideoStyle.swift

@@ -41,13 +41,16 @@ extension TSAIUploadPhotoVC {
         cusStackView.addSpacing(length: 12)
         cusStackView.addSubviewToStack(self.videoStyleBarView)
         
-        self.setUpVideoStyleBarData(discoverItemModels: discoverItemModels)
+        kMainAsync {
+            self.setUpVideoStyleBarData(discoverItemModels: discoverItemModels)
+        }
+
     }
   
     func setUpVideoStyleBarData(discoverItemModels:[TSDiscoverItemModel]){
         self.videoStyleBarView.modelArray = discoverItemModels
         self.videoStyleBarView.selectedIndex = discoverItemModels.firstIndex(where: {$0.generateModel?.imageText == generateModel?.imageText}) ?? 0
-        self.generateModel = discoverItemModels.safeObj(At: self.styleBarView.selectedIndex)?.generateModel
+        self.generateModel = discoverItemModels.safeObj(At: self.videoStyleBarView.selectedIndex)?.generateModel
  
         if let generateModel = self.generateModel {
             setTitleText(generateModel.imageText.localized)

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/View/TSAIUploadPhotoVideoStyleView.swift

@@ -66,7 +66,7 @@ extension TSAIUploadPhotoVideoStyleView: UICollectionViewDataSource ,UICollectio
 }
 
 import Kingfisher
-class TSAIUploadPhotoVideoStyleViewCell: TSBaseCollectionCell,AnimatedImageViewDelegate {
+class TSAIUploadPhotoVideoStyleViewCell: TSBaseCollectionCell {
     var model:TSDiscoverItemModel? {
         didSet {
             guard let model = model else { return }
@@ -77,11 +77,7 @@ class TSAIUploadPhotoVideoStyleViewCell: TSBaseCollectionCell,AnimatedImageViewD
                     animatedImageView.kf.setImage(with: gifURL, options: [.cacheOriginalImage]){ result in
                         switch result {
                         case .success(_):
-                            kMainAfter(1.0) {
-                                self.animatedImageView.addRealisticFlashEffect {
-                                    self.animatedImageView.startAnimating()
-                                }
-                            }
+                            self.animatedImageView.startAnimating()
                         case .failure(let error):
                             print("GIF 加载失败: \(error.localizedDescription)")
                         }
@@ -94,25 +90,41 @@ class TSAIUploadPhotoVideoStyleViewCell: TSBaseCollectionCell,AnimatedImageViewD
     override var isSelected: Bool{
         didSet{
             textLabel.textColor = isSelected ? .themeColor : .white
-            animatedImageView.layer.borderColor = isSelected ? UIColor.themeColor.cgColor : UIColor.clear.cgColor
+            selectedView.isHidden = !isSelected
         }
     }
 
     lazy var animatedImageView: AnimatedImageView = {
         let animatedImageView = AnimatedImageView()
         animatedImageView.autoPlayAnimatedImage = false
-        animatedImageView.repeatCount = .once
-        animatedImageView.delegate = self
+        animatedImageView.repeatCount = .infinite
         animatedImageView.contentMode = .scaleAspectFill
         animatedImageView.clipsToBounds = true
-        animatedImageView.layer.borderWidth = 1.0
         return animatedImageView
     }()
     
     lazy var textLabel: UILabel = {
-        let textLabel = UILabel.createLabel(font: .font(size: 10),textColor: .white,textAlignment: .center)
+        let textLabel = UILabel.createLabel(font: .font(size: 11),textColor: .white,textAlignment: .center)
         return textLabel
     }()
+    
+    
+    lazy var selectedView: UIView = {
+        let selectedView = UIView()
+        selectedView.backgroundColor = .black.withAlphaComponent(0.6)
+        selectedView.layer.borderWidth = 1.0
+        selectedView.layer.borderColor = UIColor.themeColor.cgColor
+        
+        let imageView = UIImageView.createImageView(imageName:"check_color")
+        selectedView.addSubview(imageView)
+        
+        imageView.snp.makeConstraints { make in
+            make.width.height.equalTo(24)
+            make.center.equalToSuperview()
+        }
+        selectedView.isHidden = true
+        return selectedView
+    }()
 
 
     override func creatUI() {
@@ -123,6 +135,11 @@ class TSAIUploadPhotoVideoStyleViewCell: TSBaseCollectionCell,AnimatedImageViewD
             make.centerX.equalToSuperview()
         }
         
+        animatedImageView.addSubview(selectedView)
+        selectedView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
         bgContentView.addSubview(textLabel)
         textLabel.snp.makeConstraints { make in
             make.top.equalTo(animatedImageView.snp.bottom).offset(2)
@@ -130,10 +147,9 @@ class TSAIUploadPhotoVideoStyleViewCell: TSBaseCollectionCell,AnimatedImageViewD
             make.leading.equalTo(4)
             make.trailing.equalTo(-4)
         }
-    }
-    
-    func animatedImageViewDidFinishAnimating(_ imageView: AnimatedImageView){
-        let model = self.model
-        self.model = model
+        
+        
+        
+        
     }
 }

TSLiveWallpaper/Common/ViewTool/TSPhotoPickerManager/TSPhotoPickerManager.swift

@@ -149,7 +149,7 @@ class TSPhotoPickerManager: NSObject{
                 customCameraConfig.editor.cropSize.aspectRatios = aspectRatios
                 customCameraConfig.languageType = LanguageManager.shared.currentLanguage.languageType
                 customCameraConfig.customLanguages = [CustomLanguage(language: "it", bundle: Bundle(path: Bundle.main.path(forResource: "it", ofType: "lproj")!)!)]
-
+                customCameraConfig.modalPresentationStyle = .overFullScreen
                 let cameraController = CameraController(config: customCameraConfig, type: .photo,delegate: self)
                 viewController?.present(cameraController, animated: true, completion: nil)
                 self.cameraController = cameraController