格式格式化

Kivenhaoyu · Kivenhaoyu · commit 8fc3371add3d · 2016-05-23T15:51:31.000+08:00
diff --git a/QiniuDemo/QiniuDemo/ViewController.m b/QiniuDemo/QiniuDemo/ViewController.m
@@ -55,7 +55,8 @@ - (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);
-    } option:uploadOption];
+    }
+                option:uploadOption];
 }
 
 - (void)gotoImageLibrary {
diff --git a/QiniuSDK/Common/QNSystem.h b/QiniuSDK/Common/QNSystem.h
@@ -16,6 +16,6 @@ BOOL hasAts();
 BOOL allowsArbitraryLoads();
 
 //iOS8判断
-BOOL isNotIOS8();
+BOOL isIOS8();
 
 #endif /* QNSystem_h */
diff --git a/QiniuSDK/Common/QNSystem.m b/QiniuSDK/Common/QNSystem.m
@@ -68,12 +68,12 @@ BOOL allowsArbitraryLoads() {
     return ats.boolValue;
 }
 
-BOOL isNotIOS8(){
+BOOL isIOS8() {
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
     float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
     if ((sysVersion >= 8.0) && sysVersion < 9.0) {
-        return NO;
+        return YES;
     }
 #endif
-    return YES;
+    return NO;
 }
diff --git a/QiniuSDK/Storage/QNConfiguration.m b/QiniuSDK/Storage/QNConfiguration.m
@@ -100,13 +100,11 @@ - (instancetype)init {
         _proxy = nil;
         _converter = nil;
 
-        if (hasAts() && !allowsArbitraryLoads()&& !isNotIOS8()) {
+        if (hasAts() && !allowsArbitraryLoads() && isIOS8()) {
             _disableATS = NO;
         } else {
             _disableATS = YES;
         }
-        
-        
     }
     return self;
 }
diff --git a/QiniuSDKTests/QNFormUploadTest.m b/QiniuSDKTests/QNFormUploadTest.m
@@ -13,8 +13,8 @@
 #import "QiniuSDK.h"
 
 #import "HappyDns.h"
-#import "QNTestConfig.h"
 #import "QNSystem.h"
+#import "QNTestConfig.h"
 
 @interface QNFormUploadTest : XCTestCase
 
@@ -274,7 +274,7 @@ - (void)testDnsHosts {
     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) {
-        if (isNotIOS8()) {
+        if (isIOS8()) {
             isNotiOS8 = YES;
             NSArray *ips = [QNZone zone0].up.ips;
             QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
@@ -302,8 +302,7 @@ - (void)testDnsHosts {
     XCTAssert(testInfo.reqId, @"Pass");
     if (isNotiOS8) {
         XCTAssert([testInfo.host isEqual:@"uphosttest.qiniu.com"], @"Pass");
-    }else
-    {
+    } else {
         XCTAssert([testInfo.host isEqual:@"upload.qiniu.com"], @"Pass");
     }
     XCTAssert([@"FgoKnypncpQlV6tTVddq9EL49l4B" isEqualToString:testResp[@"key"]], @"Pass");
diff --git a/QiniuSDKTests/QNResumeUploadTest.m b/QiniuSDKTests/QNResumeUploadTest.m
@@ -48,24 +48,24 @@ - (void)testCancel {
     QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
         flag = YES;
     }
-                                                        params:@{ @"x:七牛" : @"objc",
-                                                                  @"x:no" : @"",
-                                                                  @"invalid" : @"invalid" }
-                                                      checkCrc:NO
-                                            cancellationSignal:^BOOL() {
-                                                return flag;
-                                            }];
+        params:@{ @"x:七牛" : @"objc",
+                  @"x:no" : @"",
+                  @"invalid" : @"invalid" }
+        checkCrc:NO
+        cancellationSignal:^BOOL() {
+            return flag;
+        }];
     [_upManager putFile:tempFile.path key:keyUp token:g_token complete:^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {
         key = k;
         info = i;
     }
                  option:opt];
-    
+
     AGWW_WAIT_WHILE(key == nil, 60 * 30);
     NSLog(@"info %@", info);
     XCTAssert(info.isCancelled, @"Pass");
     XCTAssert([keyUp isEqualToString:key], @"Pass");
-    
+
     [QNTempFile removeTempfile:tempFile];
 }
 
@@ -87,7 +87,7 @@ - (void) template:(int)size {
     XCTAssert(info.isOK, @"Pass");
     XCTAssert(info.reqId, @"Pass");
     XCTAssert([keyUp isEqualToString:key], @"Pass");
-    
+
     [QNTempFile removeTempfile:tempFile];
 }
 
@@ -99,13 +99,13 @@ - (void)templateHttps:(int)size {
     QNUploadOption *opt = [[QNUploadOption alloc] initWithProgressHandler:^(NSString *key, float percent) {
         NSLog(@"progress %f", percent);
     }];
-    
+
     QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
         QNServiceAddress *s = [[QNServiceAddress alloc] init:@"https://uptemp.qbox.me" ips:nil];
         builder.zone = [[QNZone alloc] initWithUp:s upBackup:nil];
     }];
     QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
-    
+
     [upManager putFile:tempFile.path key:keyUp token:g_token complete:^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {
         key = k;
         info = i;
@@ -116,7 +116,7 @@ - (void)templateHttps:(int)size {
     XCTAssert(info.isOK, @"Pass");
     XCTAssert(info.reqId, @"Pass");
     XCTAssert([keyUp isEqualToString:key], @"Pass");
-    
+
     [QNTempFile removeTempfile:tempFile];
 }
 
@@ -157,7 +157,7 @@ - (void)test0k {
     NSLog(@"info %@", info);
     XCTAssert(info.statusCode == kQNZeroDataSize, @"Pass");
     XCTAssert([keyUp isEqualToString:key], @"Pass");
-    
+
     [QNTempFile removeTempfile:tempFile];
 }
 
@@ -202,19 +202,19 @@ - (void)test8M {
 
 - (void)testProxy {
     NSDictionary *proxyDict = @{
-                                @"HTTPEnable" : [NSNumber numberWithInt:1],
-                                (NSString *)kCFStreamPropertyHTTPProxyHost : @"183.136.139.16",
-                                (NSString *)kCFStreamPropertyHTTPProxyPort : @8888,
-                                };
-    
+        @"HTTPEnable" : [NSNumber numberWithInt:1],
+        (NSString *)kCFStreamPropertyHTTPProxyHost : @"183.136.139.16",
+        (NSString *)kCFStreamPropertyHTTPProxyPort : @8888,
+    };
+
     QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
         builder.proxy = proxyDict;
         QNServiceAddress *s = [[QNServiceAddress alloc] init:@"http://upnono.qiniu.com" ips:nil];
         builder.zone = [[QNZone alloc] initWithUp:s upBackup:nil];
     }];
-    
+
     QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
-    
+
     int size = 600;
     NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
     NSString *keyUp = [NSString stringWithFormat:@"%dkproxy", size];
@@ -225,12 +225,12 @@ - (void)testProxy {
         info = i;
     }
                 option:nil];
-    
+
     AGWW_WAIT_WHILE(key == nil, 60 * 30);
     NSLog(@"info %@", info);
     XCTAssert(info.isOK, @"Pass");
     XCTAssert([keyUp isEqualToString:key], @"Pass");
-    
+
     [QNTempFile removeTempfile:tempFile];
 }
 
@@ -242,9 +242,9 @@ - (void)testUrlConvert {
         QNServiceAddress *s = [[QNServiceAddress alloc] init:@"http://upnono.qiniu.com" ips:nil];
         builder.zone = [[QNZone alloc] initWithUp:s upBackup:nil];
     }];
