Merge branch 'develop'

youmi · Jun 8, 2017 · 9313f04 · 9313f04
2 parents 2886cfa + 082a699
commit 9313f04
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![](https://img.shields.io/badge/android-1.2.1-blue.svg)](https://github.com/youmi/nativead/releases/tag/android-1.2.1) [![](https://img.shields.io/badge/ios-1.0.5-blue.svg)](https://github.com/youmi/nativead/releases/tag/1.0.5)
+[![](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![](https://img.shields.io/badge/android-1.2.1-blue.svg)](https://github.com/youmi/nativead/releases/tag/android-1.2.1) [![](https://img.shields.io/badge/ios-1.0.6-blue.svg)](https://github.com/youmi/nativead/releases/tag/1.0.6)
 
 有米原生广告文档
 ===========

diff --git a/YMNativeAdS-iOS/YMNativeAd/UMOpenApiRequest.m b/YMNativeAdS-iOS/YMNativeAd/UMOpenApiRequest.m
@@ -152,7 +152,7 @@ +(void)sendTrackURL:(NSArray *)trackArray{
 
     NSString *urlArg = getUrlArg();
 
-    NSString *requestHead = @"http://native.umapi.cn/ios/v1/oreq";//请求广告的url
+    NSString *requestHead = @"https://native.umapi.cn/ios/v1/oreq";//请求广告的url
 
     NSString *requestURL = [NSString stringWithFormat:@"%@?%@",requestHead,urlArg];
     requestURL = [requestURL  stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
@@ -184,7 +184,7 @@ +(void)sendTrackURL:(NSArray *)trackArray{
     NSString *ua = @"";//useragent
     NSString *os = @"iOS";
     NSString *osv = [NSString stringWithFormat:@"%@",systemMainVersion()];
-    NSString *appversion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
+    NSString *appversion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
     NSString *conntype = YM_ASSIGN_STRING_SAFELY([UMNMachineUtil sharedInstance].accessPointName);//网络类型，空=无，0=未知/其他，1=wifi，2=2g，3=3g，4=4g，5=5g
     NSString *carrier = YM_ASSIGN_STRING_SAFELY([UMNMachineUtil sharedInstance].mobileNetworkCode);//网络运营商，空=无，0=未知/其他，1=wifi，2=移动，3=联通，4=电信
     NSString *pk = [[NSBundle mainBundle] bundleIdentifier];//iOS为App的BundleIdentifier

diff --git a/YMNativeAdS-iOS/nativead.podspec b/YMNativeAdS-iOS/nativead.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
 s.name              = "nativead"
-s.version           = "1.0.5"
+s.version           = "1.0.6"
 s.summary           = "有米原生广告开源代码"
 
 s.homepage          = "https://github.com/youmi/nativead"