iOS Team / VLionADSDKDemo · Commits

Commit 0d52b00a535376e8d4682140385dd441a757add5

Authored by 王军波
2 parents 9212bba9 b926c84f

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

# Conflicts:
#	VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
Inline Side-by-side
Showing 4 changed files with 39 additions and 14 deletions
VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
  View file @0d52b00
... ... @@ -10,10 +10,10 @@
10 10 817BA9941F9606E500599550 /* VLionAdImg.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 817BA9931F9606AB00599550 /* VLionAdImg.bundle */; };
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   - D22BE64B1F9F1EF800CB21E4 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */; };
14   - D22BE64D1F9F1EFD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  13 + D2188EA41F9F1CA8006BF9C8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2188EA31F9F1CA8006BF9C8 /* ViewController.m */; };
  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, ); }; };
15 16 D2ED41651F95F3BD00803E9D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2ED41641F95F3BD00803E9D /* AppDelegate.m */; };
16   - D2ED41681F95F3BD00803E9D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2ED41671F95F3BD00803E9D /* ViewController.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 */; };
19 19 D2ED41701F95F3BD00803E9D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2ED416E1F95F3BD00803E9D /* LaunchScreen.storyboard */; };
... ... @@ -27,7 +27,7 @@
27 27 dstPath = "";
28 28 dstSubfolderSpec = 10;
29 29 files = (
30   - D22BE64D1F9F1EFD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */,
  30 + D22BE5FF1F9F18AD00CB21E4 /* VLionADSDK.framework in Embed Frameworks */,
31 31 );
32 32 name = "Embed Frameworks";
33 33 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -40,12 +40,14 @@
40 40 81DC51D01F95FB7D0060EBE3 /* NativeAdListsController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NativeAdListsController.m; sourceTree = "<group>"; };
41 41 81DC51D11F95FB7E0060EBE3 /* BannerADController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BannerADController.h; sourceTree = "<group>"; };
42 42 81DC51D21F95FB7E0060EBE3 /* BannerADController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BannerADController.m; sourceTree = "<group>"; };
43   - D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
  43 + D2188D1B1F9EEEC0006BF9C8 /* VLionAdSDKDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = VLionAdSDKDemo.entitlements; sourceTree = "<group>"; };
  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>"; };
  46 + D25A58641F9750F200A72605 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
44 47 D2ED41601F95F3BD00803E9D /* VLionAdSDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VLionAdSDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
45 48 D2ED41631F95F3BD00803E9D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
46 49 D2ED41641F95F3BD00803E9D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
47 50 D2ED41661F95F3BD00803E9D /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
48   - D2ED41671F95F3BD00803E9D /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ViewController.m; path = "New Group/ViewController.m"; sourceTree = "<group>"; };
49 51 D2ED416A1F95F3BD00803E9D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
50 52 D2ED416C1F95F3BD00803E9D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
51 53 D2ED416F1F95F3BD00803E9D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
... ... @@ -58,18 +60,26 @@
58 60 isa = PBXFrameworksBuildPhase;
59 61 buildActionMask = 2147483647;
60 62 files = (
61   - D22BE64B1F9F1EF800CB21E4 /* VLionADSDK.framework in Frameworks */,
  63 + D22BE5FE1F9F18AD00CB21E4 /* VLionADSDK.framework in Frameworks */,
62 64 );
63 65 runOnlyForDeploymentPostprocessing = 0;
64 66 };
65 67 /* End PBXFrameworksBuildPhase section */
66 68  
67 69 /* Begin PBXGroup section */
  70 + D2188D1C1F9EEEC7006BF9C8 /* Frameworks */ = {
  71 + isa = PBXGroup;
  72 + children = (
  73 + );
  74 + name = Frameworks;
  75 + sourceTree = "<group>";
  76 + };
68 77 D2ED41571F95F3BD00803E9D = {
69 78 isa = PBXGroup;
70 79 children = (
71 80 D2ED41621F95F3BD00803E9D /* VLionAdSDKDemo */,
72 81 D2ED41611F95F3BD00803E9D /* Products */,
  82 + D2188D1C1F9EEEC7006BF9C8 /* Frameworks */,
73 83 );
74 84 sourceTree = "<group>";
75 85 };
... ... @@ -84,12 +94,14 @@
84 94 D2ED41621F95F3BD00803E9D /* VLionAdSDKDemo */ = {
85 95 isa = PBXGroup;
86 96 children = (
87   - D22BE64A1F9F1EF800CB21E4 /* VLionADSDK.framework */,
  97 + D2188D1B1F9EEEC0006BF9C8 /* VLionAdSDKDemo.entitlements */,
  98 + D25A58641F9750F200A72605 /* VLionADSDK.framework */,
  99 + D22BE5FC1F9F18A200CB21E4 /* VLionADSDK.framework */,
88 100 817BA9931F9606AB00599550 /* VLionAdImg.bundle */,
89 101 D2ED41631F95F3BD00803E9D /* AppDelegate.h */,
90 102 D2ED41641F95F3BD00803E9D /* AppDelegate.m */,
91 103 D2ED41661F95F3BD00803E9D /* ViewController.h */,
92   - D2ED41671F95F3BD00803E9D /* ViewController.m */,
  104 + D2188EA31F9F1CA8006BF9C8 /* ViewController.m */,
93 105 81DC51D11F95FB7E0060EBE3 /* BannerADController.h */,
94 106 81DC51D21F95FB7E0060EBE3 /* BannerADController.m */,
95 107 81DC51CF1F95FB7D0060EBE3 /* NativeAdListsController.h */,
... ... @@ -136,10 +148,18 @@
136 148 D2ED415F1F95F3BD00803E9D = {
137 149 CreatedOnToolsVersion = 9.0;
138 150 ProvisioningStyle = Automatic;
  151 + SystemCapabilities = {
  152 + com.apple.InAppPurchase = {
  153 + enabled = 0;
  154 + };
  155 + com.apple.Push = {
  156 + enabled = 0;
  157 + };
  158 + };
139 159 };
140 160 };
141 161 };
142   - buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionADSDKDemo" */;
  162 + buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionAdSDKDemo" */;
