修改

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

@@ -23,10 +23,10 @@ class AdvManager : NSObject,FullScreenContentDelegate {
     let defaultFreeTimes : Int = 3
     
     /// 广告策略  第一次可删除5张，第二次可删除5张，第三次可删除4张
-    let advDeleteResouceDic : [Int:Int] = [3:5,2:5,1:4]
+    let advDeleteResouceDic : [Int:Int] = [3:5,2:5,1:4,0:0]
     
     //  进入页面之后30秒
-    var advTimeAfterInAPP : Int = 30
+    var advTimeAfterInAPP : Int = 30000
     
     var timer: Timer?
     
@@ -134,6 +134,7 @@ class AdvManager : NSObject,FullScreenContentDelegate {
     /// 广告结束之后重置策略信息
     func updateAdvStrategyValue() {
         // 设置第二次等待时间15秒，15秒之内点击任何菜单不弹广告
+        AdvManager.shared.timer = nil
         AdvManager.shared.advTimeAfterInAPP = 15
         Singleton.shared.startCountdown {}
     }

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

@@ -56,8 +56,53 @@ class HomeInfoViewController:BaseViewController {
             }
         }
         
+        
+        
+        
         sview.deleteCallBack = { [weak self] array in
             guard let self = self else { return }
+            
+            // 首先看是否订阅
+            if HomePayModel.share.isNoAd == false {
+                // 没有订阅
+                
+                // 获取当前免费次数
+                let freeCount = AdvManager.shared.defaultFreeTimes
+                // 获取次数对应的删除照片数量
+                let freeDeleteCount = AdvManager.shared.advDeleteResouceDic[freeCount]!
+                Print(freeDeleteCount)
+                
+                // 如果数量等于0
+                
+                if freeDeleteCount == 0 {
+                    // 弹出单个删除类型
+                    // 跳弹窗
+                     let vc : AdvTipDeleteController = AdvTipDeleteController()
+                     vc.modalPresentationStyle = .fullScreen
+                     self.present(vc, animated: true)
+                }else {
+                    let tempArray = array as! [AssetModel]
+                    // 如果小于
+                    if tempArray.count > freeDeleteCount {
+                        // 弹出多个删除类型
+                        
+                    }
+                }
+                
+                
+               
+                
+                
+                
+            }
+            
+           
+            
+            
+            
+            
+            
+            
             let deleteOp:((Any)->Void) = {[weak self] imgs in
                 if let cA = imgs as? [AssetModel] {
                     var tempStringArray : [String] = []
@@ -91,14 +136,8 @@ class HomeInfoViewController:BaseViewController {
                 }
             }
             
-            func popAdvertisement(array:[AssetModel]){
-               // 跳弹窗
-                let vc : AdvTipDeleteController = AdvTipDeleteController()
-                
-                // fixme:继续广告逻辑
-                
-                
-            }
+            
+            
            
             
             if HomePayModel.share.isNoAd == false {