【优化】优化左右滑动功能

PhoneManager/Assets.xcassets/Home/Frame_1171276231 1.imageset/Contents.json

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

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

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

PhoneManager/Assets.xcassets/Home/Group_1171275102 1.imageset/Contents.json

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

PhoneManager/Assets.xcassets/Home/Group_1171275102 2.imageset/Contents.json

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

PhoneManager/Assets.xcassets/Home/Group_1171275102 3.imageset/Contents.json

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

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

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

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

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

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

@@ -9,6 +9,11 @@ import UIKit
 import SnapKit
 import Photos
 
+enum SlideDirection {
+    case left
+    case right
+}
+
 class PhotoRemoveViewController: BaseViewController {
     
     var mediaType : TrashTypeEnum? {
@@ -43,6 +48,23 @@ class PhotoRemoveViewController: BaseViewController {
     private let scaleMax: CGFloat = 0.7
     private let actionMargin: CGFloat = 120
     
+   // 创建两个按钮
+    private lazy var trashButton = {
+        let button = UIButton(frame: CGRect(x: self.view.centerX - 22 - 47, y: self.view.centerY + 509 * RScreenH() / 2 - 47 / 2, width: 47, height: 47))
+        button.setImage(UIImage(named: "Group_1171275243"), for: .normal)
+        button.setImage(UIImage(named: "Group_1171275242"), for: .selected)
+        button.addTarget(self, action: #selector(trashButtonAction), for: .touchUpInside)
+        return button
+    }()
+    private lazy var keepListButton = {
+        let button = UIButton(frame: CGRect(x: self.view.centerX + 22, y: self.view.centerY + 509 * RScreenH() / 2 - 47 / 2, width: 47, height: 47))
+        button.setImage(UIImage(named: "Group_1171275102 3"), for: .normal)
+        button.setImage(UIImage(named: "Group_1171275102 2"), for: .selected)
+        button.addTarget(self, action: #selector(keepListButtonAction), for: .touchUpInside)
+        return button
+    }()
+    
+    
     
     lazy var trashSubView : TrashSubView = {
         let view = TrashSubView()
@@ -68,11 +90,64 @@ class PhotoRemoveViewController: BaseViewController {
         self.currentIndex = tempArray.count
         self.dataModel = result
         super.init(nibName: nil, bundle: nil)
+        
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    // MARK: - 按钮事件
+    @objc func trashButtonAction(){
+        if self.photoViews.count > 0 {
+            if let view = self.photoViews.first {
+                self.animateViewExit(view: view,direction: .left)
+            }
+           
+        }
+    }
+    @objc func keepListButtonAction(){
+        if self.photoViews.count > 0 {
+            if let view = self.photoViews.first {
+                self.animateViewExit(view: view,direction: .right)
+            }
+        }
+    }
+    
+
+    func animateViewExit(view : PhotosRemoveBaseView, direction : SlideDirection) {
+        // 1. 设置锚点
+        let customAnchor = CGPoint(x: 0.5, y: 2.0)
+        view.layer.anchorPoint = customAnchor
+        
+        // 2. 修正位置
+        let originalCenter = view.center
+        let offsetY = view.bounds.height * (customAnchor.y - 0.5)
+        view.layer.position = CGPoint(
+            x: originalCenter.x,
+            y: originalCenter.y + offsetY
+        )
+        
+        // 3. 执行动画
+        UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseIn, animations: {
+            view.transform = CGAffineTransform(rotationAngle: direction == SlideDirection.left ?  -.pi/6 : .pi/6)
+            view.alpha = 0
+        }) { _ in
+            // 数据变化
+            if direction == SlideDirection.left{
+                // 删除操作,先存到单利
+                self.vibrate()
+                self.saveDataToDBAndSigtonTrash()
+            }else {
+                // 清除单利数据
+                self.clearSigtonTrashData()
+                // 保留操作
+                self.vibrate()
+                self.saveDataToSigtonKeepList()
+            }
+            // 视图变化
+            self.recycleView()
+        }
+    }
     
     // MARK: - 生命周期
     override func viewDidLoad() {
@@ -148,6 +223,10 @@ class PhotoRemoveViewController: BaseViewController {
         showCurrentPageUIWhenTashDataChanged()
         
         self.addListener()
+        
+        
+        self.view.addSubview(self.trashButton)
+        self.view.addSubview(self.keepListButton)
     }
     
     // 拿到当前类型垃圾桶数据的最后一个
@@ -277,15 +356,13 @@ class PhotoRemoveViewController: BaseViewController {
                         self.navView.resetButton.isHidden = true
                     }
                 }
-                
-                
-                if assetModel.count > 0 {
-                    // 显示垃圾桶
-                    self.trashSubView.resourceCountlabel.text = String(assetModel.count)
-                    self.showTrashView()
-                }else{
-                    self.hideTrashView()
-                }
+            }
+            if assetModel.count > 0 {
+                // 显示垃圾桶
+                self.trashSubView.resourceCountlabel.text = String(assetModel.count)
+                self.showTrashView()
+            }else{
+                self.hideTrashView()
             }
         }
     }
@@ -297,7 +374,7 @@ class PhotoRemoveViewController: BaseViewController {
             let photoView = PhotosRemoveBaseView()
             photoView.mediaType = self.mediaType
             photoView.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(handlePan)))
-            view.addSubview(photoView)
+            self.view.addSubview(photoView)
             photoView.frame = CGRectMake(0, 0, self.view.width - 30, 509 * RScreenH())
             photoView.center = self.view.center
             photoViews.append(photoView)
@@ -435,7 +512,9 @@ class PhotoRemoveViewController: BaseViewController {
                     }
                 }
             }else {
-                view.configure(with: PhotoAndVideoMananger.mananger.getImageFromAssetID(id: dataModel[imageIndex].localIdentifier) ?? UIImage())
+                PhotoAndVideoMananger.mananger.asynGetImageFromAssetID(id: dataModel[imageIndex].localIdentifier) { image in
+                    view.configure(with: image)
+                }
             }
             
         }
