【优化】评分弹出框不关闭，会员不弹广告

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

@@ -65,7 +65,6 @@ class HomeInfoViewController:BaseViewController {
             let fetchs = PHAsset.fetchAssets(withLocalIdentifiers: tempStringArray, options: nil)
             let fileSize = FileTool().calculateTotalAssetSize(fetchResult: fetchs)
             
-            //
             PhotoAndVideoMananger.deleteAssets(localIdentifiers: tempStringArray) {[weak self]  in
                 guard let self else {return}
                 
@@ -195,7 +194,7 @@ class HomeInfoViewController:BaseViewController {
                         }else{
                             // 如果只是一张，直接删除
                             HomePayViewController.show {
-                                deleteOp(imgs: array as! [AssetModel],isAfterAdv: false)
+                                deleteOp(imgs: array ,isAfterAdv: false)
                             }
                         }
                     }
@@ -204,14 +203,14 @@ class HomeInfoViewController:BaseViewController {
                 
                 view.deleteButtonClickCallback = {[weak self] isMore,deleteCount in
                     guard let self else {return}
-                    let finalyDeleteArray = array as! [AssetModel]
+                    let finalyDeleteArray = array 
                     var tempArr : [AssetModel] = []
                     for item in finalyDeleteArray {
                         if tempArr.count < deleteCount {
                             tempArr.append(item)
                         }
                     }
-                    if isMore == true {
+                    if isMore == true && HomePayModel.share.isNoAd == false {
                         self.popAdverTisement()
                         // 广告看完再结束
                         AdvManager.shared.finisedCallBack = {

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

@@ -538,7 +538,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
                 }
             }
             view.deleteButtonClickCallback = {isMore,deleteCount in
-                if isMore == true {
+                if isMore == true && HomePayModel.share.isNoAd == false {
                     self.popAdverTisement()
                     // 广告看完再结束
                     AdvManager.shared.finisedCallBack = {

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

@@ -441,7 +441,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
                 }
             }
             view.deleteButtonClickCallback = {isMore,deleteCount in
-                if isMore == true {
+                if isMore == true && HomePayModel.share.isNoAd == false {
                     self.popAdverTisement()
                     // 广告看完再结束
                     AdvManager.shared.finisedCallBack = {

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

@@ -188,7 +188,7 @@ class HomeViewController:BaseViewController {
             if let cIndex = index as? Int {
                 
                 // 先走广告策略
-                if AdvManager.shared.advTimeAfterInAPP <= 0 {
+                if AdvManager.shared.advTimeAfterInAPP <= 0 && HomePayModel.share.isNoAd == false {
                     AdvManager.shared.showInterstitialAd(vc: self)
                 }else {
                     junmToModule(cIndex, self)

PhoneManager/Class/Session/Public/Rate/CustomRateView.swift

@@ -32,7 +32,7 @@ class CustomRateView: UIView {
     }
     
     @IBAction func okClick(_ sender: Any) {
-        
+        viewRemoveAction()
         guard let url = URL(string: "https://apps.apple.com/us/app/id\(APPConfig.APPID)?action=write-review") else {
               return
           }
@@ -42,11 +42,17 @@ class CustomRateView: UIView {
     }
     
     @IBAction func noClick(_ sender: Any) {
-        self.alpha = 1
-        UIView.animate(withDuration: 0.2) {
-            self.alpha = 0
-        }completion: { _ in
-            self.removeFromSuperview()
+        viewRemoveAction()
+    }
+    
+    private func viewRemoveAction(){
+        DispatchQueue.main.async {
+            self.alpha = 1
+            UIView.animate(withDuration: 0.2) {
+                self.alpha = 0
+            }completion: { _ in
+                self.removeFromSuperview()
+            }
         }
     }
     

PhoneManager/Class/Session/Secret/SecretViewController.swift

@@ -237,7 +237,7 @@ class SecretViewController: BaseViewController {
         view.addSubview(b)
         b.callback = { [weak self] in
             guard let self = self else { return }
-            if b.state == .add {
+            if b.state == .add && HomePayModel.share.isNoAd == false {
                 // 添加的时候需要先弹出广告
                 popAdverTisement()
                 AdvManager.shared.finisedCallBack = {