Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	GYDemo/GYDemo/AppDelegate.mm

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -12,6 +12,9 @@
 #import "AddRuiShiADManager.h"
 #import "AppDelegate.h"
 
+#define TIMEOUT (30)
+
+/// 广告工具类
 @interface IOSADManager ()
 
 @property (nonatomic ,retain)AddCSJADManager * csjAd;
@@ -143,10 +146,17 @@ static IOSADManager * manager = nil;
                 }
                 
             }else{
-                
+                static int timTouch = 0;
                 MBProgressHUD * hud = [MBProgressHUD showMessage:@"请稍等..."];
                 hud.minShowTime = 3;
-                
+                timTouch += 1;
+                if (timTouch >= 2) {
+                    timTouch = 0;
+                    self.haveLodeAD = NO;
+                    [self.videoModels removeObject:self.videoModels.firstObject];
+                    [self.cachevideo removeAllObjects];
+                    [self showADType:AdType resultBlock:self.adShowBlock];
+                }
                 self.showNow = YES;
 
                 if (!self.haveLodeAD) {
@@ -631,11 +641,6 @@ static IOSADManager * manager = nil;
             
         }
         
-//        dispatch_queue_t queueglobal = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0);
-//
-//        dispatch_async(queueglobal, ^{
-//            
-//        });
         
        
         
@@ -754,8 +759,16 @@ static IOSADManager * manager = nil;
         [self.bigImageModels removeObject:self.bigImageModels.firstObject];
     }
         
+}
+
+
+// 广告超时
+- (void)overtimeWith:(GYAdsTrackModel *)model{
+    
     
     
 }
 
+
+
 @end