@@ -446,10 +525,16 @@ class PhotoRemoveViewController: BaseViewController {
     
     private func updateActionButton(for view: PhotosRemoveBaseView, translation: CGPoint) {
         if translation.x > 0 {
+            self.trashButton.isSelected = false
+            self.keepListButton.isSelected = true
             view.showRightButton()
         } else if translation.x < 0 {
+            self.trashButton.isSelected = true
+            self.keepListButton.isSelected = false
             view.showLeftButton()
         } else {
+            self.keepListButton.isSelected = false
+            self.trashButton.isSelected = false
             view.hideButtons()
         }
     }
@@ -478,6 +563,7 @@ class PhotoRemoveViewController: BaseViewController {
             view.center = self.view.center
             view.hideButtons()
         }
+        initTrashAndKeepListButton()
     }
     
     private func recycleView() {
@@ -505,16 +591,23 @@ class PhotoRemoveViewController: BaseViewController {
         
         // 视图层级处理
         bringCurrentViewToFront()
-        
-        UIView.animate(withDuration: 0.3) {
-            newView.alpha = 1
-        }
+        newView.alpha = 1
+        initTrashAndKeepListButton()
+    }
+    
+    func initTrashAndKeepListButton(){
+        self.trashButton.isSelected = false
+        self.keepListButton.isSelected = false
+        self.view.bringSubviewToFront(self.trashButton)
+        self.view.bringSubviewToFront(self.keepListButton)
     }
     
     private func bringCurrentViewToFront() {
         guard photoViews.count >= 2 else { return }
         view.bringSubviewToFront(photoViews[1])
         view.bringSubviewToFront(photoViews[0])
+        view.bringSubviewToFront(self.trashButton)
+        view.bringSubviewToFront(self.keepListButton)
     }
     
     

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

@@ -71,7 +71,8 @@ class PhotosRemoveBaseView: UIView {
         imageView.contentMode = .scaleAspectFit
         addSubview(imageView)
 
-        leftButton.frame = CGRect(x: self.width / 2 - 45.5, y: self.height / 2 - 21, width: 95, height: 42)
+        leftButton.frame = CGRect(x: 0, y: 0, width: 95, height: 42)
+        leftButton.center = imageView.center
         leftButton.setTitle("Delete", for: .normal)
         leftButton.backgroundColor = UIColor(red: 0.95, green: 0.21, blue: 0.21, alpha: 1)
         leftButton.tintColor = .white
@@ -81,7 +82,8 @@ class PhotosRemoveBaseView: UIView {
         addSubview(leftButton)
         
         
-        rightButton.frame = CGRect(x: self.width / 2 - 45.5, y: self.height / 2 - 21, width: 95, height: 42)
+        rightButton.frame = CGRect(x: 0, y: 0, width: 95, height: 42)
+        rightButton.center = imageView.center
         rightButton.setTitle("Retain", for: .normal)
         rightButton.backgroundColor = UIColor(red: 0.18, green: 0.76, blue: 0.35, alpha: 1)
         rightButton.tintColor = .white
@@ -99,7 +101,7 @@ class PhotosRemoveBaseView: UIView {
     }
     
     func showLeftButton() {
-        self.leftButton.center = self.center
+        self.leftButton.center = imageView.center
         UIView.animate(withDuration: 0.2) {
             self.leftButton.alpha = 1
             self.maskTempleteView.backgroundColor = UIColor(red: 0.95, green: 0.21, blue: 0.21, alpha: 0.4000)
@@ -109,7 +111,7 @@ class PhotosRemoveBaseView: UIView {
     }
     
     func showRightButton() {
-        self.rightButton.center = self.center
+        self.rightButton.center = imageView.center
         UIView.animate(withDuration: 0.2) {
             self.rightButton.alpha = 1
             self.maskTempleteView.backgroundColor = UIColor(red: 0.26, green: 0.78, blue: 0.41, alpha: 0.4000)
@@ -119,12 +121,12 @@ class PhotosRemoveBaseView: UIView {
     }
     
     func hideButtons() {
-        UIView.animate(withDuration: 0.2) {
+        UIView.animate(withDuration: 0.2) { [self] in
             self.leftButton.alpha = 0
             self.rightButton.alpha = 0
             self.maskTempleteView.removeFromSuperview()
-            self.leftButton.center = self.center
-            self.rightButton.center = self.center
+            self.leftButton.center = self.imageView.center
+            self.rightButton.center = self.imageView.center
         }
     }
     

PhoneManager/Class/Tool/Class/PhotoAndVideoMananger/PhotoAndVideoMananger.swift

@@ -296,6 +296,22 @@ class PhotoAndVideoMananger {
         }
     }
     
+    func asynGetImageFromAssetID(id: String,finised:@escaping (UIImage)->Void) {
+        if let asset = getPHAsssetwithID(ids: [id]) {
+            let imageManager = PHImageManager.default()
+            let targetSize = CGSize(width: 400, height: 400)
+            let options = PHImageRequestOptions()
+            options.isSynchronous = false
+            options.deliveryMode = .opportunistic
+            options.isNetworkAccessAllowed = true
+            imageManager.requestImage(for: asset, targetSize: targetSize, contentMode: .aspectFill, options: options) { result, _ in
+                finised(result ?? UIImage())
+            }
+        }else {
+            finised(UIImage())
+        }
+    }
+    
     func getImageFromAsset(asset: PHAsset) -> UIImage? {
         var image: UIImage?
         let imageManager = PHImageManager.default()