修改

PhoneManager/AppDelegate.swift

@@ -32,37 +32,39 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let storage = WidgetPublicModel.UseDiskSpace() * 100
         widgetAppgourp.share.PushWidgetData(battery: Int(battery), storage: Int(storage))
         
+        // 首页缓存
         findHomeData()
         
+        // 获取价格
+        HomePayModel.share.fetchProducts()
+        
         return true
     }
     
     func findHomeData(){
         PhotoAndVideoMananger.getPrivacy {[weak self] status in
-            
             guard let self else {return}
-            
             if let photoStatus = status as? PrivacyType {
-                
                 switch photoStatus {
-                    
                 case .authorized:
                     PhotoAndVideoMananger.mananger.setAssets()
                     readCacheModel()
                     break
                 case .denied:
+                    PhotoDataManager.manager.loadDataFromPhotos { model in}
                     Print("未获取授权")
                     break
                 case .restricted:
+                    PhotoDataManager.manager.loadDataFromPhotos { model in}
                     Print("未获取授权")
                     break
                 case .notDetermined:
+                    PhotoDataManager.manager.loadDataFromPhotos { model in}
                     Print("未获取授权")
                     break
                 }
             }
         }
-        
     }
     
 
@@ -264,10 +266,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             case .WIFI,.WWAN:
                 
                 if (PhotoAndVideoMananger.mananger.allAssets.count == 0) {
-                    
                     PhotoAndVideoMananger.mananger.setAssets()
                 }
-                
             }
         }
         

PhoneManager/Class/Session/Charge/Controller/ChargeGuideStartController.swift

@@ -96,12 +96,12 @@ class ChargeGuideStartController : BaseViewController {
         self.startButton.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(15)
             make.right.equalToSuperview().offset(-15)
-            make.bottom.equalToSuperview().offset(-68)
+            make.top.equalTo(self.chargeView.snp.bottom)
             make.height.equalTo(50)
         }
         
         self.chargeView.snp.makeConstraints { make in
-            make.bottom.equalTo(self.startButton.snp.top)
+            make.top.equalTo(self.detailTipTitleLabel.snp.bottom).offset(42)
             make.height.equalTo(476)
             make.left.equalToSuperview().offset(27)
             make.right.equalToSuperview().offset(-26)

PhoneManager/Class/Session/Charge/View/ChargeGuideEndView.swift

@@ -88,7 +88,7 @@ class ChargeGuideEndView : UIView{
         self.startButton.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(15)
             make.right.equalToSuperview().offset(-15)
-            make.bottom.equalToSuperview().offset(-168)
+            make.top.equalTo(self.chargeView.snp.bottom).offset(66)
             make.height.equalTo(50)
         }
         

PhoneManager/Class/Session/Charge/View/ChargeInfoSettingView.swift

@@ -61,7 +61,22 @@ class ChargeInfoSettingView:UIView {
         // 2 秒后关闭弹窗
         DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
             alert.dismiss(animated: true, completion: nil)
-            self.responderViewController()?.navigationController?.popViewController(animated: true)
+            
+            // 是否是第一次进入
+            let chargeGuideFinished = UserDefaults.standard.object(forKey: "ChargeGuideFinished")
+            if chargeGuideFinished == nil {
+                let vc : ChargeGuideStartController = ChargeGuideStartController()
+                vc.modalPresentationStyle = .fullScreen
+                self.responderViewController()?.present(vc, animated: true)
+                vc.callback = {[weak self] text in
+                    guard let self else {return}
+                    let vc : ChargeGuideController = ChargeGuideController()
+                    self.responderViewController()?.navigationController?.pushViewController(vc, animated: true)
+                }
+                UserDefaults.standard.set("ChargeGuideFinished", forKey: "ChargeGuideFinished")
+            }else{
+                self.responderViewController()?.navigationController?.popViewController(animated: true)
+            }
         }
     }
     

PhoneManager/Class/Session/Charge/View/ChargeVideoPlayingView.swift

