Merge pull request #160 from Kivenhaoyu/master

update ios8 ipv6

Author: longbai

CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.0.19 (2016-05-23)
+
+### 修正
+* iOS8 ipv6 支持
+
 ## 7.0.18 (2016-05-10)
 
 ### 修正

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.0.18'
+  s.version      = '7.0.19’
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'

QiniuDemo/QiniuDemo/ViewController.m

@@ -13,7 +13,6 @@
 @interface ViewController () <UINavigationControllerDelegate, UIImagePickerControllerDelegate>
 
 @property (nonatomic, strong) NSString *token;
-@property (nonatomic, strong) NSString *domain;
 @property (nonatomic, strong) UIImage *pickImage;
 
 @end
@@ -40,29 +39,12 @@ - (IBAction)uploadAction:(id)sender {
             otherButtonTitles:nil];
         [alert show];
     } else {
-        [self getTokenFromQN];
-    }
-}
-
-- (void)getTokenFromQN {
-    //1.管理器
-    AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
-
-    //    //2.设置登录参数
-    //    NSDictionary *dict = @{ @"username":@"xn", @"password":@"123" };
-
-    //3.请求
-    [manager POST:@"http://115.231.183.102:9090/api/quick_start/simple_image_example_token.php" parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject) {
-        self.domain = responseObject[@"domain"];
-        self.token = responseObject[@"uptoken"];
         [self uploadImageToQNFilePath:[self getImagePath:self.pickImage]];
     }
-        failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-            NSLog(@"%@", error);
-        }];
 }
 
 - (void)uploadImageToQNFilePath:(NSString *)filePath {
+    self.token = @"你的token";
     QNUploadManager *upManager = [[QNUploadManager alloc] init];
     QNUploadOption *uploadOption = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         NSLog(@"percent == %.2f", percent);
@@ -73,9 +55,6 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath {
     [upManager putFile:filePath key:nil token:self.token complete:^(QNResponseInfo *info, NSString *key, NSDictionary *resp) {
         NSLog(@"info ===== %@", info);
         NSLog(@"resp ===== %@", resp);
-        NSLog(@"%@/%@", self.domain, resp[@"key"]);
-        [self.preViewImage setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/%@", self.domain, resp[@"key"]]] placeholderImage:[UIImage imageNamed:@"placeholder.jpg"]];
-
     }
                 option:uploadOption];
 }

QiniuSDK/Common/QNSystem.h

@@ -15,4 +15,7 @@ BOOL hasAts();
 
 BOOL allowsArbitraryLoads();
 
+//iOS8判断
+BOOL isIOS8();
+
 #endif /* QNSystem_h */

QiniuSDK/Common/QNSystem.m

@@ -66,4 +66,14 @@ BOOL allowsArbitraryLoads() {
         return NO;
     }
     return ats.boolValue;
+}
+
+BOOL isIOS8() {
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
+    float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
+    if ((sysVersion >= 8.0) && sysVersion < 9.0) {
+        return YES;
+    }
+#endif
+    return NO;
 }

QiniuSDK/Common/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static const NSString *kQiniuVersion = @"7.0.18";
+static const NSString *kQiniuVersion = @"7.0.19";

QiniuSDK/Storage/QNConfiguration.m

@@ -100,7 +100,7 @@ - (instancetype)init {
         _proxy = nil;
         _converter = nil;
 
-        if (hasAts() && !allowsArbitraryLoads()) {
+        if (hasAts() && !allowsArbitraryLoads() && isIOS8()) {
             _disableATS = NO;
         } else {
             _disableATS = YES;

QiniuSDKTests/QNFormUploadTest.m

@@ -13,6 +13,7 @@
 #import "QiniuSDK.h"
 
 #import "HappyDns.h"
+#import "QNSystem.h"
 #import "QNTestConfig.h"
 
 @interface QNFormUploadTest : XCTestCase
@@ -269,14 +270,18 @@ - (void)testDnsHosts {
     __block QNResponseInfo *testInfo = nil;
     __block NSDictionary *testResp = nil;
     __block NSString *key = nil;
+    __block BOOL isNotiOS8 = NO;
     QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
     QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
     QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
-        NSArray *ips = [QNZone zone0].up.ips;
-        QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
-        QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
-        builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
-        builder.dns = dns;
+        if (!isIOS8()) {
+            isNotiOS8 = YES;
+            NSArray *ips = [QNZone zone0].up.ips;
+            QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
+            QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
+            builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
+            builder.dns = dns;
+        }
     }];
 
     QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
@@ -295,7 +300,11 @@ - (void)testDnsHosts {
     XCTAssert(key == nil, @"Pass");
     XCTAssert(testInfo.isOK, @"Pass");
     XCTAssert(testInfo.reqId, @"Pass");
-    XCTAssert([testInfo.host isEqual:@"uphosttest.qiniu.com"], @"Pass");
+    if (isNotiOS8) {
+        XCTAssert([testInfo.host isEqual:@"uphosttest.qiniu.com"], @"Pass");
+    } else {
+        XCTAssert([testInfo.host isEqual:@"upload.qiniu.com"], @"Pass");
+    }
     XCTAssert([@"FgoKnypncpQlV6tTVddq9EL49l4B" isEqualToString:testResp[@"key"]], @"Pass");
 }