iOS Team / VLionADSDKDemo · Commits

Commit b926c84fe5e15ad835a912e828c06c7849cf0108

Authored by 张旭
2 parents 15ac7cbc 3cd953cf

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

# Conflicts:
#	VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
Inline Side-by-side
Showing 2 changed files with 17 additions and 9 deletions
VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
  View file @b926c84
... ... @@ -11,8 +11,8 @@
11 11 81DC51D31F95FB7E0060EBE3 /* NativeAdListsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DC51D01F95FB7D0060EBE3 /* NativeAdListsController.m */; };
12 12 81DC51D41F95FB7E0060EBE3 /* BannerADController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81DC51D21F95FB7E0060EBE3 /* BannerADController.m */; };
13 13 D2188EA41F9F1CA8006BF9C8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2188EA31F9F1CA8006BF9C8 /* ViewController.m */; };
14   - D25A58651F9750F200A72605 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25A58641F9750F200A72605 /* VLionADSDK.framework */; };
15   - D25A58671F9750F700A72605 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25A58641F9750F200A72605 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  14 + D22BE5FE1F9F18AD00CB21E4 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */; };
  15 + D22BE5FF1F9F18AD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
16 16 D2ED41651F95F3BD00803E9D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2ED41641F95F3BD00803E9D /* AppDelegate.m */; };
17 17 D2ED416B1F95F3BD00803E9D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2ED41691F95F3BD00803E9D /* Main.storyboard */; };
18 18 D2ED416D1F95F3BD00803E9D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2ED416C1F95F3BD00803E9D /* Assets.xcassets */; };
... ... @@ -27,7 +27,7 @@
27 27 dstPath = "";
28 28 dstSubfolderSpec = 10;
29 29 files = (
30   - D25A58671F9750F700A72605 /* VLionADSDK.framework in Embed Frameworks */,
  30 + D22BE5FF1F9F18AD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */,
31 31 );
32 32 name = "Embed Frameworks";
33 33 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -42,6 +42,7 @@
42 42 81DC51D21F95FB7E0060EBE3 /* BannerADController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BannerADController.m; sourceTree = "<group>"; };
43 43 D2188D1B1F9EEEC0006BF9C8 /* VLionAdSDKDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = VLionAdSDKDemo.entitlements; sourceTree = "<group>"; };
44 44 D2188EA31F9F1CA8006BF9C8 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
  45 + D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
45 46 D25A58641F9750F200A72605 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
46 47 D2ED41601F95F3BD00803E9D /* VLionAdSDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VLionAdSDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
47 48 D2ED41631F95F3BD00803E9D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
... ... @@ -59,7 +60,7 @@
59 60 isa = PBXFrameworksBuildPhase;
60 61 buildActionMask = 2147483647;
61 62 files = (
62   - D25A58651F9750F200A72605 /* VLionADSDK.framework in Frameworks */,
  63 + D22BE5FE1F9F18AD00CB21E4 /* VLionADSDK.framework in Frameworks */,
63 64 );
64 65 runOnlyForDeploymentPostprocessing = 0;
65 66 };
... ... @@ -95,6 +96,7 @@
95 96 children = (
96 97 D2188D1B1F9EEEC0006BF9C8 /* VLionAdSDKDemo.entitlements */,
97 98 D25A58641F9750F200A72605 /* VLionADSDK.framework */,
  99 + D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */,
98 100 817BA9931F9606AB00599550 /* VLionAdImg.bundle */,
99 101 D2ED41631F95F3BD00803E9D /* AppDelegate.h */,
100 102 D2ED41641F95F3BD00803E9D /* AppDelegate.m */,
... ... @@ -234,6 +236,7 @@
234 236 CLANG_CXX_LIBRARY = "libc++";
235 237 CLANG_ENABLE_MODULES = YES;
236 238 CLANG_ENABLE_OBJC_ARC = YES;
  239 + CLANG_MODULES_AUTOLINK = YES;
237 240 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
238 241 CLANG_WARN_BOOL_CONVERSION = YES;
239 242 CLANG_WARN_COMMA = YES;
... ... @@ -289,6 +292,7 @@
289 292 CLANG_CXX_LIBRARY = "libc++";
290 293 CLANG_ENABLE_MODULES = YES;
291 294 CLANG_ENABLE_OBJC_ARC = YES;
  295 + CLANG_MODULES_AUTOLINK = YES;
292 296 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
293 297 CLANG_WARN_BOOL_CONVERSION = YES;
294 298 CLANG_WARN_COMMA = YES;
... ... @@ -333,6 +337,7 @@
333 337 buildSettings = {
334 338 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
335 339 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  340 + CLANG_MODULES_AUTOLINK = YES;
336 341 CODE_SIGN_IDENTITY = "iPhone Distribution: Beijing CNLive Culture Media Inc.";
337 342 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
338 343 CODE_SIGN_STYLE = Automatic;
... ... @@ -346,7 +351,8 @@
346 351 INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
347 352 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
348 353 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
349   - PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive";
  354 + OTHER_LDFLAGS = "-ObjC";
  355 + PRODUCT_BUNDLE_IDENTIFIER = cn.vlion.VLionAdSDKDemo;
350 356 PRODUCT_NAME = "$(TARGET_NAME)";
351 357 PROVISIONING_PROFILE = "";
352 358 PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -359,6 +365,7 @@
359 365 buildSettings = {
360 366 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
361 367 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  368 + CLANG_MODULES_AUTOLINK = YES;
362 369 CODE_SIGN_IDENTITY = "iPhone Distribution: Beijing CNLive Culture Media Inc.";
363 370 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
364 371 CODE_SIGN_STYLE = Automatic;
... ... @@ -372,7 +379,8 @@
372 379 INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
373 380 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
374 381 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
375   - PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive";
  382 + OTHER_LDFLAGS = "-ObjC";
  383 + PRODUCT_BUNDLE_IDENTIFIER = cn.vlion.VLionAdSDKDemo;
376 384 PRODUCT_NAME = "$(TARGET_NAME)";
377 385 PROVISIONING_PROFILE = "";
378 386 PROVISIONING_PROFILE_SPECIFIER = "";
... ...
VLionADSDKDemo/VLionADSDKDemo/Info.plist
  View file @b926c84
... ... @@ -5,7 +5,7 @@
5 5 <key>CFBundleDevelopmentRegion</key>
6 6 <string>$(DEVELOPMENT_LANGUAGE)</string>
7 7 <key>CFBundleDisplayName</key>
8   - <string>互动电视</string>
  8 + <string>瑞狮广告</string>
9 9 <key>CFBundleExecutable</key>
10 10 <string>$(EXECUTABLE_NAME)</string>
11 11 <key>CFBundleIdentifier</key>
... ... @@ -17,7 +17,7 @@
17 17 <key>CFBundlePackageType</key>
18 18 <string>APPL</string>
19 19 <key>CFBundleShortVersionString</key>
20   - <string>5.5.5</string>
  20 + <string>1.0</string>
21 21 <key>CFBundleURLTypes</key>
22 22 <array>
23 23 <dict>
... ... @@ -28,7 +28,7 @@
28 28 </dict>
29 29 </array>
30 30 <key>CFBundleVersion</key>
31   - <string>5.5.5.091218</string>
  31 + <string>1</string>
32 32 <key>LSRequiresIPhoneOS</key>
33 33 <true/>
34 34 <key>NSAppTransportSecurity</key>
... ...