143 163 compatibilityVersion = "Xcode 8.0";
144 164 developmentRegion = en;
145 165 hasScannedForEncodings = 0;
... ... @@ -176,11 +196,11 @@
176 196 isa = PBXSourcesBuildPhase;
177 197 buildActionMask = 2147483647;
178 198 files = (
179   - D2ED41681F95F3BD00803E9D /* ViewController.m in Sources */,
180 199 D2ED41731F95F3BD00803E9D /* main.m in Sources */,
181 200 D2ED41651F95F3BD00803E9D /* AppDelegate.m in Sources */,
182 201 81DC51D41F95FB7E0060EBE3 /* BannerADController.m in Sources */,
183 202 81DC51D31F95FB7E0060EBE3 /* NativeAdListsController.m in Sources */,
  203 + D2188EA41F9F1CA8006BF9C8 /* ViewController.m in Sources */,
184 204 );
185 205 runOnlyForDeploymentPostprocessing = 0;
186 206 };
... ... @@ -326,6 +346,7 @@
326 346 FRAMEWORK_SEARCH_PATHS = (
327 347 "$(inherited)",
328 348 "$(PROJECT_DIR)/VLionAdSDKDemo",
  349 + "$(PROJECT_DIR)/VLionAdSDKDemo/SDWebImage",
329 350 );
330 351 INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
331 352 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
... ... @@ -353,6 +374,7 @@
353 374 FRAMEWORK_SEARCH_PATHS = (
354 375 "$(inherited)",
355 376 "$(PROJECT_DIR)/VLionAdSDKDemo",
  377 + "$(PROJECT_DIR)/VLionAdSDKDemo/SDWebImage",
356 378 );
357 379 INFOPLIST_FILE = VLionAdSDKDemo/Info.plist;
358 380 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
... ... @@ -369,7 +391,7 @@
369 391 /* End XCBuildConfiguration section */
370 392  
371 393 /* Begin XCConfigurationList section */
372   - D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionADSDKDemo" */ = {
  394 + D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionAdSDKDemo" */ = {
373 395 isa = XCConfigurationList;
374 396 buildConfigurations = (
375 397 D2ED41741F95F3BD00803E9D /* Debug */,
... ...
VLionADSDKDemo/VLionADSDKDemo/AppDelegate.m
  View file @0d52b00
... ... @@ -21,7 +21,6 @@
21 21 [[VLionManager manager] initVLionSDKWithAppId:@"171"];
22 22  
23 23 VLionAdConfiguration *configuration = [[VLionAdConfiguration alloc] init];
24   -
25 24 configuration.showFinishAnimate = ShowFinishAnimateFadein;
26 25 configuration.showFinishAnimateTime = 0.8;
27 26 configuration.contentMode = UIViewContentModeScaleAspectFit;
... ... @@ -30,7 +29,6 @@
30 29  
31 30 //开屏广告占位图建议与启动页LaunchImage相同
32 31 UIImage *image = [UIImage imageNamed:@"placeholderImage"];
33   -
34 32 NSString *tagId = @"332"; // 广告位Id
35 33 [[VLionManager manager] vl_setupLaunchAdWithTagId:tagId configuration:configuration keyWindow:[[UIApplication sharedApplication].delegate window] placeholderImage:image completeBlock:^(CGFloat w, CGFloat h, UIWindow * _Nonnull window) {
36 34  
... ...
VLionAdSDKDemo/VLionAdSDKDemo/VLionAdSDKDemo.entitlements 0 → 100644
  View file @0d52b00
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 +<plist version="1.0">
  4 +<dict/>
  5 +</plist>
... ...
VLionAdSDKDemo/VLionAdSDKDemo/New Group/ViewController.m renamed to VLionAdSDKDemo/VLionAdSDKDemo/ViewController.m
  View file @0d52b00