【优化】点击私密空间添加按钮点击广告

PhoneManager/Class/Session/Advertisement/Manager/AdvManager.swift

@@ -116,6 +116,11 @@ class AdvManager : NSObject,FullScreenContentDelegate {
     /// - Parameter completed: 准备完成后回调
     func showRewardedInterstitialAd(vc:UIViewController) {
         guard let ad = self.rewardedInterstitialAd else {
+            Task {
+                // 同时重新load两个广告内容
+                await self.loadInterstitial()
+                await self.loadRewardedInterstitialAd()
+            }
             // 这里如果还没有，则弹出框
             let alert = UIAlertController(title: nil, message: "Ad wasn't ready", preferredStyle: .alert)
             vc.present(alert, animated: true, completion: nil)

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

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

PhoneManager/Class/Session/Secret/SecretViewController.swift

@@ -240,14 +240,23 @@ class SecretViewController: BaseViewController {
             if b.state == .add {
                 if IAPManager.share.isSubscribed == false {
                     // 添加的时候需要先弹出广告
-                    popAdverTisement()
-                    AdvManager.shared.finisedCallBack = {
+                    if AdvManager.shared.advTimeAfterInAPP <= 0{
+                        popAdverTisement()
+                        AdvManager.shared.finisedCallBack = {
+                            self.AddAction = SecretActionView()
+                            self.AddAction.show();
+                            self.AddAction.callback = { idx in
+                                self.AddImagePicker(idx)
+                            }
+                        }
+                    }else {
                         self.AddAction = SecretActionView()
                         self.AddAction.show();
                         self.AddAction.callback = { idx in
                             self.AddImagePicker(idx)
                         }
                     }
+                    
                 }else {
                     self.AddAction = SecretActionView()
                     self.AddAction.show();

PhoneManager/Class/Tool/Singleton/Singleton.swift

@@ -33,7 +33,6 @@ class Singleton {
         AdvManager.shared.timer?.setEventHandler {
             AdvManager.shared.advTimeAfterInAPP -= 1
             if AdvManager.shared.advTimeAfterInAPP >= 0 {
-                print("剩余时间: \(AdvManager.shared.advTimeAfterInAPP) 秒")
             } else {
                 print("倒计时结束！")
                 AdvManager.shared.timer?.cancel()