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

张旭
2 parents 5dcebb76 ccd36aba
Showing 5 changed files with 18 additions and 6 deletions
VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
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
@@ -139,7 +139,7 @@
 					};
 				};
 			};
-			buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionAdSDKDemo" */;
+			buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionADSDKDemo" */;
 			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -315,8 +315,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Beijing CNLive Culture Media Inc.";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
+				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/VLionAdSDKDemo",
@@ -326,6 +329,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.vlion.VLionAdSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -335,8 +340,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Beijing CNLive Culture Media Inc.";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
+				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/VLionAdSDKDemo",
@@ -346,6 +354,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.vlion.VLionAdSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -353,7 +363,7 @@
 /* End XCBuildConfiguration section */
 /* Begin XCConfigurationList section */
-		D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionAdSDKDemo" */ = {
+		D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionADSDKDemo" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D2ED41741F95F3BD00803E9D /* Debug */,
@@ -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"
     },
     {