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

Conflicts:
	GYDemo/GYDemo/SCAds/IOSADManager.m

GYDemo/GYDemo.xcodeproj/project.pbxproj

@@ -262,6 +262,30 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		68A872EE255D385F006E4A88 /* model */ = {
+			isa = PBXGroup;
+			children = (
+				A91A7973253F213100F9B216 /* GYAdsTrackModel.h */,
+				A91A7971253F213100F9B216 /* GYAdsTrackMode.m */,
+			);
+			path = model;
+			sourceTree = "<group>";
+		};
+		68A872EF255D3870006E4A88 /* platform */ = {
+			isa = PBXGroup;
+			children = (
+				68CA7395255BE17E002E73AD /* AddCSJADManager.h */,
+				68CA738F255BE17E002E73AD /* AddCSJADManager.m */,
+				68CA7390255BE17E002E73AD /* AddGDTADManager.h */,
+				68CA7392255BE17E002E73AD /* AddGDTADManager.m */,
+				68CA7394255BE17E002E73AD /* AddRuiShiADManager.h */,
+				68CA7396255BE17E002E73AD /* AddRuiShiADManager.m */,
+				68CA738D255BE17D002E73AD /* AddSigmobADManager.h */,
+				68CA738E255BE17E002E73AD /* AddSigmobADManager.m */,
+			);
+			path = platform;
+			sourceTree = "<group>";
+		};
 		A3BE8AD6E326D640425E6E5A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -455,16 +479,8 @@
 		A91A796F253F213100F9B216 /* SCAds */ = {
 			isa = PBXGroup;
 			children = (
-				A91A7973253F213100F9B216 /* GYAdsTrackModel.h */,
-				A91A7971253F213100F9B216 /* GYAdsTrackMode.m */,
-				68CA7395255BE17E002E73AD /* AddCSJADManager.h */,
-				68CA738F255BE17E002E73AD /* AddCSJADManager.m */,
-				68CA7390255BE17E002E73AD /* AddGDTADManager.h */,
-				68CA7392255BE17E002E73AD /* AddGDTADManager.m */,
-				68CA7394255BE17E002E73AD /* AddRuiShiADManager.h */,
-				68CA7396255BE17E002E73AD /* AddRuiShiADManager.m */,
-				68CA738D255BE17D002E73AD /* AddSigmobADManager.h */,
-				68CA738E255BE17E002E73AD /* AddSigmobADManager.m */,
+				68A872EE255D385F006E4A88 /* model */,
+				68A872EF255D3870006E4A88 /* platform */,
 				68CA7391255BE17E002E73AD /* IOSADManager.h */,
 				68CA7393255BE17E002E73AD /* IOSADManager.m */,
 			);

GYDemo/GYDemo/SCAds/IOSADManager.h

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

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -186,20 +186,15 @@ static IOSADManager * manager = nil;
 }
 
 
-
-
-
-
-
-
-
 /// 加载一条缓存
 /// @param loadADModel 广告对象
 /// @param AdType 广告类型
 - (void)loadAdWithData:(GYAdsTrackModel *)loadADModel withADType:(eADType )AdType;{
     self.haveLodeAD = YES;
     loadADModel.loadADType = AdType;
-    
+    if ([self.loadADDataArray count] > 6) {
+        [self.loadADDataArray removeObject:self.loadADDataArray.firstObject];
+    }
     WEAKSELF;
     if ([loadADModel.adPlatform  isEqualToString:@"chuanshanjia"]) { // 穿山甲
 
@@ -212,7 +207,7 @@ static IOSADManager * manager = nil;
             }else{
                 time = 5;
             }
-            //            去加载
+//            去加载
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 self.csjAd = nil;
                 AddCSJADManager * csjAd = [[AddCSJADManager alloc]init];
@@ -301,11 +296,16 @@ static IOSADManager * manager = nil;
             }else{
                 [adData.backups removeObject:adData.backups.firstObject];
             }
-            
             if (adData.backups.count) {
                 [self loadAdWithData:adData.backups.firstObject withADType:AdType];
             }else{
-                [self requestVideoAD];
+                [self.videoModels removeObject:self.videoModels.firstObject];
+                
+                if (self.videoModels.count) {
+                    [self loadAdWithData:self.videoModels.firstObject withADType:AdType];
+                }else{
+                    [self requestVideoAD];
+                }
             }
             
 
@@ -363,12 +363,11 @@ static IOSADManager * manager = nil;
         }else if ([showData.adPlatform  isEqualToString:@"ruishi"]){
             [self.ruishiAd showAdWithData:showData withADType:adType];
         }
