Merge pull request #80 from longbai/userid

longbai · longbai · commit 9a1b7a090598 · 2015-10-20T14:49:02.000+08:00
ua use idfv
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### 增加
 * 支持 https 
 * 禁止0字节文件上传
+* ua加入idfv 便于网络诊断
 
 ### 修正
 * QNHttpDelegate.h 头文件名大小写修正
diff --git a/QiniuSDK/Common/QNSystem.m b/QiniuSDK/Common/QNSystem.m
@@ -17,31 +17,31 @@
 
 BOOL hasNSURLSession(){
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
-    float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
-    if (sysVersion < 7.0) {
-        return NO;
-    }
+	float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
+	if (sysVersion < 7.0) {
+		return NO;
+	}
 #else
-    NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
-    if ((sysVersion.majorVersion <= 10 && sysVersion.minorVersion < 9)) {
-        return NO;
-    }
+	NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
+	if ((sysVersion.majorVersion <= 10 && sysVersion.minorVersion < 9)) {
+		return NO;
+	}
 #endif
-    return YES;
+	return YES;
 }
 
 BOOL hasAts(){
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
-    float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
-    if (sysVersion < 9.0) {
-        return NO;
-    }
+	float sysVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
+	if (sysVersion < 9.0) {
+		return NO;
+	}
 #else
-    NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
-    
-    if ((sysVersion.majorVersion <= 10 && sysVersion.minorVersion < 11)) {
-        return NO;
-    }
+	NSOperatingSystemVersion sysVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
+
+	if ((sysVersion.majorVersion <= 10 && sysVersion.minorVersion < 11)) {
+		return NO;
+	}
 #endif
-    return YES;
+	return YES;
 }
diff --git a/QiniuSDK/Http/QNHttpManager.m b/QiniuSDK/Http/QNHttpManager.m
@@ -112,6 +112,11 @@ - (void)  sendRequest2:(NSMutableURLRequest *)request
     
     request.URL = url;
     
+    [request setTimeoutInterval:_timeout];
+    
+    [request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];
+    [request setValue:nil forHTTPHeaderField:@"Accept-Language"];
+    
     AFHTTPRequestOperation *operation = [_httpManager
                                          HTTPRequestOperationWithRequest:request
                                          success: ^(AFHTTPRequestOperation *operation, id responseObject) {
@@ -151,10 +156,7 @@ - (void)  sendRequest2:(NSMutableURLRequest *)request
             }
         }];
     }
-    [request setTimeoutInterval:_timeout];
-    
-    [request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];
-    [request setValue:nil forHTTPHeaderField:@"Accept-Language"];
+
     [_httpManager.operationQueue addOperation:operation];
 }
 
diff --git a/QiniuSDK/Http/QNResponseInfo.m b/QiniuSDK/Http/QNResponseInfo.m
@@ -9,6 +9,7 @@
 
 #import "QNResponseInfo.h"
 #import "QNUserAgent.h"
+#import "QNVersion.h"
 
 const int kQNZeroDataSize = -6;
 const int kQNInvalidToken = -5;
@@ -96,14 +97,14 @@ + (instancetype)responseInfoWithFileError:(NSError *)error {
 	return [[QNResponseInfo alloc] initWithStatus:kQNFileError error:error];
 }
 
-+ (instancetype)responseInfoOfZeroData:(NSString *)path{
-    NSString *desc;
-    if (path == nil) {
-        desc = @"data size is 0";
-    }else {
-        desc = [[NSString alloc] initWithFormat:@"file %@ size is 0", path];
-    }
-    return [[QNResponseInfo alloc] initWithStatus:kQNZeroDataSize errorDescription:desc];
++ (instancetype)responseInfoOfZeroData:(NSString *)path {
+	NSString *desc;
+	if (path == nil) {
+		desc = @"data size is 0";
+	}else {
+		desc = [[NSString alloc] initWithFormat:@"file %@ size is 0", path];
+	}
+	return [[QNResponseInfo alloc] initWithStatus:kQNZeroDataSize errorDescription:desc];
 }
 
 - (instancetype)initWithCancelled {
@@ -181,7 +182,7 @@ - (instancetype)init:(int)status
 }
 
 - (NSString *)description {
-	return [NSString stringWithFormat:@"<%@= id: %@, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ ip: %@ duration: %f s time: %llu error: %@>", NSStringFromClass([self class]), _id, _statusCode, _reqId, _xlog, _xvia, _host, _serverIp, _duration, _timeStamp, _error];
+	return [NSString stringWithFormat:@"<%@= id: %@, ver: %@, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ ip: %@ duration: %f s time: %llu error: %@>", NSStringFromClass([self class]), _id, kQiniuVersion, _statusCode, _reqId, _xlog, _xvia, _host, _serverIp, _duration, _timeStamp, _error];
 }
 
 - (BOOL)isCancelled {
diff --git a/QiniuSDK/Http/QNSessionManager.m b/QiniuSDK/Http/QNSessionManager.m
@@ -195,6 +195,11 @@ - (void)  sendRequest2:(NSMutableURLRequest *)request
     }
     request.URL = url;
     
+    [request setTimeoutInterval:_timeout];
+    
+    [request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];
+    [request setValue:nil forHTTPHeaderField:@"Accept-Language"];
+    
     if (progressBlock == nil) {
         progressBlock = ^(long long totalBytesWritten, long long totalBytesExpectedToWrite) {
         };
@@ -235,10 +240,6 @@ - (void)  sendRequest2:(NSMutableURLRequest *)request
         delegate.cancelBlock = cancelBlock;
     }
     
-    [request setTimeoutInterval:_timeout];
-    
-    [request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];
-    [request setValue:nil forHTTPHeaderField:@"Accept-Language"];
     [uploadTask resume];
 }
 
