iOS Team / VLionADSDKDemo · Commits

Commit d1cdf28dccb08cdf15a22713dbdb6c3d62b53e0b

Authored by 张旭
2 parents 30c0906f e69831a7

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

# Conflicts:
#	VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json
Inline Side-by-side
Showing 6 changed files with 47 additions and 20 deletions
VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
  View file @d1cdf28
... ... @@ -10,8 +10,8 @@
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   - D26EC2031F9608DE00BA1D02 /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */; };
14   - D26EC2041F9608DE00BA1D02 /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  13 + D21385641F960B93006D7DFF /* VLionADSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */; };
  14 + D21385671F960B9E006D7DFF /* VLionADSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
15 15 D2ED41651F95F3BD00803E9D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2ED41641F95F3BD00803E9D /* AppDelegate.m */; };
16 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 */; };
... ... @@ -21,13 +21,13 @@
21 21 /* End PBXBuildFile section */
22 22  
23 23 /* Begin PBXCopyFilesBuildPhase section */
24   - D2ED417C1F95F43700803E9D /* Embed Frameworks */ = {
  24 + D21385681F960B9E006D7DFF /* Embed Frameworks */ = {
25 25 isa = PBXCopyFilesBuildPhase;
26 26 buildActionMask = 2147483647;
27 27 dstPath = "";
28 28 dstSubfolderSpec = 10;
29 29 files = (
30   - D26EC2041F9608DE00BA1D02 /* VLionADSDK.framework in Embed Frameworks */,
  30 + D21385671F960B9E006D7DFF /* VLionADSDK.framework in Embed Frameworks */,
31 31 );
32 32 name = "Embed Frameworks";
33 33 runOnlyForDeploymentPostprocessing = 0;
... ... @@ -40,7 +40,7 @@
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   - D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
  43 + D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VLionADSDK.framework; sourceTree = "<group>"; };
44 44 D2ED41601F95F3BD00803E9D /* VLionAdSDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VLionAdSDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
45 45 D2ED41631F95F3BD00803E9D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
46 46 D2ED41641F95F3BD00803E9D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
... ... @@ -58,7 +58,7 @@
58 58 isa = PBXFrameworksBuildPhase;
59 59 buildActionMask = 2147483647;
60 60 files = (
61   - D26EC2031F9608DE00BA1D02 /* VLionADSDK.framework in Frameworks */,
  61 + D21385641F960B93006D7DFF /* VLionADSDK.framework in Frameworks */,
62 62 );
63 63 runOnlyForDeploymentPostprocessing = 0;
64 64 };
... ... @@ -84,7 +84,7 @@
84 84 D2ED41621F95F3BD00803E9D /* VLionAdSDKDemo */ = {
85 85 isa = PBXGroup;
86 86 children = (
87   - D26EC2011F9608BA00BA1D02 /* VLionADSDK.framework */,
  87 + D26EC2051F960B7C00BA1D02 /* VLionADSDK.framework */,
88 88 817BA9931F9606AB00599550 /* VLionAdImg.bundle */,
89 89 D2ED41631F95F3BD00803E9D /* AppDelegate.h */,
90 90 D2ED41641F95F3BD00803E9D /* AppDelegate.m */,
... ... @@ -113,7 +113,7 @@
113 113 D2ED415C1F95F3BD00803E9D /* Sources */,
114 114 D2ED415D1F95F3BD00803E9D /* Frameworks */,
115 115 D2ED415E1F95F3BD00803E9D /* Resources */,
116   - D2ED417C1F95F43700803E9D /* Embed Frameworks */,
  116 + D21385681F960B9E006D7DFF /* Embed Frameworks */,
117 117 );
118 118 buildRules = (
119 119 );
... ...
VLionADSDKDemo/VLionADSDKDemo/AppDelegate.m
  View file @d1cdf28
... ... @@ -18,7 +18,7 @@
18 18  
19 19 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
20 20 // Override point for customization after application launch.
21   - [[VLionManager manager] initVLionSDKWithAppId:@"171" appKey:@""];
  21 + [[VLionManager manager] initVLionSDKWithAppId:@"171"];
22 22  
23 23 VLionAdConfiguration *configuration = [[VLionAdConfiguration alloc] init];
24 24  
... ...
VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json
  View file @d1cdf28
... ... @@ -88,11 +88,34 @@
88 88 "idiom" : "ipad",
89 89 "extent" : "full-screen",
90 90 "minimum-system-version" : "7.0",
  91 + "extent" : "full-screen",
  92 + "idiom" : "iphone",
  93 + "subtype" : "736h",
  94 + "filename" : "bg_launch_1242.png",
  95 + "minimum-system-version" : "8.0",
  96 + "orientation" : "portrait",
  97 + "scale" : "3x"
  98 + },
  99 + {
  100 + "extent" : "full-screen",
  101 + "idiom" : "iphone",
  102 + "subtype" : "667h",
  103 + "filename" : "bg_launch_750.png",
  104 + "minimum-system-version" : "8.0",
  105 + "orientation" : "portrait",
91 106 "scale" : "2x"
92 107 },
93 108 {
94 109 "orientation" : "portrait",
95 110 "idiom" : "iphone",
  111 + "filename" : "bg_launch_640_960-1.png",
  112 + "extent" : "full-screen",
  113 + "minimum-system-version" : "7.0",
  114 + "scale" : "2x"
  115 + },
  116 + {
  117 + "extent" : "full-screen",
  118 + "idiom" : "iphone",
96 119 "extent" : "full-screen",
97 120 "scale" : "1x"
98 121 },
... ... @@ -101,6 +124,10 @@
101 124 "idiom" : "iphone",
102 125 "filename" : "bg_launch_640_960.png",
103 126 "extent" : "full-screen",
  127 + "subtype" : "retina4",
  128 + "filename" : "bg_launch_640_1136-1.png",
  129 + "minimum-system-version" : "7.0",
  130 + "orientation" : "portrait",
