Merge branch 'dev_main' into yQz0507

* dev_main:
  【新增】广告

PhoneManager/Class/Page/Compress/Controller/CompressController.swift

@@ -261,43 +261,7 @@ extension CompressController:WaterfallMutiSectionDelegate,UICollectionViewDataSo
     }
     
     func startCompress(model:AssetModel){
-        // 如果没有不进行下一步操作
-        if IAPManager.share.isSubscribed == false {
-            HomePayViewController.show {
-                if IAPManager.share.isSubscribed == false{
-                    // 弹出提示框
-                    self.view.showBlur()
-                    var frame = self.view.bounds
-                    frame.origin.y = frame.height
-                    let alertView = AdvTipSelectView()
-                    alertView.selectType = .selectTypeCompressPhoto
-                    alertView.getOtherInfoByType()
-                    alertView.modalPresentationStyle = .overFullScreen
-                    self.present(alertView, animated: true)
-                    alertView.selectClickCallback = {isSure in
-                        self.view.hideBlur()
-                        alertView.dismiss(animated: true) {
-                            if isSure {
-                                self.popAdverTisement()
-                                AdvManager.shared.finisedCallBack = {
-                                    self.jumpToNextPage(model: model)
-                                }
-                            }
-                        }
-                    }
-                }else {
-                    self.jumpToNextPage(model: model)
-                }
-                
-            }
-        }else {
-            self.jumpToNextPage(model: model)
-        }
-    }
-    
-    /// 弹出广告
-    func popAdverTisement(){
-        AdvManager.shared.showInterstitialAd(vc: self)
+        self.jumpToNextPage(model: model)
     }
     
     func jumpToNextPage(model:AssetModel){

PhoneManager/Class/Page/Compress/Controller/CompressQualityController.swift

@@ -271,6 +271,42 @@ class CompressQualityController : BaseViewController{
     }
     
     @objc func submitAction(){
+        
+        // 如果没有不进行下一步操作
+        if IAPManager.share.isSubscribed == false {
+            HomePayViewController.show {
+                if IAPManager.share.isSubscribed == false{
+                    // 弹出提示框
+                    self.view.showBlur()
+                    var frame = self.view.bounds
+                    frame.origin.y = frame.height
+                    let alertView = AdvTipSelectView()
+                    alertView.selectType = .selectTypeCompressPhoto
+                    alertView.getOtherInfoByType()
+                    alertView.modalPresentationStyle = .overFullScreen
+                    self.present(alertView, animated: true)
+                    alertView.selectClickCallback = {isSure in
+                        self.view.hideBlur()
+                        alertView.dismiss(animated: true) {
+                            if isSure {
+                                self.popAdverTisement()
+                                AdvManager.shared.finisedCallBack = {
+                                    self.jumpToNextPage()
+                                }
+                            }
+                        }
+                    }
+                }else {
+                    self.jumpToNextPage()
+                }
+                
+            }
+        }else {
+            self.jumpToNextPage()
+        }
+    }
+    
+    func jumpToNextPage(){
         // 跳转进度页面
         let vc : CompressingViewController = CompressingViewController()
         vc.model = self.model
@@ -278,5 +314,9 @@ class CompressQualityController : BaseViewController{
         vc.currentMediaType = self.currentMediaType
         self.navigationController?.pushViewController(vc, animated: true)
     }
+    /// 弹出广告
+    func popAdverTisement(){
+        AdvManager.shared.showInterstitialAd(vc: self)
+    }
 }
 

PhoneManager/Class/Page/Contact/View/Dup/MergeButtonView.swift

@@ -58,9 +58,26 @@ class MergeButtonView : UIView {
 }
 
 extension MergeButtonView {
+    
     @objc func merge (){
-        // 弹出提示框
-        alertWhenMergeContact()
+        if IAPManager.share.isSubscribed == false {
+            // 添加的时候需要先弹出广告
+            if AdvManager.shared.advTimeAfterInAPP <= 0{
+                if let vc = self.responderViewController() {
+                    AdvManager.shared.showInterstitialAd(vc: vc)
+                    AdvManager.shared.finisedCallBack = {
+                        self.alertWhenMergeContact()
+                    }
+                }else {
+                    self.alertWhenMergeContact()
+                }
+            }else {
+                self.alertWhenMergeContact()
+            }
+        }else {
+            self.alertWhenMergeContact()
+        }
+        
     }
     
     fileprivate func showMeegeAlert(_ self: MergeButtonView) {

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

@@ -115,7 +115,7 @@ class HomeViewController:BaseViewController {
         self.setupUI()
         
         // 调用下追踪权限
-//        checkTrackingAuthorization()
+        checkTrackingAuthorization()
         
         homeView = HomeView(frame: view.bounds)
         homeView?.y = cWindow?.safeAreaInsets.top ?? 20

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

@@ -103,7 +103,27 @@ class TrashSubView: UIView {
 
 extension TrashSubView {
     @objc func emptyButtonAction(){
-        self.clearTashDataCallBack()
+        
+        if IAPManager.share.isSubscribed == false {
+            HomePayViewController.show {
+                // 添加的时候需要先弹出广告
+                if AdvManager.shared.advTimeAfterInAPP <= 0{
+                    if  let vc = self.responderViewController() {
+                        AdvManager.shared.showInterstitialAd(vc: vc)
+                        AdvManager.shared.finisedCallBack = {
+                            self.clearTashDataCallBack()
+                        }
+                    }else {
+                        self.clearTashDataCallBack()
+                    }
+                }else {
+                    self.clearTashDataCallBack()
+                }
+            }
+        }else {
+            self.clearTashDataCallBack()
+        }
+        
     }
     @objc func tapHandle(){
         self.presentTashDetailViewClickCallBack()

PhoneManager/Class/Page/Secret/SecretViewController.swift

@@ -260,8 +260,7 @@ class SecretViewController: BaseViewController {
                             self.AddAction.show();
                             self.view.showBlur()
                             self.AddAction.callback = { idx in
-                                self.view.hideBlur()
-                                self.AddImagePicker(idx)
+                                popAdvThenDo(idx: idx)
                             }
                         }
                     }else {
@@ -269,8 +268,7 @@ class SecretViewController: BaseViewController {
                         self.view.showBlur()
                         self.AddAction.show();
                         self.AddAction.callback = { idx in
-                            self.view.hideBlur()
-                            self.AddImagePicker(idx)
+                            popAdvThenDo(idx: idx)
                         }
                     }
                     
@@ -279,8 +277,7 @@ class SecretViewController: BaseViewController {
                     self.view.showBlur()
                     self.AddAction.show();
                     self.AddAction.callback = { idx in
-                        self.view.hideBlur()
-                        self.AddImagePicker(idx)
+                        popAdvThenDo(idx: idx)
                     }
                 }
             }else if idx == 0 {
@@ -309,6 +306,20 @@ class SecretViewController: BaseViewController {
             func popAdverTisement(){
                 AdvManager.shared.showInterstitialAd(vc: self)
             }
+            
+            // 临时方法
+            func popAdvThenDo(idx : Int){
+                if AdvManager.shared.advTimeAfterInAPP <= 0{
+                    popAdverTisement()
+                    AdvManager.shared.finisedCallBack = {
+                        self.view.hideBlur()
+                        self.AddImagePicker(idx)
+                    }
+                }else {
+                    self.view.hideBlur()
+                    self.AddImagePicker(idx)
+                }
+            }
         }
         return b
     }()

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

@@ -188,6 +188,24 @@ extension TrashViewController:UIScrollViewDelegate{
     
     
     @objc func delBtnAction(){
+        if IAPManager.share.isSubscribed == false {
+            HomePayViewController.show {
+                // 添加的时候需要先弹出广告
+                if AdvManager.shared.advTimeAfterInAPP <= 0{
+                    AdvManager.shared.showInterstitialAd(vc: self)
+                    AdvManager.shared.finisedCallBack = {
+                        self.delMethod()
+                    }
+                }else {
+                    self.delMethod()
+                }
+            }
+        }else {
+            self.delMethod()
+        }
+    }
+    
+    func delMethod(){
         let info = self.getTypeByCurrentPage(pageIndex: currentPage)
         let data = TrashDataManager.getCurrentMediaTypeTrashData(mediaType: info.0)
         if data.count > 0 {