-        
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [weakSelf requestVideoAD];
-        });
-        
-        
+        if (self.videoModels.count == 1) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [weakSelf requestVideoAD];
+            });
+        }
         
     }else if (adType == ADType_BigImage){ //大图
         
@@ -427,6 +426,8 @@ static IOSADManager * manager = nil;
     WEAKSELF;
     [[CGNetworkTools shared] getWithAdsAction:getAdsInfo parameters: @{@"slotName": @"common_bigimage"} success:^(id  _Nonnull response) {
         if ([[response objectForKey:@"status"] intValue] == 200) {
+            [[CGUserManager shared] addLocCollection:@"native_request" value:@"native_request_success"];
+
             NSMutableArray * models = [NSMutableArray new];
             NSArray * arr = response[@"result"][@"data"];
             for (NSDictionary * dict in arr) {
@@ -437,18 +438,19 @@ static IOSADManager * manager = nil;
                 model.backups = [GYAdsTrackModel mj_objectArrayWithKeyValuesArray:dict[@"backups"]];
                 [models addObject:model];
             }
-            
             [weakSelf.bigImageModels removeAllObjects];
             [weakSelf.bigImageModels addObjectsFromArray:models];
             if (weakSelf.cacheBigImg.count == 0 && models.count) {
                 [weakSelf loadAdWithData:weakSelf.bigImageModels.firstObject withADType:ADType_BigImage];
             }
         }else{
-            
+            [[CGUserManager shared] addLocCollection:@"native_request" value:@"native_request_failed"];
+
         }
         
     } failure:^(NSError * _Nonnull error) {
-       
+        [[CGUserManager shared] addLocCollection:@"native_request" value:@"native_request_failed"];
+
     }];
     
     
@@ -478,12 +480,18 @@ static IOSADManager * manager = nil;
                 [models addObject:model];
             }
             //添加至 备用数据
-            [weakSelf.videoModels removeAllObjects];
             [weakSelf.videoModels addObjectsFromArray:models];
             
             //有缓存 
-            if (weakSelf.cachevideo.count <= 1 && models.count) {
+            if (weakSelf.cachevideo.count == 0 && weakSelf.videoModels > 0) {
                 [weakSelf loadAdWithData:weakSelf.videoModels.firstObject withADType:ADType_Video];
+            }else{
+                if (weakSelf.videoModels.count >=2) {
+                    [weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
+                }else{
+                    NSLog(@">>>>weakSelf.cachevideo == %lu",(unsigned long)weakSelf.videoModels.count);
+                }
+                
             }
         }else{
             [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_request_failed"];
@@ -507,6 +515,7 @@ static IOSADManager * manager = nil;
     WEAKSELF;
     if (success) { //埋点
         [self trackingADWith:model.pullsucc_tracking.firstObject];
+
     }else{
         [self trackingADWith:model.pullfail_tracking.firstObject];
 
@@ -516,29 +525,39 @@ static IOSADManager * manager = nil;
         weakSelf.haveLodeAD = NO;
         [MBProgressHUD hideHUD];
         if (success) {
+            [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_back_success"];
             [weakSelf.cachevideo addObject:model];
             if(weakSelf.showNow){
                 [weakSelf showADType:ADType_Video resultBlock:self.adShowBlock];
             }
             
         }else{
+            [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_back_failed"];
             [weakSelf clearCache:model];
         }
         
     }else if(model.loadADType == ADType_OpenScreen){
         
         if(success){
+            [[CGUserManager shared] addLocCollection:@"splash_back" value:@"splash_back_success"];
+
             [weakSelf.cacheOpenScreen addObject:model];
             [weakSelf showADType:ADType_OpenScreen resultBlock:self.adShowBlock];
         }else{
+            [[CGUserManager shared] addLocCollection:@"splash_back" value:@"splash_back_failed"];
+
             [weakSelf clearCache:model];
         }
         
     }else if (model.loadADType == ADType_BigImage){ //原生
         if(success){
+            [[CGUserManager shared] addLocCollection:@"native_back" value:@"native_back_success"];
+
             [weakSelf.cacheBigImg addObject:model];
             [weakSelf showADType:ADType_BigImage resultBlock:self.adShowBlock];
         }else{
+            [[CGUserManager shared] addLocCollection:@"native_back" value:@"native_back_failed"];
+
             [weakSelf clearCache:model];
         }
         
@@ -559,25 +578,41 @@ static IOSADManager * manager = nil;
     }
     if(model.loadADType == ADType_Video){
         [weakSelf clearCache:model];
+        
         weakSelf.adShowBlock(success);
+        
         if (success) {
+            [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_display_success"];
             [[CGNetworkTools shared] postWithAction:adsEndReport parameters:@{} success:^(id  _Nonnull response) {
-           
             } failure:^(NSError * _Nonnull error) {
-          
             }];
+            
         }else{
+            [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_display_success"];
             
+
         }
     }else if(model.loadADType == ADType_OpenScreen){
-        [weakSelf clearCache:model];
+        if (success) {
+            [[CGUserManager shared] addLocCollection:@"splash_back" value:@"splash_display_success"];
+
+        }else{
+            [[CGUserManager shared] addLocCollection:@"splash_back" value:@"splash_display_failed"];
 
+        }
+        [weakSelf clearCache:model];
         weakSelf.adShowBlock(success);
         weakSelf.showNow = NO;
 
         [[NSNotificationCenter defaultCenter] postNotificationName: LaunchAdSuccesShow object:nil];
         
     }else if (model.loadADType == ADType_BigImage){ //原生
+        if (success) {
+            [[CGUserManager shared] addLocCollection:@"native_back" value:@"native_display_success"];
+        }else{
+            [[CGUserManager shared] addLocCollection:@"native_back" value:@"native_display_failed"];
+        }
+        
         [weakSelf clearCache:model];
 
         weakSelf.adShowBlock(success);