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

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -621,16 +621,7 @@ static IOSADManager * manager = nil;
 //MARK: 处理缓存 的回调
 - (void)blockResultLoadWithData:(GYAdsTrackModel *)model andSuccess:(BOOL)success{
     WEAKSELF;
-    if (success) { //埋点
-        [self trackingADWith:model.pullsucc_tracking.firstObject];
-        NSLog(@">>>>>>>  缓存 成功 平台 = %@ ID = %@  type= %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName);
-        model.cacheDate = [NSDate date]; // 缓存成功时间
-    }else{
-        [self trackingADWith:model.pullfail_tracking.firstObject];
-        NSLog(@">>>>>>>  缓存 失败 平台 = %@ ID = %@  type= %@  <<<<<<<<<",model.adPlatform,model.codeId,model.slotName);
-        [self.loadADDataArray removeObject:self.loadADDataArray.firstObject];
     
-    }
     if(model.loadADType == ADType_Video){
         
         
@@ -705,6 +696,16 @@ static IOSADManager * manager = nil;
         }
         
     }
+    if (success) { //埋点
+        [self trackingADWith:model.pullsucc_tracking.firstObject];
+        NSLog(@">>>>>>>  缓存 成功 平台 = %@ ID = %@  type= %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName);
+        model.cacheDate = [NSDate date]; // 缓存成功时间
+    }else{
+        [self trackingADWith:model.pullfail_tracking.firstObject];
+        NSLog(@">>>>>>>  缓存 失败 平台 = %@ ID = %@  type= %@  <<<<<<<<<",model.adPlatform,model.codeId,model.slotName);
+        [self.loadADDataArray removeObject:self.loadADDataArray.firstObject];
+
+    }
     
     
 }
@@ -722,7 +723,6 @@ static IOSADManager * manager = nil;
         [self trackingADWith:model.showfail_tracking.firstObject];
     }
 
-    [self.loadADDataArray removeObject:self.loadADDataArray.firstObject];
 
     if(model.loadADType == ADType_Video){
 //        [NSObject cancelPreviousPerformRequestsWithTarget:self];
@@ -784,6 +784,8 @@ static IOSADManager * manager = nil;
 
         
     }
+    [self.loadADDataArray removeObject:self.loadADDataArray.firstObject];
+
     
 }
 

GYDemo/GYDemo/SCAds/platform/AddSigmobADManager.m

@@ -73,10 +73,14 @@
                 
             }else if (adType == ADType_Video){ //视频
                 NSError * error = nil;
-                [[WindRewardedVideoAd sharedInstance] playAd:weakSelf.currentVC withPlacementId:ADID options:@{} error:&error];
+                if ([[WindRewardedVideoAd sharedInstance] playAd:weakSelf.currentVC withPlacementId:ADID options:@{} error:&error]) {
                     if (error) {
                         weakSelf.showSuccessCallbackBlock(showData, NO);
                     }
+                }else{
+                    weakSelf.showSuccessCallbackBlock(showData, NO);
+
+                }
                 
 //                if ([[WindRewardedVideoAd sharedInstance] isReady:ADID]) {
 //                    NSError * error = nil;