Merge branch 'dev_syong' into dev_main

PhoneManager/Class/Database/GroupDatabase.swift

@@ -136,6 +136,11 @@ class GroupDatabase {
     
     // 查询所有数据
     func queryAll() -> [(localIdentifier: String, assetSize: Double, createDate: Date, mediaType: Int, groupId: String)] {
+        
+        if PhotoManager.shared.permissionStatus != .authorized {
+            return []
+        }
+        
         let queryStatementString = "SELECT * FROM groups ORDER BY rowid DESC;"
         var queryStatement: OpaquePointer?
         var result: [(localIdentifier: String, assetSize: Double, createDate: Date, mediaType: Int, groupId: String)] = []

PhoneManager/Class/Database/TrashDatabase.swift

@@ -133,6 +133,12 @@ class TrashDatabase {
     
     // 查询所有数据
     func queryAll() -> [(localIdentifier: String, assetSize: Double, createDate: Date, mediaType: Int)] {
+        
+        
+        if PhotoManager.shared.permissionStatus != .authorized {
+            return []
+        }
+        
         let queryStatementString = "SELECT * FROM trash;"
         var queryStatement: OpaquePointer?
         var result: [(localIdentifier: String, assetSize: Double, createDate: Date, mediaType: Int)] = []

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

@@ -322,6 +322,7 @@ class HomeInfoViewController:BaseViewController {
             self.setDefaultPage()
         }
     
+        configSelectAll()
     }
     
     
@@ -442,6 +443,14 @@ class HomeInfoViewController:BaseViewController {
         }
     }
     
+    func configSelectAll(){
+        seletedAllBtn.isSelected = true
+        self.seletedAllBtn.width = seletedAllBtn.isSelected ? 131 : 115
+        seletedAllBtn.x = titleView.width - marginLR - seletedAllBtn.width
+        
+        tablewView.changeALlValue(isSeleted: seletedAllBtn.isSelected)
+    }
+    
     @objc func seletedAllBtnClick() {
         
         DispatchQueue.main.async {[weak self] in

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

@@ -237,6 +237,7 @@ class HomeViewController:BaseViewController {
                     let nav:BaseNavViewController = BaseNavViewController(rootViewController: vc)
                     nav.modalPresentationStyle = .fullScreen
                     self.present(nav, animated: true)
+                    break
                 case .lifetime,.year:
                     let vc : PayCompletedViewController =  PayCompletedViewController()
                     vc.modalPresentationStyle = .fullScreen

PhoneManager/Class/Page/Keep/View/MaintaiDetailImageSmallCell.swift

@@ -40,7 +40,7 @@ class MaintaiDetailImageSmallCell: UICollectionViewCell {
         selectBtn.setImage(UIImage.init(named: "icon_maintai_unselect_small"), for: .normal)
         selectBtn.setImage(UIImage.init(named: "icon_maintai_select_small"), for: .selected)
         addSubview(selectBtn)
-        selectBtn.addTarget(self, action: #selector(selectChange), for: .touchUpInside)
+      //  selectBtn.addTarget(self, action: #selector(selectChange), for: .touchUpInside)
         selectBtn.snp.makeConstraints { make in
             make.right.bottom.equalTo(0)
             make.size.equalTo(30)
@@ -54,7 +54,7 @@ class MaintaiDetailImageSmallCell: UICollectionViewCell {
     }
     
     @objc func selectChange(){
-        selectChangeBlock?()
+       // selectChangeBlock?()
     }
     
 }

PhoneManager/Class/Page/Keep/View/MaintaiDetailTableViewCell.swift

@@ -100,13 +100,19 @@ extension MaintaiDetailTableViewCell:UICollectionViewDelegate,UICollectionViewDa
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "MaintaiDetailImageSmallCell", for: indexPath) as! MaintaiDetailImageSmallCell
         cell.model = source[indexPath.row]
         cell.selectBtn.isSelected = selectAsset.contains(source[indexPath.row])
-        cell.selectChangeBlock = {[weak self] in
-            guard let weakSelf = self else { return }
-            weakSelf.dealSelect(model: weakSelf.source[indexPath.row])
-        }
+//        cell.selectChangeBlock = {[weak self] in
+//            guard let weakSelf = self else { return }
+//            weakSelf.dealSelect(model: weakSelf.source[indexPath.row])
+//        }
         return cell
     }
     
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath){
+        if collectionView == pageCollectionView{
+            dealSelect(model: source[indexPath.row])
+        }
+    }
+    
     
     func dealSelect(model:AssetModel){
 

PhoneManager/Class/Page/Pay/ViewController/PayDistanceViewController.swift

@@ -74,12 +74,6 @@ class PayDistanceViewController: UIViewController {
         yearDistacePrice.text = ""//"$39.99 $19.99 / Year"
         scrollView.addSubview(yearDistacePrice)
         
-//        let priceAtt = createRichPriceText(
-//            originalPrice: "$39.99",
-//            discountedPrice: "$19.99 / Year"
-//        )
-//        yearDistacePrice.attributedText = priceAtt
-        
         let cancelLabel =  UILabel()
         cancelLabel.font = UIFont.systemFont(ofSize: 12,weight: .semibold)
         cancelLabel.textColor = UIColor.colorWithHex(hexStr: "#0082FF")

PhoneManager/Class/Page/Trash/Controller/TrashViewController.swift

@@ -195,6 +195,9 @@ extension TrashViewController:UIScrollViewDelegate{
        let data : [AssetModel] = TrashDataManager.getCurrentMediaTypeTrashData(mediaType: info.0)
        let type : TrashTypeEnum = info.0
        DispatchQueue.main.async {
+           if self.delBtn == nil{
+               return
+           }
            if data.count <= 0{
                self.delBtn.setTitle("Delete", for: .normal)
                self.delBtn.backgroundColor = UIColor(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)

PhoneManager/Class/Page/Trash/View/TrashContenAssetCell.swift

@@ -28,19 +28,23 @@ class TrashContenAssetCell: UICollectionViewCell {
     
     var model:AssetModel?{
         didSet{
+            
             guard let model = model else{return}
-            if self.mediaType == .video {
-                PhotoAndVideoMananger.mananger.getPreImageFromVideo(identifier: model.localIdentifier, completed: { [weak self] image in
-                    guard let self else {return}
-                    DispatchQueue.main.async {
-                        self.assetImage.image = image
-                    }
-                })
-            }else {
-                DispatchQueue.main.async {
-                    self.assetImage.image = PhotoAndVideoMananger.mananger.getImageFromAssetID(id: model.localIdentifier)
-                }
-            }
+            let image = self.mediaType == .video ? "videosmoren" : "photosmoren"
+            self.assetImage.asset.load(withLocalIdentifier: model.localIdentifier,placeholder: UIImage.init(named: image))
+            
+//            if self.mediaType == .video {
+//                PhotoAndVideoMananger.mananger.getPreImageFromVideo(identifier: model.localIdentifier, completed: { [weak self] image in
+//                    guard let self else {return}
+//                    DispatchQueue.main.async {
+//                        self.assetImage.image = image
+//                    }
+//                })
+//            }else {
+//                DispatchQueue.main.async {
+//                    self.assetImage.image = PhotoAndVideoMananger.mananger.getImageFromAssetID(id: model.localIdentifier)
+//                }
+//            }
         }
     }