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 15ac7cbc 3cd953cf
Showing 2 changed files with 17 additions and 9 deletions
VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
VLionADSDKDemo/VLionADSDKDemo/Info.plist
@@ -11,8 +11,8 @@
 		81DC51D31F95FB7E0060EBE3 /* NativeAdListsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DC51D01F95FB7D0060EBE3 /* NativeAdListsController.m */; };
 		81DC51D41F95FB7E0060EBE3 /* BannerADController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DC51D21F95FB7E0060EBE3 /* BannerADController.m */; };
 		D2188EA41F9F1CA8006BF9C8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2188EA31F9F1CA8006BF9C8 /* ViewController.m */; };
-		D25A58651F9750F200A72605 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25A58641F9750F200A72605 /* VLionADSDK.framework */; };
-		D25A58671F9750F700A72605 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25A58641F9750F200A72605 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		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 */; };
 		D2ED416B1F95F3BD00803E9D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2ED41691F95F3BD00803E9D /* Main.storyboard */; };
 		D2ED416D1F95F3BD00803E9D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2ED416C1F95F3BD00803E9D /* Assets.xcassets */; };
@@ -27,7 +27,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D25A58671F9750F700A72605 /* VLionADSDK.framework in Embed Frameworks */,
+				D22BE5FF1F9F18AD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -42,6 +42,7 @@
 		81DC51D21F95FB7E0060EBE3 /* BannerADController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BannerADController.m; 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>"; };
@@ -59,7 +60,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D25A58651F9750F200A72605 /* VLionADSDK.framework in Frameworks */,
+				D22BE5FE1F9F18AD00CB21E4 /* VLionADSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -95,6 +96,7 @@
 			children = (
 				D2188D1B1F9EEEC0006BF9C8 /* VLionAdSDKDemo.entitlements */,
 				D25A58641F9750F200A72605 /* VLionADSDK.framework */,
+				D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */,
 				817BA9931F9606AB00599550 /* VLionAdImg.bundle */,
 				D2ED41631F95F3BD00803E9D /* AppDelegate.h */,
 				D2ED41641F95F3BD00803E9D /* AppDelegate.m */,
@@ -234,6 +236,7 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_MODULES_AUTOLINK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -289,6 +292,7 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_MODULES_AUTOLINK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -333,6 +337,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_MODULES_AUTOLINK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Beijing CNLive Culture Media Inc.";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
@@ -346,7 +351,8 @@
 				INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = cn.vlion.VLionAdSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -359,6 +365,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_MODULES_AUTOLINK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Beijing CNLive Culture Media Inc.";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
@@ -372,7 +379,8 @@
 				INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = cn.vlion.VLionAdSDKDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>互动电视</string>
+	<string>瑞狮广告</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.5.5</string>
+	<string>1.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -28,7 +28,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5.5.5.091218</string>
+	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>