diff --git a/QiniuSDK/Http/QNUserAgent.m b/QiniuSDK/Http/QNUserAgent.m
@@ -18,9 +18,13 @@
 #import "QNVersion.h"
 
 static NSString *clientId(void) {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+	return [[[UIDevice currentDevice] identifierForVendor] UUIDString];
+#else
 	long long now_timestamp = [[NSDate date] timeIntervalSince1970] * 1000;
 	int r = arc4random() % 1000;
 	return [NSString stringWithFormat:@"%lld%u", now_timestamp, r];
+#endif
 }
 
 static NSString *userAgent(NSString *id) {
diff --git a/QiniuSDK/Storage/QNConfiguration.m b/QiniuSDK/Storage/QNConfiguration.m
@@ -13,24 +13,24 @@
 const UInt32 kQNBlockSize = 4 * 1024 * 1024;
 
 static void addServiceToDns(QNServiceAddress* address, QNDnsManager *dns) {
-    NSArray *ips = address.ips;
-    if (ips == nil) {
-        return;
-    }
-    NSURL *u = [[NSURL alloc] initWithString:address.address];
-    NSString *host = u.host;
-    for (int i = 0; i<ips.count; i++) {
-        [dns putHosts:host ip:ips[i]];
-    }
+	NSArray *ips = address.ips;
+	if (ips == nil) {
+		return;
+	}
+	NSURL *u = [[NSURL alloc] initWithString:address.address];
+	NSString *host = u.host;
+	for (int i = 0; i<ips.count; i++) {
+		[dns putHosts:host ip:ips[i]];
+	}
 }
 
 static void addZoneToDns(QNZone *zone, QNDnsManager* dns){
-    if (zone.up != nil) {
-        addServiceToDns(zone.up, dns);
-    }
-    if (zone.upBackup != nil) {
-        addServiceToDns(zone.upBackup, dns);
-    }
+	if (zone.up != nil) {
+		addServiceToDns(zone.up, dns);
+	}
+	if (zone.upBackup != nil) {
+		addServiceToDns(zone.upBackup, dns);
+	}
 }
 
 static QNDnsManager* initDns(QNConfigurationBuilder *builder) {
@@ -55,7 +55,7 @@ + (instancetype)build:(QNConfigurationBuilderBlock)block {
 - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
 	if (self = [super init]) {
 		_up = builder.zone.up;
-        _upBackup = builder.zone.upBackup == nil? builder.zone.up:builder.zone.upBackup;
+		_upBackup = builder.zone.upBackup == nil ? builder.zone.up : builder.zone.upBackup;
 
 		_chunkSize = builder.chunkSize;
 		_putThreshold = builder.putThreshold;
@@ -70,7 +70,7 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
 		_converter = builder.converter;
 
 		_dns = initDns(builder);
-        addZoneToDns(builder.zone, _dns);
+		addZoneToDns(builder.zone, _dns);
 	}
 	return self;
 }
@@ -101,13 +101,13 @@ - (instancetype)init {
 
 @implementation QNServiceAddress : NSObject
 
-- (instancetype) init:(NSString*)address ips:(NSArray*)ips{
-    if (self = [super init]) {
-        _address = address;
-        _ips = ips;
-        
-    }
-    return self;
+- (instancetype) init:(NSString*)address ips:(NSArray*)ips {
+	if (self = [super init]) {
+		_address = address;
+		_ips = ips;
+
+	}
+	return self;
 }
 
 @end
@@ -124,20 +124,20 @@ - (instancetype)initWithUp:(QNServiceAddress *)up
 	return self;
 }
 
-+ (instancetype)createWithHost:(NSString*)up backupHost:(NSString*)backup ip1:(NSString*)ip1 ip2:(NSString*)ip2{
-    NSArray* ips = [NSArray arrayWithObjects:ip1,ip2, nil];
-    NSString* a = [NSString stringWithFormat:@"http://%@", up];
-    QNServiceAddress *s1 = [[QNServiceAddress alloc] init:a ips:ips];
-    NSString* b = [NSString stringWithFormat:@"http://%@", backup];
-    QNServiceAddress *s2 = [[QNServiceAddress alloc] init:b ips:ips];
-    return [[QNZone alloc] initWithUp:s1 upBackup:s2];
++ (instancetype)createWithHost:(NSString*)up backupHost:(NSString*)backup ip1:(NSString*)ip1 ip2:(NSString*)ip2 {
+	NSArray* ips = [NSArray arrayWithObjects:ip1,ip2, nil];
+	NSString* a = [NSString stringWithFormat:@"http://%@", up];
+	QNServiceAddress *s1 = [[QNServiceAddress alloc] init:a ips:ips];
+	NSString* b = [NSString stringWithFormat:@"http://%@", backup];
+	QNServiceAddress *s2 = [[QNServiceAddress alloc] init:b ips:ips];
+	return [[QNZone alloc] initWithUp:s1 upBackup:s2];
 }
 
 + (instancetype)zone0 {
 	static QNZone *z0 = nil;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-        z0 = [QNZone createWithHost:@"upload.qiniu.com" backupHost:@"up.qiniu.com" ip1:@"183.136.139.10" ip2:@"115.231.182.136"];
+		z0 = [QNZone createWithHost:@"upload.qiniu.com" backupHost:@"up.qiniu.com" ip1:@"183.136.139.10" ip2:@"115.231.182.136"];
 	});
 	return z0;
 }
@@ -146,7 +146,7 @@ + (instancetype)zone1 {
 	static QNZone *z1 = nil;
 	static dispatch_once_t onceToken;
 	dispatch_once(&onceToken, ^{
-        z1 = [QNZone createWithHost:@"upload-z1.qiniu.com" backupHost:@"up-z1.qiniu.com" ip1:@"106.38.227.28" ip2:@"106.38.227.27"];
+		z1 = [QNZone createWithHost:@"upload-z1.qiniu.com" backupHost:@"up-z1.qiniu.com" ip1:@"106.38.227.28" ip2:@"106.38.227.27"];
 	});
 	return z1;
 }
diff --git a/QiniuSDK/Storage/QNFormUpload.m b/QiniuSDK/Storage/QNFormUpload.m
@@ -103,7 +103,7 @@ - (void)put {
 		};
 
 		[_httpManager multipartPost:nextHost
-                           withData:_data
+		 withData:_data
 		 withParams:parameters
 		 withFileName:fileName
 		 withMimeType:_option.mimeType
diff --git a/QiniuSDK/Storage/QNUploadManager.m b/QiniuSDK/Storage/QNUploadManager.m
@@ -64,10 +64,10 @@ - (instancetype)initWithConfiguration:(QNConfiguration *)config {
 		_config = config;
 #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
 		if (hasNSURLSession()) {
-            _httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval urlConverter:config.converter dns:config.dns];
+			_httpManager = [[QNSessionManager alloc] initWithProxy:config.proxy timeout:config.timeoutInterval urlConverter:config.converter dns:config.dns];
 		}
 		else {
-			_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter dns:config.dns];			
+			_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter dns:config.dns];
 		}
 #else
 		_httpManager = [[QNHttpManager alloc] initWithTimeout:config.timeoutInterval urlConverter:config.converter dns:config.dns];
@@ -128,13 +128,13 @@ - (void) putData:(NSData *)data
 		});
 		return;
 	}