104 131 "scale" : "2x"
105 132 },
106 133 {
... ... @@ -109,6 +136,7 @@
109 136 "filename" : "bg_launch_640_1136.png",
110 137 "extent" : "full-screen",
111 138 "subtype" : "retina4",
  139 + "minimum-system-version" : "7.0",
112 140 "scale" : "2x"
113 141 },
114 142 {
... ... @@ -157,6 +185,9 @@
157 185 "orientation" : "landscape",
158 186 "idiom" : "ipad",
159 187 "extent" : "full-screen",
  188 + "idiom" : "iphone",
  189 + "minimum-system-version" : "7.0",
  190 + "subtype" : "retina4",
160 191 "scale" : "2x"
161 192 }
162 193 ],
... ... @@ -164,4 +195,4 @@
164 195 "version" : 1,
165 196 "author" : "xcode"
166 197 }
167   -}
168 198 \ No newline at end of file
  199 +}
... ...
VLionADSDKDemo/VLionADSDKDemo/Info.plist
  View file @d1cdf28
... ... @@ -4,11 +4,6 @@
4 4 <dict>
5 5 <key>CFBundleDevelopmentRegion</key>
6 6 <string>$(DEVELOPMENT_LANGUAGE)</string>
7   - <key>NSAppTransportSecurity</key>
8   - <dict>
9   - <key>NSAllowsArbitraryLoads</key>
10   - <true/>
11   - </dict>
12 7 <key>CFBundleExecutable</key>
13 8 <string>$(EXECUTABLE_NAME)</string>
14 9 <key>CFBundleIdentifier</key>
... ... @@ -25,8 +20,11 @@
25 20 <string>1</string>
26 21 <key>LSRequiresIPhoneOS</key>
27 22 <true/>
28   - <key>UILaunchStoryboardName</key>
29   - <string>LaunchScreen</string>
  23 + <key>NSAppTransportSecurity</key>
  24 + <dict>
  25 + <key>NSAllowsArbitraryLoads</key>
  26 + <true/>
  27 + </dict>
30 28 <key>UIMainStoryboardFile</key>
31 29 <string>Main</string>
32 30 <key>UIRequiredDeviceCapabilities</key>
... ...
VLionADSDKDemo/VLionADSDKDemo/VLionADSDK.framework/Headers/VLionManager.h
  View file @d1cdf28
... ... @@ -26,11 +26,9 @@ typedef void(^VLionNativeAdInformationFlowHandler)(VLionNativeAdInformationFlowM
26 26  
27 27 @property (nonatomic, readonly) NSString *_Nonnull appId;
28 28  
29   -@property (nonatomic, readonly) NSString *_Nonnull appKey;
30   -
31 29 + (VLionManager *_Nonnull)manager;
32 30  
33   -- (void)initVLionSDKWithAppId:(NSString *_Nonnull)appId appKey:(NSString *_Nonnull)appKey;
  31 +- (void)initVLionSDKWithAppId:(NSString *_Nonnull)appId;
34 32  
35 33 /**
36 34 开屏广告
... ...
VLionADSDKDemo/VLionADSDKDemo/VLionADSDK.framework/VLionADSDK
View file @d1cdf28
No preview for this file type