merge

GYDemo/GYDemo/Network/CGNetworkTools.m

@@ -316,7 +316,7 @@ static CGNetworkTools* _tools = nil;
     } else {
         [dict setValue: @"AppStore" forKey: @"source"];
     }
-    [dict setValue: @"toutiao" forKey: @"source"];
+//    [dict setValue: @"toutiao" forKey: @"source"];
     
     NSString *uid = [[data Read] objectForKey:@"uid"]; 
     if (uid != nil) { [dict setValue: uid forKey: @"uid"]; }

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -224,7 +224,7 @@ static IOSADManager * manager = nil;
     [self trackingADWith:adModel.clk_tracking.firstObject];
     
     if (self.advertisingSpace) {
-        [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:@"click_reward_video_ad" andADData:adModel];
+        [[CGUserManager shared] addADLocCollection:@"click_reward_video_ad" value:self.advertisingSpace andADData:adModel];
     }
     
 }
@@ -418,7 +418,7 @@ static IOSADManager * manager = nil;
 //        NSLog(@">>>>>>>  正在播放 成功 平台 = %@ ID = %@ type =%@  <<<<<<<<<",showData.adPlatform,showData.codeId,showData.slotName);
         WEAKSELF;
         if (self.advertisingSpace) {
-            [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:@"show_reward_video_ad" andADData:showData];
+            [[CGUserManager shared] addADLocCollection:@"show_reward_video_ad" value:self.advertisingSpace andADData:showData];
         }
 
         if ([showData.adPlatform  isEqualToString:@"chuanshanjia"]) {
@@ -725,7 +725,7 @@ static IOSADManager * manager = nil;
         if (success) {
             [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_display_success"];
             if (self.advertisingSpace) {
-                [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:@"show_suc_reward_viode_ad" andADData:model];
+                [[CGUserManager shared] addADLocCollection:@"show_suc_reward_viode_ad" value:self.advertisingSpace andADData:model];
 
             }
             [[CGNetworkTools shared] postWithAction:adsEndReport parameters:@{} success:^(id  _Nonnull response) {
@@ -739,8 +739,10 @@ static IOSADManager * manager = nil;
             
             
             if (self.advertisingSpace) {
-                NSString * errorValue =  [NSString stringWithFormat:@"show_fail_reward_video_ad_%@_%@_%@",model.adPlatform,model.codeId,model.ADError.localizedDescription];
-                [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:errorValue andADData:model];
+//                NSString * errorValue =  [NSString stringWithFormat:@"show_fail_reward_video_ad_%@_%@_%@",model.adPlatform,model.codeId,model.ADError.localizedDescription];
+                NSString * errorValue =  [NSString stringWithFormat:@"show_fail_reward_video_ad"];
+
+                [[CGUserManager shared] addADLocCollection: errorValue value: self.advertisingSpace andADData:model];
 
             }
         }

GYDemo/GYDemo/UserManager/CGUserManager.m

@@ -197,9 +197,15 @@ static CGUserManager * manager;
     
     action = [NSString stringWithFormat:@"%@_%@_%@",model.adPlatform,action,value];
     
-    [dict setObject:action forKey: @"action"];
+    [dict setObject:action forKey: @"action"]; //事件
+    [dict setObject:value forKey: @"ad_model"]; //位置
+    [dict setObject:model.adPlatform forKey:@"ad_platform"];
     [dict setObject:model.codeId forKey:@"codeId"];
-    [dict setObject:@"guazinovel" forKey:@"event"];
+    
+    if (model.ADError) {
+        [dict setObject:model.ADError.localizedDescription forKey: @"ad_error"]; //错误信息
+    }
+    [dict setObject:@"ad" forKey:@"event"];
 
     [[CGNetworkTools shared] postWithLogCollection:logCollection parameters:dict success:^(id  _Nullable __autoreleasing * _Nullable response) {
     } failure:^(NSError * _Nonnull error) {