【优化】部分图表替换

PhoneManager/Assets.xcassets/Home/Frame 5.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/Frame 6.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/Frame 7.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/Frame 8.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/Frame 9.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/Frame_1318.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame_1318.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame_1318@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame_1318@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/重复项说明-icon-未选中.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "重复项说明-icon-未选中.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "重复项说明-icon-未选中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "重复项说明-icon-未选中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/重复项说明-icon-选中 1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "重复项说明-icon-选中.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "重复项说明-icon-选中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "重复项说明-icon-选中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/重复项说明-icon-选中.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "重复项说明-icon-选中.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "重复项说明-icon-选中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "重复项说明-icon-选中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Class/Page/Compress/Controller/CompressController.swift

@@ -117,13 +117,9 @@ class CompressController : BaseViewController {
         }
         
         self.resourceData.removeAll()
-        PMLoadingHUD.share.showLoding()
         CompressViewModel().getAllPhotosToAssets(sortType: self.currentSort, assetType: self.currentResourceType) { [weak self] models in
             guard let self else {return}
             self.resourceData = models
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                PMLoadingHUD.share.disMiss()
-            }
         }
     }
     
@@ -227,15 +223,11 @@ extension CompressController:WaterfallMutiSectionDelegate,UICollectionViewDataSo
                 guard let self else {return}
                 // 重新获取数据，过滤数据
                 self.currentSort = filterModel.sortType
-                PMLoadingHUD.share.showLoding()
                 CompressViewModel().getAllPhotosToAssets(sortType: self.currentSort, assetType: self.currentResourceType) { [weak self] models in
                     guard let self else {return}
                     // 过滤数据
                     let tempData =  self.filterDataByDate(orgModels: models  , startDate: filterModel.startDate, endDate: filterModel.endDate)
                     self.resourceData = tempData
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        PMLoadingHUD.share.disMiss()
-                    }
                 }
             }
             header.changeView.callBack = {[weak self] flag in
@@ -249,13 +241,9 @@ extension CompressController:WaterfallMutiSectionDelegate,UICollectionViewDataSo
                     if self.currentResourceType == .compressPhoto {
                         self.getViewData()
                     }else{
-                        PMLoadingHUD.share.showLoding()
                         CompressViewModel().getAllPhotosToAssets(sortType: self.currentSort, assetType: flag) { [weak self] models in
                             guard let self else {return}
                             self.resourceData = models
-                            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                                PMLoadingHUD.share.disMiss()
-                            }
                         }
                     }
                 }

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

