Commit a85dc8ff4fd9a7f1744265a45bc8856f7264f068

Authored by 朱林
2 parents 03eb396f d1cdf28d

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

VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
... ... @@ -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 );
... ... @@ -139,7 +139,7 @@
139 139 };
140 140 };
141 141 };
142   - buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionADSDKDemo" */;
  142 + buildConfigurationList = D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionAdSDKDemo" */;
143 143 compatibilityVersion = "Xcode 8.0";
144 144 developmentRegion = en;
145 145 hasScannedForEncodings = 0;
... ... @@ -353,7 +353,7 @@
353 353 /* End XCBuildConfiguration section */
354 354  
355 355 /* Begin XCConfigurationList section */
356   - D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionADSDKDemo" */ = {
  356 + D2ED415B1F95F3BD00803E9D /* Build configuration list for PBXProject "VLionAdSDKDemo" */ = {
357 357 isa = XCConfigurationList;
358 358 buildConfigurations = (
359 359 D2ED41741F95F3BD00803E9D /* Debug */,
... ...
VLionADSDKDemo/VLionADSDKDemo/AppDelegate.m
... ... @@ -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
... ... @@ -3,6 +3,93 @@
3 3 {
4 4 "extent" : "full-screen",
5 5 "idiom" : "iphone",
  6 + "subtype" : "2436h",
  7 + "filename" : "bg_launch_1242 2-1.png",
  8 + "minimum-system-version" : "11.0",
  9 + "orientation" : "portrait",
  10 + "scale" : "3x"
  11 + },
  12 + {
  13 + "extent" : "full-screen",
  14 + "idiom" : "iphone",
  15 + "subtype" : "2436h",
  16 + "filename" : "bg_launch_1242 2-2.png",
  17 + "minimum-system-version" : "11.0",
  18 + "orientation" : "landscape",
  19 + "scale" : "3x"
  20 + },
  21 + {
  22 + "extent" : "full-screen",
  23 + "idiom" : "iphone",
  24 + "subtype" : "736h",
  25 + "filename" : "bg_launch_1242.png",
  26 + "minimum-system-version" : "8.0",
  27 + "orientation" : "portrait",
  28 + "scale" : "3x"
  29 + },
  30 + {
  31 + "extent" : "full-screen",
  32 + "idiom" : "iphone",
  33 + "subtype" : "736h",
  34 + "filename" : "bg_launch_1242 2-3.png",
  35 + "minimum-system-version" : "8.0",
  36 + "orientation" : "landscape",
  37 + "scale" : "3x"
  38 + },
  39 + {
  40 + "extent" : "full-screen",
  41 + "idiom" : "iphone",
  42 + "subtype" : "667h",
  43 + "filename" : "bg_launch_750.png",
  44 + "minimum-system-version" : "8.0",
  45 + "orientation" : "portrait",
  46 + "scale" : "2x"
  47 + },
  48 + {
  49 + "orientation" : "portrait",
  50 + "idiom" : "iphone",
  51 + "filename" : "bg_launch_640_960-1.png",
  52 + "extent" : "full-screen",
  53 + "minimum-system-version" : "7.0",
  54 + "scale" : "2x"
  55 + },
  56 + {
  57 + "extent" : "full-screen",
  58 + "idiom" : "iphone",
  59 + "subtype" : "retina4",
  60 + "filename" : "bg_launch_640_1136-1.png",
  61 + "minimum-system-version" : "7.0",
  62 + "orientation" : "portrait",
  63 + "scale" : "2x"
  64 + },
  65 + {
  66 + "orientation" : "portrait",
  67 + "idiom" : "ipad",
  68 + "extent" : "full-screen",
  69 + "minimum-system-version" : "7.0",
  70 + "scale" : "1x"
  71 + },
  72 + {
  73 + "orientation" : "landscape",
  74 + "idiom" : "ipad",
  75 + "extent" : "full-screen",
  76 + "minimum-system-version" : "7.0",
  77 + "scale" : "1x"
  78 + },
  79 + {
  80 + "orientation" : "portrait",
  81 + "idiom" : "ipad",
  82 + "extent" : "full-screen",
  83 + "minimum-system-version" : "7.0",
  84 + "scale" : "2x"
  85 + },
  86 + {
  87 + "orientation" : "landscape",
  88 + "idiom" : "ipad",
  89 + "extent" : "full-screen",
  90 + "minimum-system-version" : "7.0",
  91 + "extent" : "full-screen",
  92 + "idiom" : "iphone",
6 93 "subtype" : "736h",
7 94 "filename" : "bg_launch_1242.png",
8 95 "minimum-system-version" : "8.0",
... ... @@ -29,6 +116,14 @@
29 116 {
30 117 "extent" : "full-screen",
31 118 "idiom" : "iphone",
  119 + "extent" : "full-screen",
  120 + "scale" : "1x"
  121 + },
  122 + {
  123 + "orientation" : "portrait",
  124 + "idiom" : "iphone",
  125 + "filename" : "bg_launch_640_960.png",
  126 + "extent" : "full-screen",
32 127 "subtype" : "retina4",
33 128 "filename" : "bg_launch_640_1136-1.png",
34 129 "minimum-system-version" : "7.0",
... ... @@ -38,11 +133,58 @@
38 133 {
39 134 "orientation" : "portrait",
40 135 "idiom" : "iphone",
  136 + "filename" : "bg_launch_640_1136.png",
  137 + "extent" : "full-screen",
  138 + "subtype" : "retina4",
41 139 "minimum-system-version" : "7.0",
42 140 "scale" : "2x"
43 141 },
44 142 {
45 143 "orientation" : "portrait",
  144 + "idiom" : "ipad",
  145 + "extent" : "to-status-bar",
  146 + "scale" : "1x"
  147 + },
  148 + {
  149 + "orientation" : "portrait",
  150 + "idiom" : "ipad",
  151 + "extent" : "full-screen",
  152 + "scale" : "1x"
  153 + },
  154 + {
  155 + "orientation" : "landscape",
  156 + "idiom" : "ipad",
  157 + "extent" : "to-status-bar",
  158 + "scale" : "1x"
  159 + },
  160 + {
  161 + "orientation" : "landscape",
  162 + "idiom" : "ipad",
  163 + "extent" : "full-screen",
  164 + "scale" : "1x"
  165 + },
  166 + {
  167 + "orientation" : "portrait",
  168 + "idiom" : "ipad",
  169 + "extent" : "to-status-bar",
  170 + "scale" : "2x"
  171 + },
  172 + {
  173 + "orientation" : "portrait",
  174 + "idiom" : "ipad",
  175 + "extent" : "full-screen",
  176 + "scale" : "2x"
  177 + },
  178 + {
  179 + "orientation" : "landscape",
  180 + "idiom" : "ipad",
  181 + "extent" : "to-status-bar",
  182 + "scale" : "2x"
  183 + },
  184 + {
  185 + "orientation" : "landscape",
  186 + "idiom" : "ipad",
  187 + "extent" : "full-screen",
46 188 "idiom" : "iphone",
47 189 "minimum-system-version" : "7.0",
48 190 "subtype" : "retina4",
... ... @@ -53,4 +195,4 @@
53 195 "version" : 1,
54 196 "author" : "xcode"
55 197 }
56   -}
57 198 \ No newline at end of file
  199 +}
... ...
VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/bg_launch_1242 2-1.png 0 → 100644

549 KB

VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/bg_launch_1242 2-2.png 0 → 100644

549 KB

VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/bg_launch_1242 2-3.png 0 → 100644

549 KB

VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/bg_launch_640_1136.png 0 → 100644

207 KB

VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/bg_launch_640_960.png 0 → 100644

204 KB

VLionADSDKDemo/VLionADSDKDemo/VLionADSDK.framework/Headers/VLionManager.h
... ... @@ -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
No preview for this file type
~$S瑞狮广告SDK.docx deleted 100644 → 0
No preview for this file type