Skip to content

L
LuckFarm
Commit bfb48028 authored by Mazy's avatar Mazy
Browse files
Options

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

parents 57a38c6d 0fd68957
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 54 deletions
GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.m
View file @ bfb48028
......@@ -112,10 +112,12 @@
if (success) {
UIView * flowView = [IOSADManager shareADManager].flowBgView;
[self.adContentView addSubview:flowView];
if (flowView) {
[weakSelf.adContentView addSubview:flowView];
}
}
CGFloat offset = (UIScreen.mainScreen.bounds.size.height - self.mainContentView.bounds.size.height) / 2 - 40 - statusBarFrameHeight;
CGFloat offset = (UIScreen.mainScreen.bounds.size.height - weakSelf.mainContentView.bounds.size.height) / 2 - 40 - statusBarFrameHeight;
[UIView animateWithDuration:0.25 animations:^{
weakSelf.mainContentView.transform = CGAffineTransformMakeTranslation(0, -offset);
weakSelf.adContentView.transform = CGAffineTransformMakeTranslation(0, -offset);
......
GYDemo/GYDemo/SCAds/IOSADManager.m
View file @ bfb48028
......@@ -230,7 +230,9 @@ static IOSADManager * manager = nil;
/// @param AdType 广告类型
- (void)loadAdWithData:(GYAdsTrackModel *)loadADModel withADType:(eADType )AdType;{
NSLog(@">>>>>>> 准备缓存 平台 = %@ ID = %@ type= %@ <<<<<<<<<",loadADModel.adPlatform,loadADModel.codeId,loadADModel.slotName);
if (AdType == ADType_Video) {
NSLog(@">>>>>>> 🆚 %@ %@",[NSDate date],loadADModel.adPlatform);
}
self.haveLodeAD = YES;
loadADModel.loadADType = AdType;
if ([self.loadADDataArray count] > 6) {
......@@ -248,11 +250,15 @@ static IOSADManager * manager = nil;
if ([self contentADDataWith:loadADModel]) { //有数据
// 什么都不做或者 直接加载
}else{
NSInteger time = 0.1;
__block NSInteger time = 0.1;
if (self.csjAd == nil || self.loadADDataArray.count > 1) {
time = 0.1;
}else{
time = 5;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
time = 2;
});
}
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// 去加载
......@@ -427,22 +433,23 @@ static IOSADManager * manager = nil;
[weakSelf.ruishiAd showAdWithData:showData withADType:adType];
}
if ([showData.adPlatform isEqualToString:@"sigmob"]){
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (weakSelf.videoModels.count <= 1) {
[weakSelf requestVideoAD];
}else{
[weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
}
});
} else {
if (weakSelf.videoModels.count <= 1) {
[weakSelf requestVideoAD];
}else{
[weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
}
}
// if ([showData.adPlatform isEqualToString:@"sigmob"]){
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// if (weakSelf.videoModels.count <= 1) {
// [weakSelf requestVideoAD];
// }else{
// [weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
// }
// });
//
// } else {
// if (weakSelf.videoModels.count <= 1) {
// [weakSelf requestVideoAD];
// }else{
// [weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
// }
// }
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// if (weakSelf.videoModels.count <= 1) {
......@@ -644,6 +651,8 @@ static IOSADManager * manager = nil;
if(weakSelf.showNow){
[weakSelf showADType:ADType_Video resultBlock:weakSelf.adShowBlock];
}
NSLog(@">>>>>>> ✅ %@ %@",[NSDate date],model.adPlatform);
}else{
if (weakSelf.videoModels.count > weakSelf.cachevideo.count) {
......@@ -706,6 +715,7 @@ static IOSADManager * manager = nil;
[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);
......@@ -743,6 +753,7 @@ static IOSADManager * manager = nil;
if(model.loadADType == ADType_Video){
// [NSObject cancelPreviousPerformRequestsWithTarget:self];
weakSelf.adShowBlock(success);
......@@ -774,6 +785,12 @@ static IOSADManager * manager = nil;
[weakSelf clearCache:model];
if (weakSelf.videoModels.count < 1) {
[weakSelf requestVideoAD];
}else{
[weakSelf loadAdWithData:weakSelf.videoModels.firstObject withADType:ADType_Video];
}
}else if(model.loadADType == ADType_OpenScreen){
if (success) {
[[CGUserManager shared] addLocCollection:@"splash_back" value:@"splash_display_success"];
......
GYDemo/GYDemo/SCAds/platform/AddGDTADManager.m
View file @ bfb48028
......@@ -48,11 +48,11 @@
// });
}else if (AdType == ADType_Video){ //视频
GYAdsTrackModel * oldData = [IOSADManager shareADManager].cachevideo.firstObject;
if ([oldData.adPlatform isEqualToString: @"guangdiantong"]) {
self.loadSuccessCallbackBlock(self.currentData, NO);
return;
}
// GYAdsTrackModel * oldData = [IOSADManager shareADManager].cachevideo.firstObject;
// if ([oldData.adPlatform isEqualToString: @"guangdiantong"]) {
// self.loadSuccessCallbackBlock(self.currentData, NO);
// return;
// }
self.rewardVideoAd = [[GDTRewardVideoAd alloc] initWithPlacementId:model.codeId];
self.rewardVideoAd.videoMuted = NO;
......@@ -74,7 +74,7 @@
/// @param adType 广告类型
- (void)showAdWithData:(GYAdsTrackModel *)showData withADType:(eADType)adType;{
WEAKSELF
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
if (adType == ADType_OpenScreen) { // 开屏
}else if (adType == ADType_Video){ //视频
......
GYDemo/GYDemo/SCAds/platform/AddRuiShiADManager.m
View file @ bfb48028
......@@ -34,11 +34,11 @@
}else if (AdType == ADType_Video){ //视频
GYAdsTrackModel * oldData = [IOSADManager shareADManager].cachevideo.firstObject;
if ([oldData.adPlatform isEqualToString: @"ruishi"]) {
self.loadSuccessCallbackBlock(self.currentData, NO);
return;
}
// GYAdsTrackModel * oldData = [IOSADManager shareADManager].cachevideo.firstObject;
// if ([oldData.adPlatform isEqualToString: @"ruishi"]) {
// self.loadSuccessCallbackBlock(self.currentData, NO);
// return;
// }
NSString * ADID = model.codeId;
......
GYDemo/GYDemo/SCAds/platform/AddSigmobADManager.m
View file @ bfb48028
......@@ -34,11 +34,11 @@
}else if (AdType == ADType_Video){ //视频
GYAdsTrackModel * oldData = [IOSADManager shareADManager].cachevideo.firstObject;
if ([oldData.adPlatform isEqualToString: @"sigmob"]) {
weakSelf.loadSuccessCallbackBlock(weakSelf.currentData, NO);
return;
}
// GYAdsTrackModel * oldData = [IOSADManager shareADManager].cachevideo.firstObject;
// if ([oldData.adPlatform isEqualToString: @"sigmob"]) {
// weakSelf.loadSuccessCallbackBlock(weakSelf.currentData, NO);
// return;
// }
NSString * ADID = model.codeId;
......@@ -67,7 +67,6 @@
WEAKSELF
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
dispatch_async(dispatch_get_main_queue(), ^{
NSString * ADID = showData.codeId;
if (adType == ADType_OpenScreen) { // 开屏
......@@ -94,7 +93,7 @@
}else if (adType == ADType_BigImage){ //大图
}
});
});
......
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