【修复】1、压缩完成删除逻辑更新

2、充电流程更新
3、添加获取内购价格缓存

PhoneManager/Class/Session/Advertisement/View/AdvTipDeleteView.swift

@@ -332,14 +332,16 @@ class ImageCell: UICollectionViewCell {
 class CenteredGroupCollectionViewLayout: UICollectionViewFlowLayout {
     override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
         guard let attributes = super.layoutAttributesForElements(in: rect) else { return nil }
-        guard let collectionView = collectionView else { return attributes }
+        guard let collectionView = collectionView, !attributes.isEmpty else { return attributes }
 
         // 计算内容总宽度
         var contentWidth: CGFloat = 0
-        for attribute in attributes {
+        for (index, attribute) in attributes.enumerated() {
             contentWidth += attribute.frame.width
+            if index < attributes.count - 1 {
+                contentWidth += minimumInteritemSpacing
+            }
         }
-        contentWidth += minimumInteritemSpacing * CGFloat(attributes.count - 1)
         contentWidth += sectionInset.left + sectionInset.right
 
         // 计算偏移量
@@ -351,11 +353,19 @@ class CenteredGroupCollectionViewLayout: UICollectionViewFlowLayout {
 
         // 调整布局属性
         var runningOffset: CGFloat = offsetX + sectionInset.left
-        for attribute in attributes {
+        for (index, attribute) in attributes.enumerated() {
             attribute.frame.origin.x = runningOffset
-            runningOffset += attribute.frame.width + minimumInteritemSpacing
+            if index < attributes.count - 1 {
+                runningOffset += attribute.frame.width + minimumInteritemSpacing
+            } else {
+                runningOffset += attribute.frame.width
+            }
         }
 
         return attributes
     }
-}
+
+    override func shouldInvalidateLayout(forBoundsChange newBounds: CGRect) -> Bool {
+        return true
+    }
+}  

PhoneManager/Class/Session/Compress/Controller/CompressCompletedViewController.swift

@@ -296,28 +296,32 @@ class CompressCompletedViewController : BaseViewController{
         }
         
         // 删除文件逻辑【系统自动提示是否删除】
-        var count = 0
-        for data in self.model! {
-            let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [data.ident], options: nil)
-            let fileSize = FileTool().calculateTotalAssetSize(fetchResult: fetchResult)
-            let assetToDelete = fetchResult.firstObject
-            PHPhotoLibrary.shared().performChanges ({
-                PHAssetChangeRequest.deleteAssets([assetToDelete] as NSFastEnumeration)
-            }){ success, error in
-                if(success){
-                    self.updateCompressData(flag: data.ident)
-                    let deleteModel = AssetModel(localIdentifier: data.ident, assetSize: data.orgSize, createDate: data.createDate)
-                    PhotoDataManager.manager.removeDataWhenDeleteInPage(data: [deleteModel])
-                    print("删除文件成功")
-                    self.showDeleteSuccess(fileCount:1, fileSize: fileSize)
-                }else {
-                    if let error = error {
-                        print("删除文件时出错: \(error.localizedDescription)")
-                    }
+        var idents :[String] = []
+        for ele in self.model! {
+            idents.append(ele.ident)
+        }
+        let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: idents, options: nil)
+        let fileSize = FileTool().calculateTotalAssetSize(fetchResult: fetchResult)
+        let assetToDelete = fetchResult.firstObject
+        PHPhotoLibrary.shared().performChanges ({
+            PHAssetChangeRequest.deleteAssets([assetToDelete] as NSFastEnumeration)
+        }){ success, error in
+            if(success){
+                var models :[AssetModel] = []
+                var count = 0
+                for ele in self.model! {
+                    count = count + 1
+                    self.updateCompressData(flag: ele.ident)
+                    let deleteModel = AssetModel(localIdentifier: ele.ident, assetSize: ele.orgSize, createDate: ele.createDate)
+                    models.append(deleteModel)
                 }
-                count = count + 1
-                if count ==  self.model?.count{
-                    self.jumpToCompressVC()
+                PhotoDataManager.manager.removeDataWhenDeleteInPage(data: models)
+                print("删除文件成功")
+                self.showDeleteSuccess(fileCount:count, fileSize: fileSize)
+                self.jumpToCompressVC()
+            }else {
+                if let error = error {
+                    print("删除文件时出错: \(error.localizedDescription)")
                 }
             }
         }

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

@@ -94,8 +94,6 @@ class HomeViewController:BaseViewController {
         // 调用下追踪权限
         checkTrackingAuthorization()
         
-        NotificationManager().configNotifications()
-        
         
         let dataUpdated = Notification.Name("DataUpdatedNotification")
         NotificationCenter.default.addObserver(self, selector: #selector(handleDataUpdated(_:)), name: dataUpdated, object: nil)
@@ -128,11 +126,7 @@ class HomeViewController:BaseViewController {
         let homeSimilarImageResourceUpdate = Notification.Name("HomeSimilarImageResourceUpdate")
         NotificationCenter.default.addObserver(self, selector: #selector(handleHomeSimilarImageResourceUpdate(_:)), name: homeSimilarImageResourceUpdate, object: nil)
         
-        
-//        // 充电通知
-//        let applicationDidBecomeActive = Notification.Name("applicationDidBecomeActive")
-//        NotificationCenter.default.addObserver(self, selector: #selector(handleApplicationDidBecomeActive(_:)), name: applicationDidBecomeActive, object: nil)
-//        
+    
         
         homeView = HomeView(frame: view.bounds)
         
@@ -200,12 +194,8 @@ class HomeViewController:BaseViewController {
                     self.junmToModule(cIndex, self)
                 }
             }
-            
-            
         }
-        
         view.addSubview(homeView!)
-        
     }
     
     func setupData() {
@@ -240,13 +230,9 @@ class HomeViewController:BaseViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        // 可能是删除数据，重新获取下
-        PhotoDataManager.manager.loadFromFileSystem(resultModel: {[weak self] model in
-            DispatchQueue.main.async {
-                self?.homeView?.model = model
-                self?.reloadCollectionView()
-            }
-        })
+        
+        // 获取主页数据
+        setupData()
         
         if !isShowCharge {
             if BatteryMonitorManager.shared.getBatteryIsCharging() {
@@ -303,15 +289,11 @@ class HomeViewController:BaseViewController {
         }
         
         if !isShowPay {
-            
-            // 获取主页数据
-            setupData()
-            
             isShowPay = true
-            
-            
             if HomePayModel.share.isNoAd == false {
-                HomePayViewController.show {}
+                HomePayViewController.show {
+                    NotificationManager().configNotifications()
+                }
             }
         }
         

PhoneManager/Class/Session/Pay/Model/HomePayModel.swift

@@ -13,6 +13,9 @@ class HomePayModel: NSObject ,SKProductsRequestDelegate ,SKPaymentTransactionObs
     
     static let share:HomePayModel = HomePayModel()
     
+    private let userDefaults = UserDefaults.standard
+    private let productCacheKey = "IAPProductCache"
+    
     enum PayState {
     case Subscribe   // 订阅
     case NonConsum   // 非消耗型
@@ -82,12 +85,78 @@ class HomePayModel: NSObject ,SKProductsRequestDelegate ,SKPaymentTransactionObs
         }
     }
     
+    func cacheProducts(_ products: [SKProduct]) {
+        var productCache = [[String: Any]]()
+        for product in products {
+            let productInfo: [String: Any] = [
+                "productIdentifier": product.productIdentifier,
+                "localizedTitle": product.localizedTitle,
+                "localizedDescription": product.localizedDescription,
+                "price": product.price.doubleValue,
+                "priceLocale": product.priceLocale.identifier
+            ]
+            productCache.append(productInfo)
+        }
+        userDefaults.set(productCache, forKey: productCacheKey)
+    }
+    
+    func getCachedProduct(forIdentifier identifier: [String]) -> [SKProduct]? {
+        var products: [SKProduct] = []
+        // 从 UserDefaults 中获取缓存数据
+        if let productCache = userDefaults.object(forKey: productCacheKey) as? [[String: Any]] {
+            for item in productCache {
+                // 从字典中提取价格和价格区域设置信息
+                let price = NSDecimalNumber(value: item["price"] as? Double ?? 0)
+                let priceLocaleIdentifier = item["priceLocale"] as? String ?? ""
+                let priceLocale = Locale(identifier: priceLocaleIdentifier)
+                // 创建 SKProduct 实例
+                let mockProduct = SKProduct()
+                // 设置商品标识符
+                if let firstIdentifier = identifier.first {
+                    mockProduct.setValue(firstIdentifier, forKey: "productIdentifier")
+                }
+                // 设置商品本地化标题
+                mockProduct.setValue(item["localizedTitle"] as? String, forKey: "localizedTitle")
+                // 设置商品本地化描述
+                mockProduct.setValue(item["localizedDescription"] as? String, forKey: "localizedDescription")
+                // 设置商品价格
+                mockProduct.setValue(price, forKey: "price")
+                // 设置商品价格的区域设置
+                mockProduct.setValue(priceLocale, forKey: "priceLocale")
+                // 将商品添加到结果数组中
+                products.append(mockProduct)
+            }
+        }
+        return products
+    }
+    
     func fetchProducts()  {
+        Print("获取商品信息")
+        // 看缓存里面有没有 有的话直接返回
+        if let cachedProduct = self.getCachedProduct(forIdentifier: productIdentifiers) {
+            var ps:[SKProduct?] = [nil,nil]
+            if cachedProduct.count >= 2 {
+                if cachedProduct.first?.productIdentifier == productIdentifiers.first {
+                    ps[0] = cachedProduct.first
+                    ps[1] = cachedProduct.last
+                }else{
+                    ps[1] = cachedProduct.first
+                    ps[0] = cachedProduct.last
+                }
+            }else{
+                ps = cachedProduct
+            }
+            self.product = ps
+            self.storeCall(ps)
+            Print("获取商品信息成功--读取缓存数据")
+        }
+        
+        // 后续重新获取价格缓存
         BackgroundTaskManager.share.startTask()
         let request = SKProductsRequest(productIdentifiers: Set(productIdentifiers))
         request.delegate = self
         request.start()
-        Print("获取商品信息")
+        
         DispatchQueue.global().asyncAfter(deadline: .now() + 15) {
             request.cancel()
             BackgroundTaskManager.share.endTask()
@@ -112,10 +181,17 @@ class HomePayModel: NSObject ,SKProductsRequestDelegate ,SKPaymentTransactionObs
             ps = products
         }
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2, execute: {
-            self.product = ps
             Print("获取商品信息成功")
+            if self.getCachedProduct(forIdentifier: self.productIdentifiers)?.count == 0 {
+                Print("获取商品信息成功--缓存没有数据由请求提供")
+                self.product = ps
+                self.storeCall(ps)
+            }
+            Print("开始缓存商品信息")
+            self.cacheProducts(products)
+            Print("缓存商品信息成功")
             BackgroundTaskManager.share.endTask()
-            self.storeCall(ps)
+           
         })
     }
 

PhoneManager/Class/Session/Pay/ViewController/HomePayViewController.swift

@@ -113,8 +113,6 @@ extension HomePayViewController {
               let p2 = currentProduct?.last
         else { return }
         homePayView?.reloadSKPorduct(product: p1, product1: p2)
-//        homePayView?.product = p1
-//        homePayView?.product1 = p2
     }
     
     private func storeKeD() -> Void {