@@ -68,58 +68,22 @@ class CompressViewModel{
     /// 获取相册所有图片
     /// - Returns: 图片信息
     func getAllPhotosToAssets(sortType: ResouceSortType, assetType : CompressType,_ finished: @escaping Finished){
-        
         var models : [AssetModel] = []
-        
-        let fetchOptions = PHFetchOptions()
-        fetchOptions.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
-        
-        var photosAssets : PHFetchResult<PHAsset>
+        PhotoManager.shared.reloadTrashAndKeep()
         if assetType == .compressPhoto {
-            photosAssets = PHAsset.fetchAssets(with: .image, options: fetchOptions)
-        }else{
-            photosAssets = PHAsset.fetchAssets(with: .video, options: fetchOptions)
+            models = PhotoManager.shared.filterOtherModels +  PhotoManager.shared.filterScreenShotModels
+        }else {
+            models = PhotoManager.shared.filterVideoModels
         }
-        // 获取到了所有图片的assets
-        let assetsArray = photosAssets.objects(at: IndexSet(0..<photosAssets.count))
-        let group = DispatchGroup()
-        var count = 0
-        for asset in assetsArray {
-            group.enter()
-            DispatchQueue.global().async {
-                // 图片大小
-                let resources = PHAssetResource.assetResources(for: asset)
-                var assetSize : Int = 0
-                for resource in resources {
-                    if let fileSize = resource.value(forKey: "fileSize") as? Int64 {
-                        assetSize += Int(fileSize)
-                    }
-                }
-                let sizeInMB = assetSize
-                
-                // 获取图片的日期
-                let creationDate = asset.creationDate!
-                
-                // 获取图片的localIdentifier
-                let localIdentifier = asset.localIdentifier
-                let model = AssetModel.init(localIdentifier: localIdentifier, assetSize: Double(sizeInMB), createDate: creationDate)
-                models.append(model)
-                count = count + 1
-                group.leave()
-                if count ==  assetsArray.count {
-                    // 默认按照文件大小排序
-                    if sortType == .largest {
-                        finished(models.sorted { $0.assetSize > $1.assetSize })
-                    }else if sortType == .smallest {
-                        finished(models.sorted { $0.assetSize < $1.assetSize })
-                    }else if sortType == .latest {
-                        finished(models.sorted { $0.createDate > $1.createDate })
-                    }else{
-                        finished(models.sorted { $0.createDate < $1.createDate })
-                    }
-                    
-                }
-            }
+        // 默认按照文件大小排序
+        if sortType == .largest {
+            finished(models.sorted { $0.assetSize > $1.assetSize })
+        }else if sortType == .smallest {
+            finished(models.sorted { $0.assetSize < $1.assetSize })
+        }else if sortType == .latest {
+            finished(models.sorted { $0.createDate > $1.createDate })
+        }else{
+            finished(models.sorted { $0.createDate < $1.createDate })
         }
     }
 

PhoneManager/Class/Page/Home/Controller/HomePhotosDetailViewController.swift

@@ -570,13 +570,13 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
         if kind == UICollectionView.elementKindSectionHeader {
             let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "HomePhotosDetailCustomHeaderView", for: indexPath) as! HomePhotosDetailCustomHeaderView
             // 记录当前的 headerView
-            header.countLabel.text = "\(self.resourceData.count) Photos"
+            header.countLabel.attributedText = header.getAttrText(fullText: "\(self.resourceData.count) Photos")
             header.modelTitlelabel.text = self.mediaType?.rawValue
             currentHeaderView = header
             
             header.sortViewSubmitCallBack = {[weak self] filterModel in
                 guard let self else {return}
-                
+                PhotoManager.shared.reloadTrashAndKeep()
                 var dataS : [AssetModel] = []
                 if self.mediaType == .Other{
                     dataS = PhotoManager.shared.filterOtherModels
@@ -824,7 +824,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
         // 更新下头部数量
         DispatchQueue.main.async {
             if self.currentHeaderView != nil {
-                self.currentHeaderView?.countLabel.text = "\(self.resourceData.count) Photos"
+                self.currentHeaderView?.countLabel.attributedText = self.currentHeaderView?.getAttrText(fullText: "\(self.resourceData.count) Photos")
             }
         }
         

PhoneManager/Class/Page/Home/Controller/HomeVideoDetailController.swift

@@ -495,10 +495,10 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
             // 记录当前的 headerView
             currentHeaderView = header
             header.compressionTipView.reloadData()
-            header.sizeLabel.text = "\(self.resourceData.count) Videos"
+            header.sizeLabel.attributedText = header.getAttrText(fullText: "\(self.resourceData.count) Videos")
             header.sortViewSubmitCallBack = {[weak self] filterModel in
                 guard let self else {return}
-                
+                PhotoManager.shared.reloadTrashAndKeep()
                 let dataS : [AssetModel] = PhotoManager.shared.filterVideoModels
                 let tempData =  self.filterDataByDate(orgModels: dataS  , startDate: filterModel.startDate, endDate: filterModel.endDate)
                 // 重新更新下数据源
@@ -751,7 +751,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
             self.deleteButtonView.deleteButton.setTitle("Delete", for: .normal)
             
             if self.currentHeaderView != nil {
-                self.currentHeaderView?.sizeLabel.text = "\(self.resourceData.count) Videos"
+                self.currentHeaderView?.sizeLabel.attributedText = self.currentHeaderView?.getAttrText(fullText: "\(self.resourceData.count) Videos")
             }
             
             UIView.transition(with: self.collectionView, duration: 0.3, options: .transitionCrossDissolve, animations: {

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

@@ -117,6 +117,7 @@ class HomeInfoView :UIView {
         
         
         self.headerView.sortViewSubmitCallBack = {[weak self]filterModel in
+            PhotoManager.shared.reloadTrashAndKeep()
             guard let self else {return}
             var dataS : [[AssetModel]] = []
             if self.type == .SimilarVideos{

PhoneManager/Class/Page/Home/View/HomePhotosDetailCustomHeaderView.swift

@@ -40,13 +40,21 @@ class HomePhotosDetailCustomHeaderView : UICollectionReusableView {
     
     lazy var countLabel :UILabel = {
         let label = UILabel()
-        label.text = "0 Photos"
         label.textAlignment = .left
         label.textColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 1)
         label.font = UIFont.systemFont(ofSize: 14, weight: .regular)
+        label.attributedText = self.getAttrText(fullText: "0 Photos")
         return label
     }()
     
+    func getAttrText(fullText:String)->NSMutableAttributedString{
+        let attributedString = NSMutableAttributedString(string: fullText)
+        let range = (fullText as NSString).range(of: "Photos")
+        attributedString.addAttribute(.foregroundColor, value: UIColor(red: 0.6, green: 0.6, blue: 0.6,alpha:1), range: range)
+        return attributedString
+       
+    }
+    
     private func setUI(){
         
         self.addSubview(self.modelTitlelabel)

PhoneManager/Class/Page/Home/View/HomeVideoDetailCustomHeaderView.swift

@@ -36,14 +36,23 @@ class HomeVideoDetailCustomHeaderView : UICollectionReusableView {
     }()
     lazy var sizeLabel :UILabel = {
         let label = UILabel()
-        label.text = "0 Videos"
         label.textAlignment = .left
         label.textColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 1)
         label.font = UIFont.systemFont(ofSize: 14, weight: .regular)
+        label.attributedText = self.getAttrText(fullText: "0 Videos")
         return label
     }()
     
     
+    func getAttrText(fullText:String)->NSMutableAttributedString{
+        let attributedString = NSMutableAttributedString(string: fullText)
+        let range = (fullText as NSString).range(of: "Videos")
+        attributedString.addAttribute(.foregroundColor, value: UIColor(red: 0.6, green: 0.6, blue: 0.6,alpha:1), range: range)
+        return attributedString
+       
+    }
+    
+    
     private func setUI(){
         
         self.addSubview(self.modelTitlelabel)

PhoneManager/Class/Page/Home/View/PhotoVideoDetailNavView.swift

@@ -31,7 +31,7 @@ class PhotoVideoDetailNavView: UIView {
         didSet{
             if showType == .dateAndSizeNav {
                 self.sizeLbel.isHidden = false
-                self.topConstraint?.update(offset: 22 + statusBarHeight)
+                self.topConstraint?.update(offset: 19 + statusBarHeight)
             }else{
                 self.sizeLbel.isHidden = true
                 self.topConstraint?.update(offset: 6 + statusBarHeight)
@@ -73,7 +73,7 @@ class PhotoVideoDetailNavView: UIView {
         
         sizeLbel.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.top.equalToSuperview().offset(statusBarHeight)
+            make.top.equalToSuperview().offset(statusBarHeight - 3)
             make.height.equalTo(22)
         }
         

PhoneManager/Class/Page/Home/View/cell/HomePhotosDetailCollectionCell.swift

@@ -20,9 +20,9 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
     var choose : Bool = false {
         didSet{
             if choose {
-                self.selectImageView.image = UIImage(named: "ic_unsel_com")
+                self.selectImageView.image = UIImage(named: "重复项说明-icon-选中")
             }else{
-                self.selectImageView.image = UIImage(named: "ic_sel_com")
+                self.selectImageView.image = UIImage(named: "Frame 6")
             }
         }
     }
@@ -101,8 +101,8 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
         }
         
         self.selectImageView.snp.makeConstraints { make in
-            make.bottom.right.equalToSuperview().offset(-12)
-            make.height.width.equalTo(24)
+            make.bottom.right.equalToSuperview().offset(-6)
+            make.height.width.equalTo(18)
         }
     }
     

PhoneManager/Class/Page/Home/View/cell/HomeVideoDetailCell.swift

@@ -59,8 +59,6 @@ class HomeVideoDetailCell : UICollectionViewCell {
                         print("无法获取图片")
                     }
                 }
-                
-                
             }
         }
     }
@@ -70,9 +68,9 @@ class HomeVideoDetailCell : UICollectionViewCell {
     var choose : Bool = false {
         didSet{
             if choose {
-                self.selectImageView.image = UIImage(named: "ic_unsel_com")
+                self.selectImageView.image = UIImage(named: "重复项说明-icon-选中")
             }else{
-                self.selectImageView.image = UIImage(named: "ic_sel_com")
+                self.selectImageView.image = UIImage(named: "Frame 6")
             }
         }
     }
@@ -104,7 +102,7 @@ class HomeVideoDetailCell : UICollectionViewCell {
     lazy var playImageView: UIImageView = {
         let view = UIImageView()
         view.backgroundColor = .clear
-        view.image = UIImage(named: "btn_play_home")
+        view.image = UIImage(named: "Frame 5")
         view.isUserInteractionEnabled = true
         return view
     }()
@@ -114,7 +112,7 @@ class HomeVideoDetailCell : UICollectionViewCell {
     lazy var saveSizeView: UIView = {
         let view = UIView()
         view.layer.masksToBounds = true
-        view.layer.cornerRadius = 4
+        view.layer.cornerRadius = 12
         view.backgroundColor = UIColor(red: 0, green: 0.51, blue: 1, alpha: 1)
         return view
     }()
@@ -123,21 +121,21 @@ class HomeVideoDetailCell : UICollectionViewCell {
         let view = UILabel()
         view.textAlignment = .left
         view.textColor = UIColor(red: 1, green: 1, blue: 1, alpha: 1)
-        view.font = UIFont.systemFont(ofSize: 12, weight: .regular)
+        view.font = UIFont.systemFont(ofSize: 12, weight: .semibold)
         view.text = "0.0MB"
         return view
     }()
     
     lazy var moreImageView: UIImageView = {
         let view = UIImageView()
-        view.image = UIImage(named: "icon_left_setting_grey")
+        view.image = UIImage(named: "Frame 9")
         view.backgroundColor = .clear
         return view
     }()
     
     lazy var selectImageView: UIImageView = {
         let view = UIImageView()
-        view.image = UIImage(named: "ic_sel_com")
+        view.image = UIImage(named: "Frame 6")
         view.backgroundColor = .clear
         view.isUserInteractionEnabled = true
         
@@ -181,30 +179,28 @@ class HomeVideoDetailCell : UICollectionViewCell {
         }
         self.playImageView.snp.makeConstraints { make in
             make.center.equalToSuperview()
-            make.width.height.equalTo(43)
+            make.width.height.equalTo(18.38)
         }
         self.saveSizeView.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(12)
-            make.bottom.equalToSuperview().offset(-12)
-            make.height.equalTo(25)
-            make.width.equalTo(120)
+            make.left.top.equalToSuperview().offset(6)
+            make.height.equalTo(24)
+            make.width.equalTo(100)
         }
         self.saveSizeLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(8)
+            make.left.equalToSuperview().offset(11)
             make.centerY.equalToSuperview()
-            make.height.equalTo(25)
-            make.width.equalTo(105)
+            make.height.equalTo(17)
         }
         
         self.moreImageView.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-4)
+            make.right.equalToSuperview().offset(-10)
             make.centerY.equalToSuperview()
             make.height.width.equalTo(16)
         }
         
         self.selectImageView.snp.makeConstraints { make in
-            make.bottom.right.equalToSuperview().offset(-12)
-            make.height.width.equalTo(24)
+            make.bottom.right.equalToSuperview().offset(-6)
+            make.height.width.equalTo(18)
         }
         self.extensionView.snp.makeConstraints { make in
             make.center.equalTo(self.selectImageView.snp.center)

PhoneManager/Class/Page/Home/View/cell/ImageSeletedCollectionCell.swift

@@ -156,8 +156,8 @@ class ImageSeletedCollectionCell:UICollectionViewCell {
         
         seletedBtn = UIButton()
         
-        seletedBtn?.setImage(UIImage(named: "home_info_norl"), for: .normal)
-        seletedBtn?.setImage(UIImage(named: "home_info_seleted"), for: .selected)
+        seletedBtn?.setImage(UIImage(named: "重复项说明-icon-未选中"), for: .normal)
+        seletedBtn?.setImage(UIImage(named: "重复项说明-icon-选中"), for: .selected)
         seletedBtn?.addTarget(self, action: #selector(seletedBtnClick), for: .touchUpInside)
         
         self.backgroundColor = .clear

PhoneManager/Class/Page/Secret/Cell/PMShowImgCell.swift

@@ -54,8 +54,8 @@ class PMShowImgCell: UICollectionViewCell {
  
     lazy var selectBtn: UIButton = {
         let select = UIButton(type: .custom)
-        select.setImage(UIImage(named: "home_info_norl"), for: .normal)
-        select.setImage(UIImage(named: "home_info_seleted"), for: .selected)
+        select.setImage(UIImage(named: "Frame_1318"), for: .normal)
+        select.setImage(UIImage(named: "重复项说明-icon-选中 1"), for: .selected)
         select.addTarget(self, action: #selector(selectTap), for: .touchUpInside)
         contentView.addSubview(select)
         return select

PhoneManager/Class/Page/Secret/Cell/PMShowItemCell.swift

@@ -33,8 +33,8 @@ class PMShowItemCell: UICollectionViewCell {
     
     private lazy var selectBtn: UIButton = {
         let select = UIButton(type: .custom)
-        select.setImage(UIImage(named: "home_info_norl"), for: .normal)
-        select.setImage(UIImage(named: "home_info_seleted"), for: .selected)
+        select.setImage(UIImage(named: "Frame 7"), for: .normal)
+        select.setImage(UIImage(named: "Frame 8"), for: .selected)
         contentView.addSubview(select)
         select.isUserInteractionEnabled = false
         return select

PhoneManager/Class/Page/Secret/Cell/PMShowVideoCell.swift

@@ -88,8 +88,8 @@ class PMShowVideoCell: UICollectionViewCell {
  
     lazy var selectBtn: UIButton = {
         let select = UIButton(type: .custom)
-        select.setImage(UIImage(named: "home_info_norl"), for: .normal)
-        select.setImage(UIImage(named: "home_info_seleted"), for: .selected)
+        select.setImage(UIImage(named: "Frame_1318"), for: .normal)
+        select.setImage(UIImage(named: "重复项说明-icon-选中 1"), for: .selected)
         select.addTarget(self, action: #selector(selectTap), for: .touchUpInside)
         contentView.addSubview(select)
         return select