-    
-    if ([data length] == 0) {
-        QNAsyncRunInMain( ^{
-            completionHandler([QNResponseInfo responseInfoOfZeroData:nil], key, nil);
-        });
-        return;
-    }
+
+	if ([data length] == 0) {
+		QNAsyncRunInMain( ^{
+			completionHandler([QNResponseInfo responseInfoOfZeroData:nil], key, nil);
+		});
+		return;
+	}
 	QNUpCompletionHandler complete = ^(QNResponseInfo *info, NSString *key, NSDictionary *resp)
 	{
 		QNAsyncRunInMain( ^{

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,11 @@ - (void) sendRequest2:(NSMutableURLRequest *)request`
`195`	`195`	`}`
`196`	`196`	`request.URL = url;`
`197`	`197`
	`198`	`+ [request setTimeoutInterval:_timeout];`
	`199`	`+`
	`200`	`+ [request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];`
	`201`	`+ [request setValue:nil forHTTPHeaderField:@"Accept-Language"];`
	`202`	`+`
`198`	`203`	`if (progressBlock == nil) {`
`199`	`204`	`progressBlock = ^(long long totalBytesWritten, long long totalBytesExpectedToWrite) {`
`200`	`205`	`};`
`@@ -235,10 +240,6 @@ - (void) sendRequest2:(NSMutableURLRequest *)request`
`235`	`240`	`delegate.cancelBlock = cancelBlock;`
`236`	`241`	`}`
`237`	`242`
`238`		`- [request setTimeoutInterval:_timeout];`
`239`		`-`
`240`		`- [request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];`
`241`		`- [request setValue:nil forHTTPHeaderField:@"Accept-Language"];`
`242`	`243`	`[uploadTask resume];`
`243`	`244`	`}`
`244`	`245`