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

GYDemo/GYDemo.xcodeproj/project.pbxproj

@@ -1003,7 +1003,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 114;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
@@ -1035,7 +1035,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 114;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;

GYDemo/GYDemo/AppDelegate.mm

@@ -556,6 +556,8 @@ NSDictionary* appLaunchOpts;
 - (void)ios_adRedPackPlan {
     
     WEAKSELF
+    [IOSADManager shareADManager].advertisingSpace =  @"break_the_red_envelope";
+
     [[IOSADManager shareADManager] showADType:ADType_Video resultBlock:^(BOOL success) {
         if (success) {
             [[CGNetworkTools shared] postWithAction:open_plant_box parameters:@{} success:^(id  _Nonnull response) {
@@ -623,6 +625,8 @@ NSDictionary* appLaunchOpts;
 - (void)gainMultipleAward: (NSString *)sid {
     // 播放视频
     WEAKSELF
+    [IOSADManager shareADManager].advertisingSpace =  @"double_red_envelope";
+
     [[IOSADManager shareADManager] showADType:ADType_Video resultBlock:^(BOOL success) {
         if (success) {
             [[CGNetworkTools shared] postWithAction:awardMultiple parameters:@{@"sid": sid} success:^(id  _Nonnull response) {

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -405,6 +405,9 @@ static IOSADManager * manager = nil;
     if (adType == ADType_Video) {       // 视频
         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];
+        }
         dispatch_async(dispatch_get_main_queue(), ^{
             if ([showData.adPlatform  isEqualToString:@"chuanshanjia"]) {
                 [weakSelf.csjAd showAdWithData:showData withADType:adType];