【优化】上线前修改

PhoneManager/Class/Page/Charge/Controller/ChargeInfoViewController.swift

@@ -74,12 +74,13 @@ class ChargeInfoViewController:BaseViewController {
                         self.view.showBlur()
                         self.present(alertView, animated: true)
                         alertView.selectClickCallback = {isSure in
-                            alertView.dismiss(animated: true)
-                            self.view.hideBlur()
-                            if isSure {
-                                self.popAdverTisement()
-                                AdvManager.shared.finisedCallBack = {
-                                    self.setAnimation()
+                            alertView.dismiss(animated: true) {
+                                self.view.hideBlur()
+                                if isSure {
+                                    self.popAdverTisement()
+                                    AdvManager.shared.finisedCallBack = {
+                                        self.setAnimation()
+                                    }
                                 }
                             }
                         }

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

@@ -190,6 +190,7 @@ class PhotoRemoveViewController: BaseViewController {
             guard let self else {return}
             DispatchQueue.main.async {
                 self.showCurrentPageUIWhenTashDataChanged()
+                self.navigationController?.popViewController(animated: true)
             }
            
         }

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

@@ -214,12 +214,14 @@ extension TrashSubView {
                                 let tempArray = Array(data.prefix(deleteCount))
                                 TrashDataManager.clearTrashData(mediaType: self.type,data: tempArray) {
                                     self.clearTashDataCallBack()
+                                    self.showDeleteSuccess(array: tempArray)
                                 }
                             }
                         }else{
                             let tempArray = Array(data.prefix(deleteCount))
                             TrashDataManager.clearTrashData(mediaType: self.type,data: tempArray) {
                                 self.clearTashDataCallBack()
+                                self.showDeleteSuccess(array: tempArray)
                             }
                         }
                         
@@ -227,6 +229,7 @@ extension TrashSubView {
                         let tempArray = Array(data.prefix(deleteCount))
                         TrashDataManager.clearTrashData(mediaType: self.type,data: tempArray) {
                             self.clearTashDataCallBack()
+                            self.showDeleteSuccess(array: tempArray)
                             self.updateFreeTimes()
                         }
                     }
@@ -237,6 +240,22 @@ extension TrashSubView {
         }
         
     }
+    // 删除成功页面
+    func showDeleteSuccess(array:[AssetModel]){
+        var tempSize = 0.0
+        for item in array {
+            tempSize = tempSize + item.assetSize
+        }
+        
+        DispatchQueue.main.async {
+            let vc = DelSuccessViewController()
+            vc.delType = array.count > 1 ? "photos" : "photo"
+            vc.fileSzie = Int64(tempSize)
+            vc.fileCount = array.count
+            vc.modalPresentationStyle = .fullScreen
+            self.responderViewController()?.present(vc, animated: true)
+        }
+    }
     @objc func tapHandle(){
         self.presentTashDetailViewClickCallBack()
     }
@@ -253,6 +272,7 @@ extension TrashSubView {
                     self.updateFreeTimes()
                 }
                 self.clearTashDataCallBack()
+                self.showDeleteSuccess(array: data)
             }
         }
     }

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

@@ -297,12 +297,14 @@ extension TrashViewController:UIScrollViewDelegate{
                             let tempArray = Array(data.prefix(deleteCount))
                             TrashDataManager.clearTrashData(mediaType: info.0,data: tempArray) {
                                 info.1.dataSource.removeAll(where: {tempArray.map({$0.localIdentifier}).contains($0.localIdentifier)})
+                                self.showDeleteSuccess(array: tempArray)
                             }
                         }
                     }else{
                         let tempArray = Array(data.prefix(deleteCount))
                         TrashDataManager.clearTrashData(mediaType: info.0,data: tempArray) {
                             info.1.dataSource.removeAll(where: {tempArray.map({$0.localIdentifier}).contains($0.localIdentifier)})
+                            self.showDeleteSuccess(array: tempArray)
                         }
                     }
                     
@@ -311,6 +313,7 @@ extension TrashViewController:UIScrollViewDelegate{
                     TrashDataManager.clearTrashData(mediaType: info.0,data: tempArray) {
                         self.updateFreeTimes()
                         info.1.dataSource.removeAll(where: {tempArray.map({$0.localIdentifier}).contains($0.localIdentifier)})
+                        self.showDeleteSuccess(array: tempArray)
                     }
                 }
             }
@@ -340,6 +343,22 @@ extension TrashViewController:UIScrollViewDelegate{
         }
     }
     
+    func showDeleteSuccess(array:[AssetModel]){
+        var tempSize = 0.0
+        for item in array {
+            tempSize = tempSize + item.assetSize
+        }
+        
+        DispatchQueue.main.async {
+            let vc = DelSuccessViewController()
+            vc.delType = array.count > 1 ? "photos" : "photo"
+            vc.fileSzie = Int64(tempSize)
+            vc.fileCount = array.count
+            vc.modalPresentationStyle = .fullScreen
+            self.present(vc, animated: true)
+        }
+    }
+    
     func delMethod(needUpdateFreeTimes:Bool){
         let info = self.getTypeByCurrentPage(pageIndex: currentPage)
         let data = TrashDataManager.getCurrentMediaTypeTrashData(mediaType: info.0)
@@ -349,6 +368,7 @@ extension TrashViewController:UIScrollViewDelegate{
                     self.updateFreeTimes()
                 }
                 info.1.dataSource.removeAll()
+                self.showDeleteSuccess(array: data)
             }
         }
     }

PhoneManager/Class/Session/Email/View/EmailCleanListView.swift

@@ -113,27 +113,7 @@ extension EmailCleanListView : UITableViewDataSource,UITableViewDelegate {
         if IAPManager.share.isSubscribed == false {
             // 弹出内购页面
             HomePayViewController.show {
-                // 再次判断下
-                if IAPManager.share.isSubscribed == false {
-                    // 弹出提示框
-                    let alertView = AdvTipSelectView()
-                    alertView.selectType = .selectTypeSetAnimation
-                    alertView.getOtherInfoByType()
-                    self.showBlur()
-                    self.responderViewController()?.present(alertView, animated: true)
-                    alertView.selectClickCallback = {isSure in
-                        alertView.dismiss(animated: true)
-                        self.hideBlur()
-                        if isSure {
-                            self.popAdverTisement()
-                            AdvManager.shared.finisedCallBack = {
-                                callblock()
-                            }
-                        }
-                    }
-                }else{
-                    callblock()
-                }
+                callblock()
             }
         }else {
             callblock()

PhoneManager/Class/Session/Email/View/EmailContentView.swift

@@ -162,22 +162,7 @@ extension EmailContentView :UITableViewDelegate,UITableViewDataSource{
         if IAPManager.share.isSubscribed == false {
             // 弹出内购页面
             HomePayViewController.show {
-                // 弹出提示框
-                let alertView = AdvTipSelectView()
-                alertView.selectType = .selectTypeSetAnimation
-                alertView.getOtherInfoByType()
-                self.showBlur()
-                self.responderViewController()?.present(alertView, animated: true)
-                alertView.selectClickCallback = {isSure in
-                    alertView.dismiss(animated: true)
-                    self.hideBlur()
-                    if isSure {
-                        self.popAdverTisement()
-                        AdvManager.shared.finisedCallBack = {
-                            callblock()
-                        }
-                    }
-                }
+                callblock()
             }
         }else {
             callblock()