【优化】当用户已经是会员时删除图片逻辑

PhoneManager/Class/Session/Compress/Cell/CompressSelectCell.swift

@@ -20,6 +20,7 @@ class CompressSelectCell : UICollectionViewCell {
         didSet{
             guard let model = self.model else {return}
             self.backImageView.image = UIImage()
+            
             let viewModel = CompressViewModel()
             viewModel.getImageFromAssetIdentifier(identifier: model.ident) {[weak self] image in
                 guard let self else { return}

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

@@ -306,15 +306,15 @@ class CompressCompletedViewController : BaseViewController{
         PHPhotoLibrary.shared().performChanges ({
             PHAssetChangeRequest.deleteAssets([assetToDelete] as NSFastEnumeration)
         }){ success, error in
+            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)
+            }
             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)
-                }
                 PhotoDataManager.manager.removeDataWhenDeleteInPage(data: models)
                 print("删除文件成功")
                 self.showDeleteSuccess(fileCount:count, fileSize: fileSize)
@@ -322,7 +322,7 @@ class CompressCompletedViewController : BaseViewController{
                 if let error = error {
                     print("删除文件时出错: \(error.localizedDescription)")
                 }
-                self.jumpToCompressVC()
+                self.showDeleteSuccess(fileCount:count, fileSize: fileSize)
             }
             
         }

PhoneManager/Class/Session/Compress/ViewModel/CompressViewModel.swift

@@ -119,7 +119,6 @@ class CompressViewModel{
                     }
                     
                 }
-                
             }
         }
     }

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

@@ -115,7 +115,6 @@ class HomeInfoViewController:BaseViewController {
                             UserDefaults.standard.set(times, forKey: "saveAdvTimes")
                         }
                     }
-        
                 }
                 
                 setDefaultPage()
@@ -131,12 +130,20 @@ class HomeInfoViewController:BaseViewController {
         sview.deleteCallBack = { [weak self] array in
             guard let self = self else { return }
             
+            var dealArray = array
+            
+            
             // 首先看是否订阅
             if HomePayModel.share.isNoAd == false {
+                
+                if array.count > Singleton.shared.maxDeleteCount {
+                    dealArray = Array(dealArray.prefix(25))
+                }
+                
                 // 没有订阅
                 let view : AdvTipDeleteView = AdvTipDeleteView(frame: self.view.bounds)
             
-                view.dataSource = array 
+                view.dataSource = dealArray
                 
                 // 获取当前免费次数
                 let freeCount = AdvManager.shared.defaultFreeTimes
@@ -149,13 +156,13 @@ class HomeInfoViewController:BaseViewController {
                             view.getOtherInfoByType(type: self.type!)
                             showPopView(popView: view)
                         }else{
-                            deleteOp(imgs: array ,isAfterAdv: false)
+                            deleteOp(imgs: dealArray ,isAfterAdv: false)
                         }
                     }
                 }else {
                     // 获取次数对应的删除照片数量
                     var freeDeleteCount = AdvManager.shared.advDeleteResouceDic[freeCount]!
-                    let tempArray = array
+                    let tempArray = dealArray
                     if freeCount > 1 {
                         // 如果是前两次，可以免费删除5张照片
                         if tempArray.count > freeDeleteCount {
@@ -167,13 +174,13 @@ class HomeInfoViewController:BaseViewController {
                                     view.getOtherInfoByType(type: self.type!)
                                     showPopView(popView: view)
                                 }else {
-                                    deleteOp(imgs: array,isAfterAdv: false)
+                                    deleteOp(imgs: dealArray,isAfterAdv: false)
                                 }
                             }
                         }else {
                             // 如果小于直接删除
                             HomePayViewController.show {
-                                deleteOp(imgs: array,isAfterAdv: false)
+                                deleteOp(imgs: dealArray,isAfterAdv: false)
                             }
                         }
                         
@@ -190,7 +197,7 @@ class HomeInfoViewController:BaseViewController {
                                     view.getOtherInfoByType(type: self.type!)
                                     showPopView(popView: view)
                                 }else {
-                                    deleteOp(imgs: array,isAfterAdv: false)
+                                    deleteOp(imgs: dealArray,isAfterAdv: false)
                                 }
                             }
                         }else if tempArray.count > 1 && tempArray.count <= 5  {
@@ -204,13 +211,13 @@ class HomeInfoViewController:BaseViewController {
                                     view.getOtherInfoByType(type: self.type!)
                                     showPopView(popView: view)
                                 }else {
-                                    deleteOp(imgs: array ,isAfterAdv: false)
+                                    deleteOp(imgs: dealArray ,isAfterAdv: false)
                                 }
                             }
                         }else{
                             // 如果只是一张，直接删除
                             HomePayViewController.show {
-                                deleteOp(imgs: array ,isAfterAdv: false)
+                                deleteOp(imgs: dealArray ,isAfterAdv: false)
                             }
                         }
                     }
@@ -245,7 +252,7 @@ class HomeInfoViewController:BaseViewController {
                     }
                 }
             }else {
-                deleteOp(imgs: array as! [AssetModel],isAfterAdv: false)
+                deleteOp(imgs: array ,isAfterAdv: false)
                 
             }
         }

PhoneManager/Class/Session/Home/View/HomeInfoView.swift

@@ -178,13 +178,8 @@ class HomeInfoView :UIView{
         for smodel in models {
             for smodel2 in smodel.smodels ?? []{
                 if smodel2.isSeleted ?? false {
-                    if selectedArray.count < Singleton.shared.maxDeleteCount {
-                        selectedArray.append(smodel2.id!)
-                    }else{
-                        smodel2.isSeleted = false
-                    }
+                    selectedArray.append(smodel2.id!)
                 }
-               
             }
         }
         

PhoneManager/Class/Session/Home/View/cell/ImageCollectionCell.swift

@@ -54,7 +54,7 @@ class ImageCollectionCell:UICollectionViewCell {
         backImageView = UIImageView()
         
         backImageView?.isUserInteractionEnabled = true
-        backImageView?.contentMode = .scaleAspectFill
+        backImageView?.contentMode = .scaleAspectFit
         backImageView?.clipsToBounds = true
         backImageView?.layer.masksToBounds = true
         backImageView?.isUserInteractionEnabled = true