@@ -64,7 +64,7 @@ class ChargeVideoPlayingView: UIView {
                 if let status = player?.status {
                     switch status {
                     case .readyToPlay:
-                        print("视频准备好播放")
+                        break
                     case .failed:
                         if let error = player?.error {
                             print("视频播放失败: \(error.localizedDescription)")

PhoneManager/Class/Session/Home/Controller/HomeViewController.swift

@@ -191,7 +191,12 @@ class HomeViewController:BaseViewController {
         PhotoDataManager.manager.loadFromFileSystem(resultModel: {[weak self] model in
             DispatchQueue.main.async {
                 self?.homeView?.model = model
-                self?.homeView?.collectionView.reloadData()
+                if let collectionView = self?.homeView?.collectionView {
+                    UIView.transition(with: collectionView, duration: 0.3, options: .transitionCrossDissolve, animations: {
+                        collectionView.reloadData()
+                    }, completion: nil)
+                }
+               
             }
         })
     }
@@ -225,10 +230,6 @@ class HomeViewController:BaseViewController {
             }else {
                 if HomePayModel.share.isNoAd == false {
                     HomePayViewController.show {}
-                }else{
-                    let vc : PayCompletedViewController =  PayCompletedViewController()
-                    vc.modalPresentationStyle = .fullScreen
-                    self.present(vc, animated: true)
                 }
             }
         }

PhoneManager/Class/Session/Home/View/Model/HomePhotosModel .swift

@@ -134,28 +134,18 @@ class PhotoDataManager {
     
     
     // 先存一下数据
-    public func loadDataFromPhotos(resultModel:@escaping (_ model:PhotosManagerModel) -> () = {mdoel in}) {
-        
-        PhotoAndVideoMananger.mananger.setAssets()
-        
-        let model1:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.duplicates.rawValue, allFileSize: 0, assets: [])
-        
-        let model2:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.similar.rawValue, allFileSize: 0, assets: [])
-        
-        let model3:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.videos.rawValue, allFileSize: 0, assets: [])
-        
-        let model4:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.similarScreenshots.rawValue, allFileSize: 0, assets: [])
-        
-        let model5:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.screenshots.rawValue, allFileSize: 0, assets: [])
-        
-        let model6:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.SimilarVideos.rawValue, allFileSize: 0, assets: [])
-        
-        let model7:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.Other.rawValue, allFileSize: 0, assets: [])
-        
-        let allModel:PhotosManagerModel = PhotosManagerModel(allFileNumber: 0, allFileSize: 0, titleModelArray: [model1,model2], otherModelArray:  [model3,model4,model5,model6,model7])
-        
-        PhotoDataManager.manager.saveToFileSystem(model: allModel)
-        
+    
+    ///  加载缓存数据
+    /// - Parameters:
+    ///   - model1: 重复图片
+    ///   - allModel: 所有数据集合
+    ///   - model2: 相似图片
+    ///   - model3: 视频
+    ///   - model4: 相似截图
+    ///   - model5: 截图
+    ///   - model6: 相似视频
+    ///   - model7: 照片
+    fileprivate func saveFirstModel(_ model1: HomePhotosModel, _ allModel: PhotosManagerModel, _ model2: HomePhotosModel, _ model3: HomePhotosModel, _ model4: HomePhotosModel, _ model5: HomePhotosModel, _ model6: HomePhotosModel, _ model7: HomePhotosModel) {
         Print("正在处理重复图片")
         PhotoAndVideoMananger.mananger.groupDuplicateImages(assets: PhotoAndVideoMananger.mananger.allAssets) { similarGroups in
             
@@ -177,7 +167,7 @@ class PhotoDataManager {
             Print("处理重复图片结束")
         }
         
-       
+        
         Print("正在处理相似图片")
         PhotoAndVideoMananger.mananger.groupSimilarImages(assets: PhotoAndVideoMananger.mananger.allAssets) { (similarGroups) in
             
@@ -287,6 +277,56 @@ class PhotoDataManager {
             })
         }
     }
