Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo

Conflicts: VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
Conflicts: VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
朱林
2 parents 3d05d7a1 ce636068
Showing 5 changed files with 34 additions and 7 deletions
VLionADSDKDemo/VLionADSDKDemo/AppDelegate.m
VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/bg_launch_1242.imageset/bg_launch_1242.png
VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/bg_launch_1242.imageset/Contents.json → VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/placeholderImage.imageset/Contents.json
VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/placeholderImage.imageset/bg_launch 1242_2208.png
VLionADSDKDemo/VLionADSDKDemo/NativeAdListsController.m
@@ -28,12 +28,14 @@
     configuration.skipButtonType = AdSkipButtonTypeTimeAndText;
     configuration.frame = [UIScreen mainScreen].bounds;
-    UIImage *image = [UIImage imageNamed:@""];
+    //开屏广告占位图建议与启动页LaunchImage相同
+    UIImage *image = [UIImage imageNamed:@"placeholderImage"];
     [[VLionManager manager] vl_setupLaunchAdWithTagId:@"444" configuration:configuration keyWindow:[[UIApplication sharedApplication].delegate window] placeholderImage:image completeBlock:^(CGFloat w, CGFloat h, UIWindow * _Nonnull window) {
         NSLog(@"%f>>>>>%f>>>>>%@",w,h,window);
+        // 可以根据返回的物料数据重新设置开屏广告大小
         //        window.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*h/w);
     } successBlock:^{
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "bg_launch_1242.png",
+      "filename" : "bg_launch 1242_2208.png",
       "scale" : "1x"
     },
     {
@@ -54,7 +54,12 @@
             [[VLionManager manager] vl_nativeAdNewsWithTagId:@"" handler:^(VLionNativeAdNewsModel * _Nullable adModel, NSDictionary * _Nullable errorDic) {
                 NSLog(@"model:%@",adModel);
                 if (errorDic) {
-                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@",errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+                    NSString *tagid = [NSString stringWithFormat:@"%d",adModel.tagid];
+                    if(adModel.tagid == 0)
+                     {
+                         tagid = @"null";
+                     }
+                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@\n请求广告位id:%@",errorDic[@"errorCode"],errorDic[@"errorMessage"],tagid]];
                 }else
                 {
                     [self toast:[NSString stringWithFormat:@"model:%@",adModel]];
@@ -65,7 +70,12 @@
             [[VLionManager manager] vl_nativeAdAppWallWithTagId:@"" handler:^(VLionNativeAdAppWallModel * _Nullable adModel, NSDictionary * _Nullable errorDic) {
                 NSLog(@"model:%@",adModel);
                 if (errorDic) {
-                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@",errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+                    NSString *tagid = [NSString stringWithFormat:@"%d",adModel.tagid];
+                    if(adModel.tagid == 0)
+                    {
+                        tagid = @"null";
+                    }
+                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@\n请求广告位id:%@",errorDic[@"errorCode"],errorDic[@"errorMessage"],tagid]];
                 }else
                 {
                     [self toast:[NSString stringWithFormat:@"model:%@",adModel]];
@@ -77,7 +87,12 @@
             [[VLionManager manager] vl_nativeAdShufflingWithTagId:@"339" handler:^(VLionNativeAdShufflingModel * _Nullable adModel, NSDictionary * _Nullable errorDic) {
                 NSLog(@"model:%@",adModel);
                 if (errorDic) {
-                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@",errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+                    NSString *tagid = [NSString stringWithFormat:@"%d",adModel.tagid];
+                    if(adModel.tagid == 0)
+                    {
+                        tagid = @"null";
+                    }
+                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@\n请求广告位id:%@",errorDic[@"errorCode"],errorDic[@"errorMessage"],tagid]];
                 }else
                 {
                     NSString *string = @"";
@@ -118,7 +133,12 @@
             [[VLionManager manager] vl_nativeAdWaterfallWithTagId:@"" handler:^(VLionNativeAdWaterfallModel * _Nullable adModel, NSDictionary * _Nullable errorDic) {
                 NSLog(@"model:%@",adModel);
                 if (errorDic) {
-                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@",errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+                    NSString *tagid = [NSString stringWithFormat:@"%d",adModel.tagid];
+                    if(adModel.tagid == 0)
+                    {
+                        tagid = @"null";
+                    }
+                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@\n请求广告位id:%@",errorDic[@"errorCode"],errorDic[@"errorMessage"],tagid]];
                 }else
                 {
                     [self toast:[NSString stringWithFormat:@"model:%@",adModel]];
@@ -129,7 +149,12 @@
         case 10004: {//信息流
             [[VLionManager manager] vl_nativeAdInformationFlowWithTagId:@"425" handler:^(VLionNativeAdInformationFlowModel * _Nullable adModel, NSDictionary * _Nullable errorDic) {
                 if (errorDic) {
-                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@",errorDic[@"errorCode"],errorDic[@"errorMessage"]]];
+                    NSString *tagid = [NSString stringWithFormat:@"%d",adModel.tagid];
+                    if(adModel.tagid == 0)
+                    {
+                        tagid = @"null";
+                    }
+                    [self toast:[NSString stringWithFormat:@"错误码:%@,%@\n请求广告位id:%@",errorDic[@"errorCode"],errorDic[@"errorMessage"],tagid]];
                 }else
                 {
                     NSString *string = @"";