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

GYDemo/GYDemo/GYPrefixHeader.pch

@@ -50,6 +50,7 @@
 
 #define NSLog(format, ...) printf("\n[%s] %s [%d行] %s\n", __TIME__, __FUNCTION__, __LINE__, [[NSString stringWithFormat:format, ## __VA_ARGS__] UTF8String]);
 
+
 #else
 
 #define NSLog(format, ...) nil

GYDemo/GYDemo/SCAds/IOSADManager.h

@@ -70,6 +70,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic ,retain)NSMutableArray * loadADDataArray; //正在加载 广告
 
+
 @property (nonatomic ,retain)NSString * advertisingSpace; // 当前广告位  出入后会在广告展示 结束后上报 
 
 

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -628,8 +628,12 @@ static IOSADManager * manager = nil;
     }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){
+        
+        
         [NSObject cancelPreviousPerformRequestsWithTarget:self];
 
         weakSelf.haveLodeAD = NO;
@@ -718,6 +722,8 @@ static IOSADManager * manager = nil;
         [self trackingADWith:model.showfail_tracking.firstObject];
     }
     
+    [self.loadADDataArray removeObject:self.loadADDataArray.firstObject];
+
     if(model.loadADType == ADType_Video){
 //        [NSObject cancelPreviousPerformRequestsWithTarget:self];
         
@@ -737,6 +743,10 @@ static IOSADManager * manager = nil;
             self.showNow = YES;
             [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_display_failed"];
             
+            if (model.ADError) {
+                NSLog(@"%@",model.ADError);
+            }
+            
             if (self.advertisingSpace) {
                 NSString * errorValue =  [NSString stringWithFormat:@"show_fail_reward_video_ad_%@_%@_%@",model.adPlatform,model.codeId,model.ADError];
                 [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:errorValue andADData:model];
@@ -801,6 +811,7 @@ static IOSADManager * manager = nil;
 // 广告超时
 - (void)overtimeWith:(GYAdsTrackModel *)model{
     
+    return;
     if (model.loadADType == ADType_Video) {
         
         self.isTimeOut = YES;

GYDemo/GYDemo/SCAds/platform/AddCSJADManager.m

@@ -89,7 +89,12 @@
                     weakSelf.showSuccessCallbackBlock(showData, NO);
                 }
             }else{
-                weakSelf.showSuccessCallbackBlock(showData, NO);
+                if ([weakSelf.rewardedAd showAdFromRootViewController: [(AppDelegate *)[UIApplication sharedApplication].delegate getTopViewController]]) {
+                    
+                }else{
+                    weakSelf.showSuccessCallbackBlock(showData, NO);
+                }
+//                weakSelf.showSuccessCallbackBlock(showData, NO);
             }
         }else if (adType == ADType_BigImage){ //大图
             

GYDemo/GYDemo/SCAds/platform/AddSigmobADManager.m

@@ -72,15 +72,21 @@
             if (adType == ADType_OpenScreen) { // 开屏
                 
             }else if (adType == ADType_Video){ //视频
-                if ([[WindRewardedVideoAd sharedInstance] isReady:ADID]) {
-                    NSError * error = nil;
-                    [[WindRewardedVideoAd sharedInstance] playAd:weakSelf.currentVC withPlacementId:ADID options:@{} error:&error];
-                    if (error) {
-                        weakSelf.showSuccessCallbackBlock(showData, NO);
-                    }
-                }else{
+                NSError * error = nil;
+                [[WindRewardedVideoAd sharedInstance] playAd:weakSelf.currentVC withPlacementId:ADID options:@{} error:&error];
+                if (error) {
                     weakSelf.showSuccessCallbackBlock(showData, NO);
                 }
+                
+//                if ([[WindRewardedVideoAd sharedInstance] isReady:ADID]) {
+//                    NSError * error = nil;
+//                    [[WindRewardedVideoAd sharedInstance] playAd:weakSelf.currentVC withPlacementId:ADID options:@{} error:&error];
+//                    if (error) {
+//                        weakSelf.showSuccessCallbackBlock(showData, NO);
+//                    }
+//                }else{
+//                    weakSelf.showSuccessCallbackBlock(showData, NO);
+//                }
             }else if (adType == ADType_BigImage){ //大图
                 
             }