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

# Conflicts: # VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
# Conflicts: # VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json
张旭
2 parents 30c0906f e69831a7
Showing 6 changed files with 47 additions and 20 deletions
VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
VLionADSDKDemo/VLionADSDKDemo/AppDelegate.m
VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json
VLionADSDKDemo/VLionADSDKDemo/Info.plist
VLionADSDKDemo/VLionADSDKDemo/VLionADSDK.framework/Headers/VLionManager.h
VLionADSDKDemo/VLionADSDKDemo/VLionADSDK.framework/VLionADSDK
@@ -10,8 +10,8 @@
 		817BA9941F9606E500599550 /* VLionAdImg.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 817BA9931F9606AB00599550 /* VLionAdImg.bundle */; };
 		81DC51D31F95FB7E0060EBE3 /* NativeAdListsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DC51D01F95FB7D0060EBE3 /* NativeAdListsController.m */; };
 		81DC51D41F95FB7E0060EBE3 /* BannerADController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DC51D21F95FB7E0060EBE3 /* BannerADController.m */; };
-		D26EC2031F9608DE00BA1D02 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */; };
-		D26EC2041F9608DE00BA1D02 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D21385641F960B93006D7DFF /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */; };
+		D21385671F960B9E006D7DFF /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D2ED41651F95F3BD00803E9D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2ED41641F95F3BD00803E9D /* AppDelegate.m */; };
 		D2ED41681F95F3BD00803E9D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2ED41671F95F3BD00803E9D /* ViewController.m */; };
 		D2ED416B1F95F3BD00803E9D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2ED41691F95F3BD00803E9D /* Main.storyboard */; };
@@ -21,13 +21,13 @@
 /* End PBXBuildFile section */
 /* Begin PBXCopyFilesBuildPhase section */
-		D2ED417C1F95F43700803E9D /* Embed Frameworks */ = {
+		D21385681F960B9E006D7DFF /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D26EC2041F9608DE00BA1D02 /* VLionADSDK.framework in Embed Frameworks */,
+				D21385671F960B9E006D7DFF /* VLionADSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -40,7 +40,7 @@
 		81DC51D01F95FB7D0060EBE3 /* NativeAdListsController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NativeAdListsController.m; sourceTree = "<group>"; };
 		81DC51D11F95FB7E0060EBE3 /* BannerADController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BannerADController.h; sourceTree = "<group>"; };
 		81DC51D21F95FB7E0060EBE3 /* BannerADController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BannerADController.m; sourceTree = "<group>"; };
-		D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
+		D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
 		D2ED41601F95F3BD00803E9D /* VLionAdSDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VLionAdSDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D2ED41631F95F3BD00803E9D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		D2ED41641F95F3BD00803E9D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -58,7 +58,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D26EC2031F9608DE00BA1D02 /* VLionADSDK.framework in Frameworks */,
+				D21385641F960B93006D7DFF /* VLionADSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -84,7 +84,7 @@
 		D2ED41621F95F3BD00803E9D /* VLionAdSDKDemo */ = {
 			isa = PBXGroup;
 			children = (
-				D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */,
+				D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */,
 				817BA9931F9606AB00599550 /* VLionAdImg.bundle */,
 				D2ED41631F95F3BD00803E9D /* AppDelegate.h */,
 				D2ED41641F95F3BD00803E9D /* AppDelegate.m */,
@@ -113,7 +113,7 @@
 				D2ED415C1F95F3BD00803E9D /* Sources */,
 				D2ED415D1F95F3BD00803E9D /* Frameworks */,
 				D2ED415E1F95F3BD00803E9D /* Resources */,
-				D2ED417C1F95F43700803E9D /* Embed Frameworks */,
+				D21385681F960B9E006D7DFF /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -18,7 +18,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
-    [[VLionManager manager] initVLionSDKWithAppId:@"171" appKey:@""];
+    [[VLionManager manager] initVLionSDKWithAppId:@"171"];
     VLionAdConfiguration *configuration = [[VLionAdConfiguration alloc] init];
@@ -88,11 +88,34 @@
       "idiom" : "ipad",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "bg_launch_1242.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "667h",
+      "filename" : "bg_launch_750.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
+      "filename" : "bg_launch_640_960-1.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
       "extent" : "full-screen",
       "scale" : "1x"
     },
@@ -101,6 +124,10 @@
       "idiom" : "iphone",
       "filename" : "bg_launch_640_960.png",
       "extent" : "full-screen",
+      "subtype" : "retina4",
+      "filename" : "bg_launch_640_1136-1.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
@@ -109,6 +136,7 @@
       "filename" : "bg_launch_640_1136.png",
       "extent" : "full-screen",
       "subtype" : "retina4",
+      "minimum-system-version" : "7.0",
       "scale" : "2x"
     },
     {
@@ -157,6 +185,9 @@
       "orientation" : "landscape",
       "idiom" : "ipad",
       "extent" : "full-screen",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
       "scale" : "2x"
     }
   ],
@@ -164,4 +195,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
 \ No newline at end of file
+}
@@ -4,11 +4,6 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -25,8 +20,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -26,11 +26,9 @@ typedef void(^VLionNativeAdInformationFlowHandler)(VLionNativeAdInformationFlowM
 @property (nonatomic, readonly) NSString *_Nonnull appId;
-@property (nonatomic, readonly) NSString *_Nonnull appKey;
-
 + (VLionManager *_Nonnull)manager;
-- (void)initVLionSDKWithAppId:(NSString *_Nonnull)appId appKey:(NSString *_Nonnull)appKey;
+- (void)initVLionSDKWithAppId:(NSString *_Nonnull)appId;
 /**
  开屏广告