-    
+
     QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
-    
+
     int size = 600;
     NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
     NSString *keyUp = [NSString stringWithFormat:@"%dkconvert", size];
@@ -255,7 +255,7 @@ - (void)testUrlConvert {
         info = i;
     }
                 option:nil];
-    
+
     AGWW_WAIT_WHILE(key == nil, 60 * 30);
     NSLog(@"info %@", info);
     XCTAssert(info.isOK, @"Pass");
@@ -274,9 +274,9 @@ - (void)testHosts {
         builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
         builder.dns = dns;
     }];
-    
+
     QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
-    
+
     int size = 600;
     NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
     NSString *keyUp = [NSString stringWithFormat:@"%dkconvert", size];
@@ -287,7 +287,7 @@ - (void)testHosts {
         info = i;
     }
                 option:nil];
-    
+
     AGWW_WAIT_WHILE(key == nil, 60 * 30);
     NSLog(@"info %@", info);
     XCTAssert(info.isOK, @"Pass");

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath {`
`55`	`55`	`[upManager putFile:filePath key:nil token:self.token complete:^(QNResponseInfo info, NSString key, NSDictionary *resp) {`
`56`	`56`	`NSLog(@"info ===== %@", info);`
`57`	`57`	`NSLog(@"resp ===== %@", resp);`
`58`		`- } option:uploadOption];`
	`58`	`+ }`
	`59`	`+ option:uploadOption];`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`- (void)gotoImageLibrary {`
Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,12 @@ BOOL allowsArbitraryLoads() {`
`68`	`68`	`return ats.boolValue;`
`69`	`69`	`}`
`70`	`70`
`71`		`-BOOL isNotIOS8(){`
	`71`	`+BOOL isIOS8() {`
`72`	`72`	`#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)`
`73`	`73`	`float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];`
`74`	`74`	`if ((sysVersion >= 8.0) && sysVersion < 9.0) {`
`75`		`- return NO;`
	`75`	`+ return YES;`
`76`	`76`	`}`
`77`	`77`	`#endif`
`78`		`- return YES;`
	`78`	`+ return NO;`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,13 +100,11 @@ - (instancetype)init {`
`100`	`100`	`_proxy = nil;`
`101`	`101`	`_converter = nil;`
`102`	`102`
`103`		`- if (hasAts() && !allowsArbitraryLoads()&& !isNotIOS8()) {`
	`103`	`+ if (hasAts() && !allowsArbitraryLoads() && isIOS8()) {`
`104`	`104`	`_disableATS = NO;`
`105`	`105`	`} else {`
`106`	`106`	`_disableATS = YES;`
`107`	`107`	`}`
`108`		`-`
`109`		`-`
`110`	`108`	`}`
`111`	`109`	`return self;`
`112`	`110`	`}`