Commit e1ff4d76 authored by zhangshuai's avatar zhangshuai

注释调试信息

删掉没用的代码
封装一清除广告对象的方法
parent 99f97c44
...@@ -233,19 +233,16 @@ static IOSADManager * manager = nil; ...@@ -233,19 +233,16 @@ static IOSADManager * manager = nil;
/// @param loadADModel 广告对象 /// @param loadADModel 广告对象
/// @param AdType 广告类型 /// @param AdType 广告类型
- (void)loadAdWithData:(GYAdsTrackModel *)loadADModel withADType:(eADType )AdType;{ - (void)loadAdWithData:(GYAdsTrackModel *)loadADModel withADType:(eADType )AdType;{
NSLog(@">>>>>>> 准备缓存 平台 = %@ ID = %@ type= %@ <<<<<<<<<",loadADModel.adPlatform,loadADModel.codeId,loadADModel.slotName); // NSLog(@">>>>>>> 准备缓存 平台 = %@ ID = %@ type= %@ <<<<<<<<<",loadADModel.adPlatform,loadADModel.codeId,loadADModel.slotName);
if (AdType == ADType_Video) { // if (AdType == ADType_Video) {
NSLog(@">>>>>>> 🆚 %@ %@",[NSDate date],loadADModel.adPlatform); // NSLog(@">>>>>>> 🆚 %@ %@",[NSDate date],loadADModel.adPlatform);
} // }
self.haveLodeAD = YES; self.haveLodeAD = YES;
loadADModel.loadADType = AdType; loadADModel.loadADType = AdType;
if ([self.loadADDataArray count] > 6) { if ([self.loadADDataArray count] > 6) {
[self.loadADDataArray removeObject:self.loadADDataArray.firstObject]; [self.loadADDataArray removeObject:self.loadADDataArray.firstObject];
} }
if (AdType == ADType_Video) { if (AdType == ADType_Video) {
#pragma mark - 延迟 做超时
[NSObject cancelPreviousPerformRequestsWithTarget:self];
[self performSelector:@selector(overtimeWith:) withObject:self.videoModels.firstObject afterDelay:TIMEOUT];
} }
WEAKSELF; WEAKSELF;
...@@ -270,7 +267,7 @@ static IOSADManager * manager = nil; ...@@ -270,7 +267,7 @@ static IOSADManager * manager = nil;
AddCSJADManager * csjAd = [[AddCSJADManager alloc]init]; AddCSJADManager * csjAd = [[AddCSJADManager alloc]init];
weakSelf.csjAd = csjAd; weakSelf.csjAd = csjAd;
[weakSelf.loadADDataArray addObject:csjAd]; [weakSelf.loadADDataArray addObject:csjAd];
NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId); // NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId);
csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) { csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
[weakSelf blockResultLoadWithData:model andSuccess:success]; [weakSelf blockResultLoadWithData:model andSuccess:success];
...@@ -292,7 +289,7 @@ static IOSADManager * manager = nil; ...@@ -292,7 +289,7 @@ static IOSADManager * manager = nil;
AddGDTADManager * csjAd = [[AddGDTADManager alloc]init]; AddGDTADManager * csjAd = [[AddGDTADManager alloc]init];
self.gdtAd = csjAd; self.gdtAd = csjAd;
[self.loadADDataArray addObject:csjAd]; [self.loadADDataArray addObject:csjAd];
NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId); // NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId);
csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) { csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
...@@ -314,7 +311,7 @@ static IOSADManager * manager = nil; ...@@ -314,7 +311,7 @@ static IOSADManager * manager = nil;
AddSigmobADManager * csjAd = [[AddSigmobADManager alloc]init]; AddSigmobADManager * csjAd = [[AddSigmobADManager alloc]init];
self.sigmobAd = csjAd; self.sigmobAd = csjAd;
[self.loadADDataArray addObject:csjAd]; [self.loadADDataArray addObject:csjAd];
NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId); // NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId);
csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) { csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
...@@ -337,7 +334,7 @@ static IOSADManager * manager = nil; ...@@ -337,7 +334,7 @@ static IOSADManager * manager = nil;
AddRuiShiADManager * csjAd = [[AddRuiShiADManager alloc]init]; AddRuiShiADManager * csjAd = [[AddRuiShiADManager alloc]init];
self.ruishiAd = csjAd; self.ruishiAd = csjAd;
[self.loadADDataArray addObject:csjAd]; [self.loadADDataArray addObject:csjAd];
NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId); // NSLog(@">>>>>>>%@ alloc codeid = %@",csjAd,loadADModel.codeId);
csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) { csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
...@@ -354,7 +351,7 @@ static IOSADManager * manager = nil; ...@@ -354,7 +351,7 @@ static IOSADManager * manager = nil;
if (self.videoModels.count > self.cachevideo.count) { if (self.videoModels.count > self.cachevideo.count) {
GYAdsTrackModel * adData = self.videoModels[self.cachevideo.count]; GYAdsTrackModel * adData = self.videoModels[self.cachevideo.count];
NSLog(@">>>>>>> 缓存 失败 %@ 不支持",adData.adPlatform); // NSLog(@">>>>>>> 缓存 失败 %@ 不支持",adData.adPlatform);
if (adData.firstFailure == NO) { if (adData.firstFailure == NO) {
adData.firstFailure = YES; adData.firstFailure = YES;
}else{ }else{
...@@ -418,7 +415,7 @@ static IOSADManager * manager = nil; ...@@ -418,7 +415,7 @@ static IOSADManager * manager = nil;
/// @param adType 广告类型 /// @param adType 广告类型
- (void)showAdWithData:(GYAdsTrackModel *)showData withADType:(eADType)adType;{ - (void)showAdWithData:(GYAdsTrackModel *)showData withADType:(eADType)adType;{
if (adType == ADType_Video) { // 视频 if (adType == ADType_Video) { // 视频
NSLog(@">>>>>>> 正在播放 成功 平台 = %@ ID = %@ type =%@ <<<<<<<<<",showData.adPlatform,showData.codeId,showData.slotName); // NSLog(@">>>>>>> 正在播放 成功 平台 = %@ ID = %@ type =%@ <<<<<<<<<",showData.adPlatform,showData.codeId,showData.slotName);
WEAKSELF; WEAKSELF;
if (self.advertisingSpace) { if (self.advertisingSpace) {
[[CGUserManager shared] addADLocCollection:self.advertisingSpace value:@"show_reward_video_ad" andADData:showData]; [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:@"show_reward_video_ad" andADData:showData];
...@@ -642,7 +639,6 @@ static IOSADManager * manager = nil; ...@@ -642,7 +639,6 @@ static IOSADManager * manager = nil;
if(model.loadADType == ADType_Video){ if(model.loadADType == ADType_Video){
[NSObject cancelPreviousPerformRequestsWithTarget:self];
weakSelf.haveLodeAD = NO; weakSelf.haveLodeAD = NO;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
...@@ -655,7 +651,7 @@ static IOSADManager * manager = nil; ...@@ -655,7 +651,7 @@ static IOSADManager * manager = nil;
if(weakSelf.showNow){ if(weakSelf.showNow){
[weakSelf showADType:ADType_Video resultBlock:weakSelf.adShowBlock]; [weakSelf showADType:ADType_Video resultBlock:weakSelf.adShowBlock];
} }
NSLog(@">>>>>>> ✅ %@ %@",[NSDate date],model.adPlatform); // NSLog(@">>>>>>> ✅ %@ %@",[NSDate date],model.adPlatform);
}else{ }else{
...@@ -717,21 +713,14 @@ static IOSADManager * manager = nil; ...@@ -717,21 +713,14 @@ static IOSADManager * manager = nil;
} }
if (success) { //埋点 if (success) { //埋点
[self trackingADWith:model.pullsucc_tracking.firstObject]; [self trackingADWith:model.pullsucc_tracking.firstObject];
NSLog(@">>>>>>> 缓存 成功 平台 = %@ ID = %@ type= %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName); // NSLog(@">>>>>>> 缓存 成功 平台 = %@ ID = %@ type= %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName);
model.cacheDate = [NSDate date]; // 缓存成功时间 model.cacheDate = [NSDate date]; // 缓存成功时间
}else{ }else{
[self trackingADWith:model.pullfail_tracking.firstObject]; [self trackingADWith:model.pullfail_tracking.firstObject];
NSLog(@">>>>>>> 缓存 失败 平台 = %@ ID = %@ type= %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName); // NSLog(@">>>>>>> 缓存 失败 平台 = %@ ID = %@ type= %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName);
for (int i = 0 ; i< self.loadADDataArray.count; i ++) { [self clearShowOrErrorDataWith:model];
IOSADManager * adManager = [self.loadADDataArray objectAtIndex:i];
if ([adManager.currentData isEqual:model] ) {
[self.loadADDataArray removeObject:adManager];
continue;;
}
}
} }
...@@ -745,11 +734,11 @@ static IOSADManager * manager = nil; ...@@ -745,11 +734,11 @@ static IOSADManager * manager = nil;
- (void)blockResultShowWithData:(GYAdsTrackModel *)model andSuccess:(BOOL)success;{ - (void)blockResultShowWithData:(GYAdsTrackModel *)model andSuccess:(BOOL)success;{
WEAKSELF; WEAKSELF;
if (success) { //埋点 if (success) { //埋点
NSLog(@">>>>>>> 展示 成功 平台 = %@ ID = %@ type = %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName); // NSLog(@">>>>>>> 展示 成功 平台 = %@ ID = %@ type = %@ <<<<<<<<<",model.adPlatform,model.codeId,model.slotName);
[self trackingADWith:model.imp_tracking.firstObject]; [self trackingADWith:model.imp_tracking.firstObject];
[self trackingADWith:model.playcomplete_trackings.firstObject]; [self trackingADWith:model.playcomplete_trackings.firstObject];
}else{ }else{
NSLog(@">>>>>>> 展示 失败 平台 = %@ ID = %@ %@ type = %@ <<<<<<<<<",model.adPlatform,model.codeId,model.ADError,model.slotName); // NSLog(@">>>>>>> 展示 失败 平台 = %@ ID = %@ %@ type = %@ <<<<<<<<<",model.adPlatform,model.codeId,model.ADError.localizedDescription,model.slotName);
[self trackingADWith:model.showfail_tracking.firstObject]; [self trackingADWith:model.showfail_tracking.firstObject];
MBProgressHUD * hud = [MBProgressHUD showMessage:@"请稍等..."]; MBProgressHUD * hud = [MBProgressHUD showMessage:@"请稍等..."];
hud.minShowTime = 3; hud.minShowTime = 3;
...@@ -758,8 +747,6 @@ static IOSADManager * manager = nil; ...@@ -758,8 +747,6 @@ static IOSADManager * manager = nil;
if(model.loadADType == ADType_Video){ if(model.loadADType == ADType_Video){
// [NSObject cancelPreviousPerformRequestsWithTarget:self];
weakSelf.adShowBlock(success); weakSelf.adShowBlock(success);
if (success) { if (success) {
...@@ -776,12 +763,10 @@ static IOSADManager * manager = nil; ...@@ -776,12 +763,10 @@ static IOSADManager * manager = nil;
self.showNow = YES; self.showNow = YES;
[[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_display_failed"]; [[CGUserManager shared] addLocCollection:@"reward_request" value:@"reward_display_failed"];
if (model.ADError) {
NSLog(@"%@",model.ADError);
}
if (self.advertisingSpace) { if (self.advertisingSpace) {
NSString * errorValue = [NSString stringWithFormat:@"show_fail_reward_video_ad_%@_%@_%@",model.adPlatform,model.codeId,model.ADError]; 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]; [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:errorValue andADData:model];
} }
...@@ -823,14 +808,8 @@ static IOSADManager * manager = nil; ...@@ -823,14 +808,8 @@ static IOSADManager * manager = nil;
} }
for (int i = 0 ; i< self.loadADDataArray.count; i ++) { [self clearShowOrErrorDataWith:model];
IOSADManager * adManager = [self.loadADDataArray objectAtIndex:i];
if ([adManager.currentData isEqual:model] ) {
[self.loadADDataArray removeObject:adManager];
continue;;
}
}
} }
...@@ -855,19 +834,19 @@ static IOSADManager * manager = nil; ...@@ -855,19 +834,19 @@ static IOSADManager * manager = nil;
} }
//MARK: 删除 广告对象从预加载中
- (void)clearShowOrErrorDataWith:(GYAdsTrackModel *)model{
for (int i = 0 ; i< self.loadADDataArray.count; i ++) {
IOSADManager * adManager = [self.loadADDataArray objectAtIndex:i];
// 广告超时 if ([adManager.currentData isEqual:model] ) {
- (void)overtimeWith:(GYAdsTrackModel *)model{ [self.loadADDataArray removeObject:adManager];
continue;;
return; }
if (model.loadADType == ADType_Video) {
self.isTimeOut = YES;
} }
} }
@end @end
...@@ -362,6 +362,11 @@ ...@@ -362,6 +362,11 @@
} }
} failure:^(NSError * _Nonnull error) { } failure:^(NSError * _Nonnull error) {
// NSLog(@"domain =%@",error.domain);
// NSLog(@"domain =%@",error.localizedDescription);
//
// NSLog(@"userInfo =%@",error.userInfo);
// NSLog(@"userInfo =%@",error.userInfo[@"NSLocalizedDescription"]);
}]; }];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment