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 9212bba9 b926c84f
Showing 4 changed files with 39 additions and 14 deletions
VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
VLionADSDKDemo/VLionADSDKDemo/AppDelegate.m
VLionAdSDKDemo/VLionAdSDKDemo/VLionAdSDKDemo.entitlements
VLionAdSDKDemo/VLionAdSDKDemo/New Group/ViewController.m → VLionAdSDKDemo/VLionAdSDKDemo/ViewController.m
@@ -10,10 +10,10 @@
 		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 */; };
-		D22BE64B1F9F1EF800CB21E4 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */; };
-		D22BE64D1F9F1EFD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D2188EA41F9F1CA8006BF9C8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2188EA31F9F1CA8006BF9C8 /* ViewController.m */; };
+		D22BE5FE1F9F18AD00CB21E4 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */; };
+		D22BE5FF1F9F18AD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE5FC1F9F18A200CB21E4 /* 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 */; };
 		D2ED416D1F95F3BD00803E9D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2ED416C1F95F3BD00803E9D /* Assets.xcassets */; };
 		D2ED41701F95F3BD00803E9D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2ED416E1F95F3BD00803E9D /* LaunchScreen.storyboard */; };
@@ -27,7 +27,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D22BE64D1F9F1EFD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */,
+				D22BE5FF1F9F18AD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -40,12 +40,14 @@
 		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>"; };
-		D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
+		D2188D1B1F9EEEC0006BF9C8 /* VLionAdSDKDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = VLionAdSDKDemo.entitlements; sourceTree = "<group>"; };
+		D2188EA31F9F1CA8006BF9C8 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
+		D25A58641F9750F200A72605 /* 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>"; };
 		D2ED41661F95F3BD00803E9D /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		D2ED41671F95F3BD00803E9D /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ViewController.m; path = "New Group/ViewController.m"; sourceTree = "<group>"; };
 		D2ED416A1F95F3BD00803E9D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		D2ED416C1F95F3BD00803E9D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		D2ED416F1F95F3BD00803E9D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -58,18 +60,26 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D22BE64B1F9F1EF800CB21E4 /* VLionADSDK.framework in Frameworks */,
+				D22BE5FE1F9F18AD00CB21E4 /* VLionADSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
+		D2188D1C1F9EEEC7006BF9C8 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		D2ED41571F95F3BD00803E9D = {
 			isa = PBXGroup;
 			children = (
 				D2ED41621F95F3BD00803E9D /* VLionAdSDKDemo */,
 				D2ED41611F95F3BD00803E9D /* Products */,
+				D2188D1C1F9EEEC7006BF9C8 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -84,12 +94,14 @@
 		D2ED41621F95F3BD00803E9D /* VLionAdSDKDemo */ = {
 			isa = PBXGroup;
 			children = (
-				D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */,
+				D2188D1B1F9EEEC0006BF9C8 /* VLionAdSDKDemo.entitlements */,
+				D25A58641F9750F200A72605 /* VLionADSDK.framework */,
+				D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */,
 				817BA9931F9606AB00599550 /* VLionAdImg.bundle */,
 				D2ED41631F95F3BD00803E9D /* AppDelegate.h */,
 				D2ED41641F95F3BD00803E9D /* AppDelegate.m */,
 				D2ED41661F95F3BD00803E9D /* ViewController.h */,
-				D2ED41671F95F3BD00803E9D /* ViewController.m */,
+				D2188EA31F9F1CA8006BF9C8 /* ViewController.m */,
 				81DC51D11F95FB7E0060EBE3 /* BannerADController.h */,
 				81DC51D21F95FB7E0060EBE3 /* BannerADController.m */,
 				81DC51CF1F95FB7D0060EBE3 /* NativeAdListsController.h */,
@@ -136,10 +148,18 @@
 					D2ED415F1F95F3BD00803E9D = {
 						CreatedOnToolsVersion = 9.0;
 						ProvisioningStyle = Automatic;
+						SystemCapabilities = {
+							com.apple.InAppPurchase = {
+								enabled = 0;
+							};
+							com.apple.Push = {
+								enabled = 0;
+							};
+						};
 					};
 				};
 			};
-			buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionADSDKDemo" */;
+			buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionAdSDKDemo" */;
 			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -176,11 +196,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D2ED41681F95F3BD00803E9D /* ViewController.m in Sources */,
 				D2ED41731F95F3BD00803E9D /* main.m in Sources */,
 				D2ED41651F95F3BD00803E9D /* AppDelegate.m in Sources */,
 				81DC51D41F95FB7E0060EBE3 /* BannerADController.m in Sources */,
 				81DC51D31F95FB7E0060EBE3 /* NativeAdListsController.m in Sources */,
+				D2188EA41F9F1CA8006BF9C8 /* ViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -326,6 +346,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/VLionAdSDKDemo",
+					"$(PROJECT_DIR)/VLionAdSDKDemo/SDWebImage",
 				);
 				INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -353,6 +374,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/VLionAdSDKDemo",
+					"$(PROJECT_DIR)/VLionAdSDKDemo/SDWebImage",
 				);
 				INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -369,7 +391,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 */,
@@ -21,7 +21,6 @@
     [[VLionManager manager] initVLionSDKWithAppId:@"171"];
     VLionAdConfiguration *configuration = [[VLionAdConfiguration alloc] init];
-    
     configuration.showFinishAnimate = ShowFinishAnimateFadein;
     configuration.showFinishAnimateTime = 0.8;
     configuration.contentMode = UIViewContentModeScaleAspectFit;
@@ -30,7 +29,6 @@
     //开屏广告占位图建议与启动页LaunchImage相同
     UIImage *image = [UIImage imageNamed:@"placeholderImage"];
-    
     NSString *tagId = @"332"; // 广告位Id
     [[VLionManager manager] vl_setupLaunchAdWithTagId:tagId configuration:configuration keyWindow:[[UIApplication sharedApplication].delegate window] placeholderImage:image completeBlock:^(CGFloat w, CGFloat h, UIWindow * _Nonnull window) {
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>