+    
+    public func loadDataFromPhotos(resultModel:@escaping (_ model:PhotosManagerModel) -> () = {mdoel in}) {
+        
+        
+        
+        let model1:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.duplicates.rawValue, allFileSize: 0, assets: [])
+        
+        let model2:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.similar.rawValue, allFileSize: 0, assets: [])
+        
+        let model3:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.videos.rawValue, allFileSize: 0, assets: [])
+        
+        let model4:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.similarScreenshots.rawValue, allFileSize: 0, assets: [])
+        
+        let model5:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.screenshots.rawValue, allFileSize: 0, assets: [])
+        
+        let model6:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.SimilarVideos.rawValue, allFileSize: 0, assets: [])
+        
+        let model7:HomePhotosModel = HomePhotosModel(folderName: PhotsFileType.Other.rawValue, allFileSize: 0, assets: [])
+        
+        let allModel:PhotosManagerModel = PhotosManagerModel(allFileNumber: 0, allFileSize: 0, titleModelArray: [model1,model2], otherModelArray:  [model3,model4,model5,model6,model7])
+        
+        PhotoDataManager.manager.saveToFileSystem(model: allModel)
+        
+       
+        
+        // 如果没有权限就不再请求了
+        PhotoAndVideoMananger.getPrivacy {[weak self] status in
+            guard let self else {return}
+            if let photoStatus = status as? PrivacyType {
+                switch photoStatus {
+                case .authorized:
+                    // 如果权限允许才开始
+                    PhotoAndVideoMananger.mananger.setAssets()
+                    saveFirstModel(model1, allModel, model2, model3, model4, model5, model6, model7)
+                    break
+                case .denied:
+                    Print("未获取授权")
+                    break
+                case .restricted:
+                    Print("未获取授权")
+                    break
+                case .notDetermined:
+                    Print("未获取授权")
+                    break
+                }
+            }
+        }
+        
+        
+    }
 }
 
 class PhotosManagerModel:Codable {

PhoneManager/Class/Session/NoAds/HomeNoAdsViewController.swift

@@ -132,6 +132,7 @@ class HomeNoAdsViewController: UIViewController, NoAdsStackDataSource {
     
     private lazy var yearNorBtn: PMButton = {
         let btn = PMButton(type: .custom)
+        btn.buttonStyleType = .ButtonStyleTypeDiamond
         btn.backgroundColor = .colorWithHex(hexStr: "#F2F6FC")
         btn.setTitles(["3 days free trial",""])
         btn.addTarget(self, action: #selector(TheFrial), for: .touchUpInside)

PhoneManager/Class/Tool/Class/BatteryMonitorManager/BatteryMonitorManager.swift

@@ -59,7 +59,6 @@ class BatteryMonitorManager {
         )
         
         isMonitoring = true
-        print("Battery monitoring started")
     }
     
     /// Stop monitoring battery status

PhoneManager/Class/Tool/Common/PMButton.swift

@@ -7,6 +7,11 @@
 
 import UIKit
 
+enum ButtonStyleType {
+    case ButtonStyleTypeDiamond
+    case ButtonStyleTypeNormal
+}
+
 class PMButton: UIButton {
 
     override init(frame: CGRect) {
@@ -31,6 +36,8 @@ class PMButton: UIButton {
     
     var labels : [UILabel] = []
     
+    var buttonStyleType : ButtonStyleType = .ButtonStyleTypeNormal
+    
     func setTitles(_ titles: [String] ) {
         if labels.count == titles.count {
             for i in 0..<titles.count {
@@ -46,8 +53,14 @@ class PMButton: UIButton {
             t.font = UIFont.boldSystemFont(ofSize: 16)
             self.addSubview(t)
             t.snp.makeConstraints { make in
-                make.left.equalToSuperview().offset(10)
-                make.bottom.equalTo(self.snp.centerY).offset(-2)
+                if buttonStyleType == .ButtonStyleTypeNormal{
+                    make.centerY.equalToSuperview()
+                    make.left.equalToSuperview().offset(10)
+                }else {
+                    make.left.equalToSuperview().offset(10)
+                    make.bottom.equalTo(self.snp.centerY).offset(-2)
+                }
+               
             }
             let b = UILabel()
             b.text = titles[1]
@@ -55,8 +68,13 @@ class PMButton: UIButton {
             b.font = UIFont.boldSystemFont(ofSize: 12)
             addSubview(b)
             b.snp.makeConstraints { make in
-                make.left.equalToSuperview().offset(10)
-                make.top.equalTo(self.snp.centerY)
+                if buttonStyleType == .ButtonStyleTypeNormal{
+                    make.centerY.equalToSuperview()
+                    make.right.equalToSuperview().offset(-10)
+                }else {
+                    make.left.equalToSuperview().offset(10)
+                    make.top.equalTo(self.snp.centerY)
+                }
             }
             labels.append(t)
             labels.append(b)