【新增】列表页垃圾桶

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

@@ -303,8 +303,13 @@ class HomePhotosDetailViewController : BaseViewController {
                 self.addTrashView()
             }
         }
+        
+        self.addListener()
     }
     
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
     func showTipsVC(){
         
         guard let mediaType = mediaType else{
@@ -840,5 +845,26 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
     }
     
     
+    private func addListener(){
+        NotificationCenter.default.addObserver(forName: TrashDefaultView.jumpToPhotosDetailPageName, object: nil, queue: .main) {  [weak self] notification in
+            guard let self = self,
+            let type = notification.userInfo?["type"] as? String else { return }
+            if let targetVC = self.navigationController?.viewControllers.first(where: { $0 is HomeViewController }) as? HomeViewController {
+                self.navigationController?.popToViewController(targetVC, animated: false)
+                let vc:HomePhotosDetailViewController = HomePhotosDetailViewController(mediaType: type == "Other" ? PhotsFileType.Other : PhotsFileType.screenshots)
+                targetVC.navigationController?.pushViewController(vc, animated: true)
+            }
+        }
+        NotificationCenter.default.addObserver(forName: TrashDefaultView.jumpToVideosDetailPageName, object: nil, queue: .main) { [weak self] notification in
+            guard let self else {return}
+            if let targetVC = self.navigationController?.viewControllers.first(where: { $0 is HomeViewController }) as? HomeViewController {
+                self.navigationController?.popToViewController(targetVC, animated: false)
+                let vc:HomeVideoDetailController = HomeVideoDetailController()
+                targetVC.navigationController?.pushViewController(vc, animated: true)
+            }
+        }
+    }
+    
+    
     
 }

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

@@ -146,6 +146,10 @@ class HomeVideoDetailController :BaseViewController {
         completed()
     }
     
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+    
     // MARK: 数据操作 - 辅助方法
     
     /// 过滤垃圾桶数据 - 当前页面数据本身就是已经过滤了垃圾桶数据库的数据了，所以只需要过滤掉单利中的数据
@@ -282,6 +286,8 @@ class HomeVideoDetailController :BaseViewController {
                 self.addTrashView()
             }
         }
+        
+        self.addListener()
     }
     
     /// 是否添加垃圾桶数据
@@ -771,4 +777,24 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
         }
     }
     
+    private func addListener(){
+        NotificationCenter.default.addObserver(forName: TrashDefaultView.jumpToPhotosDetailPageName, object: nil, queue: .main) {  [weak self] notification in
+            guard let self = self,
+            let type = notification.userInfo?["type"] as? String else { return }
+            if let targetVC = self.navigationController?.viewControllers.first(where: { $0 is HomeViewController }) as? HomeViewController {
+                self.navigationController?.popToViewController(targetVC, animated: false)
+                let vc:HomePhotosDetailViewController = HomePhotosDetailViewController(mediaType: type == "Other" ? PhotsFileType.Other : PhotsFileType.screenshots)
+                targetVC.navigationController?.pushViewController(vc, animated: true)
+            }
+        }
+        NotificationCenter.default.addObserver(forName: TrashDefaultView.jumpToVideosDetailPageName, object: nil, queue: .main) { [weak self] notification in
+            guard let self else {return}
+            if let targetVC = self.navigationController?.viewControllers.first(where: { $0 is HomeViewController }) as? HomeViewController {
+                self.navigationController?.popToViewController(targetVC, animated: false)
+                let vc:HomeVideoDetailController = HomeVideoDetailController()
+                targetVC.navigationController?.pushViewController(vc, animated: true)
+            }
+        }
+    }
+    
 }

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

@@ -552,16 +552,6 @@ class PhotoRemoveViewController: BaseViewController {
             }
         }
     }
-    
-    
-    @objc func popCurrentPage(){
-        
-
-        
-        
-        
-    }
-    
     deinit {
         NotificationCenter.default.removeObserver(self)
     }