Skip to content

Commit 89eecb7

Browse files
KivenhaoyuKivenhaoyu
committed
fix comment
1 parent 3cc53e2 commit 89eecb7

File tree

5 files changed

+120
-111
lines changed

5 files changed

+120
-111
lines changed

‎QiniuSDK/Common/QNSystem.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ BOOL hasAts();
1515

1616
BOOL allowsArbitraryLoads();
1717

18+
//iOS8判断
1819
BOOL hasDns();
1920

2021
#endif /* QNSystem_h */

‎QiniuSDK/Storage/QNConfiguration.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
7878

7979
@property (readonly) BOOL disableATS;
8080

81-
//ios8 不支持ipv6
82-
@property (assign) BOOL isNotIOS8;
83-
8481
+ (instancetype)build:(QNConfigurationBuilderBlock)block;
8582

8683
@end
@@ -176,7 +173,6 @@ typedef void (^QNConfigurationBuilderBlock)(QNConfigurationBuilder *builder);
176173

177174
@property (assign) BOOL disableATS;
178175

179-
//ios8 不支持ipv6
180176
@property (assign) BOOL isNotIOS8;
181177

182178
@end

‎QiniuSDK/Storage/QNConfiguration.m‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ static void addZoneToDns(QNZone *zone, QNDnsManager *dns) {
4646
return d;
4747
}
4848

49+
@interface QNConfiguration()
50+
51+
@property (assign) BOOL isNotIOS8;
52+
53+
@end
54+
4955
@implementation QNConfiguration
5056

5157
+ (instancetype)build:(QNConfigurationBuilderBlock)block {
@@ -72,20 +78,17 @@ - (instancetype)initWithBuilder:(QNConfigurationBuilder *)builder {
7278
_converter = builder.converter;
7379

7480
_disableATS = builder.disableATS;
75-
if (_disableATS) {
81+
_isNotIOS8 = builder.isNotIOS8;
82+
if (_disableATS && _isNotIOS8) {
7683
_dns = initDns(builder);
7784
addZoneToDns(builder.zone, _dns);
7885
} else {
7986
_dns = nil;
8087
}
8188

82-
if (_isNotIOS8) {
83-
_dns = initDns(builder);
84-
addZoneToDns(builder.zone, _dns);
85-
}else
86-
{
87-
_dns = nil;
88-
}
89+
// if () {
90+
// _dns = nil;
91+
// }
8992
}
9093
return self;
9194
}

‎QiniuSDKTests/QNFormUploadTest.m‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -265,48 +265,48 @@ - (void)testUrlConvert {
265265
XCTAssert([@"FgoKnypncpQlV6tTVddq9EL49l4B" isEqualToString:testResp[@"key"]], @"Pass");
266266
}
267267

268-
//- (void)testDnsHosts {
269-
// __block QNResponseInfo *testInfo = nil;
270-
// __block NSDictionary *testResp = nil;
271-
// __block NSString *key = nil;
272-
// __block BOOL isNotiOS8 = NO;
273-
// QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
274-
// QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
275-
// QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
276-
// if (builder.isNotIOS8) {
277-
// isNotiOS8 = YES;
278-
// NSArray *ips = [QNZone zone0].up.ips;
279-
// QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
280-
// QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
281-
// builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
282-
// builder.dns = dns;
283-
// }
284-
// }];
285-
//
286-
// QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
287-
//
288-
// NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
289-
// [upManager putData:data key:nil token:g_token complete:^(QNResponseInfo *info, NSString *k, NSDictionary *resp) {
290-
// key = k;
291-
// testInfo = info;
292-
// testResp = resp;
293-
// }
294-
// option:nil];
295-
//
296-
// AGWW_WAIT_WHILE(testInfo == nil, 100.0);
297-
// NSLog(@"%@", testInfo);
298-
// NSLog(@"%@", testResp);
299-
// XCTAssert(key == nil, @"Pass");
300-
// XCTAssert(testInfo.isOK, @"Pass");
301-
// XCTAssert(testInfo.reqId, @"Pass");
302-
// if (isNotiOS8) {
303-
// XCTAssert([testInfo.host isEqual:@"uphosttest.qiniu.com"], @"Pass");
304-
// }else
305-
// {
306-
// XCTAssert([testInfo.host isEqual:@"upload.qiniu.com"], @"Pass");
307-
// }
308-
// XCTAssert([@"FgoKnypncpQlV6tTVddq9EL49l4B" isEqualToString:testResp[@"key"]], @"Pass");
309-
//}
268+
- (void)testDnsHosts {
269+
__block QNResponseInfo *testInfo = nil;
270+
__block NSDictionary *testResp = nil;
271+
__block NSString *key = nil;
272+
__block BOOL isNotiOS8 = NO;
273+
QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
274+
QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
275+
QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
276+
if (builder.isNotIOS8) {
277+
isNotiOS8 = YES;
278+
NSArray *ips = [QNZone zone0].up.ips;
279+
QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
280+
QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
281+
builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
282+
builder.dns = dns;
283+
}
284+
}];
285+
286+
QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
287+
288+
NSData *data = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
289+
[upManager putData:data key:nil token:g_token complete:^(QNResponseInfo *info, NSString *k, NSDictionary *resp) {
290+
key = k;
291+
testInfo = info;
292+
testResp = resp;
293+
}
294+
option:nil];
295+
296+
AGWW_WAIT_WHILE(testInfo == nil, 100.0);
297+
NSLog(@"%@", testInfo);
298+
NSLog(@"%@", testResp);
299+
XCTAssert(key == nil, @"Pass");
300+
XCTAssert(testInfo.isOK, @"Pass");
301+
XCTAssert(testInfo.reqId, @"Pass");
302+
if (isNotiOS8) {
303+
XCTAssert([testInfo.host isEqual:@"uphosttest.qiniu.com"], @"Pass");
304+
}else
305+
{
306+
XCTAssert([testInfo.host isEqual:@"upload.qiniu.com"], @"Pass");
307+
}
308+
XCTAssert([@"FgoKnypncpQlV6tTVddq9EL49l4B" isEqualToString:testResp[@"key"]], @"Pass");
309+
}
310310

311311
- (void)test0sizeData {
312312
__block QNResponseInfo *testInfo = nil;

‎QiniuSDKTests/QNResumeUploadTest.m‎

Lines changed: 66 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,24 @@ - (void)testCancel {
4848
QNUploadOption *opt = [[QNUploadOption alloc] initWithMime:nil progressHandler:^(NSString *key, float percent) {
4949
flag = YES;
5050
}
51-
params:@{ @"x:七牛" : @"objc",
52-
@"x:no" : @"",
53-
@"invalid" : @"invalid" }
54-
checkCrc:NO
55-
cancellationSignal:^BOOL() {
56-
return flag;
57-
}];
51+
params:@{ @"x:七牛" : @"objc",
52+
@"x:no" : @"",
53+
@"invalid" : @"invalid" }
54+
checkCrc:NO
55+
cancellationSignal:^BOOL() {
56+
return flag;
57+
}];
5858
[_upManager putFile:tempFile.path key:keyUp token:g_token complete:^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {
5959
key = k;
6060
info = i;
6161
}
6262
option:opt];
63-
63+
6464
AGWW_WAIT_WHILE(key == nil, 60 * 30);
6565
NSLog(@"info %@", info);
6666
XCTAssert(info.isCancelled, @"Pass");
6767
XCTAssert([keyUp isEqualToString:key], @"Pass");
68-
68+
6969
[QNTempFile removeTempfile:tempFile];
7070
}
7171

@@ -87,7 +87,7 @@ - (void) template:(int)size {
8787
XCTAssert(info.isOK, @"Pass");
8888
XCTAssert(info.reqId, @"Pass");
8989
XCTAssert([keyUp isEqualToString:key], @"Pass");
90-
90+
9191
[QNTempFile removeTempfile:tempFile];
9292
}
9393

@@ -99,13 +99,13 @@ - (void)templateHttps:(int)size {
9999
QNUploadOption *opt = [[QNUploadOption alloc] initWithProgressHandler:^(NSString *key, float percent) {
100100
NSLog(@"progress %f", percent);
101101
}];
102-
102+
103103
QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
104104
QNServiceAddress *s = [[QNServiceAddress alloc] init:@"https://uptemp.qbox.me" ips:nil];
105105
builder.zone = [[QNZone alloc] initWithUp:s upBackup:nil];
106106
}];
107107
QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
108-
108+
109109
[upManager putFile:tempFile.path key:keyUp token:g_token complete:^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {
110110
key = k;
111111
info = i;
@@ -116,7 +116,7 @@ - (void)templateHttps:(int)size {
116116
XCTAssert(info.isOK, @"Pass");
117117
XCTAssert(info.reqId, @"Pass");
118118
XCTAssert([keyUp isEqualToString:key], @"Pass");
119-
119+
120120
[QNTempFile removeTempfile:tempFile];
121121
}
122122

@@ -157,7 +157,7 @@ - (void)test0k {
157157
NSLog(@"info %@", info);
158158
XCTAssert(info.statusCode == kQNZeroDataSize, @"Pass");
159159
XCTAssert([keyUp isEqualToString:key], @"Pass");
160-
160+
161161
[QNTempFile removeTempfile:tempFile];
162162
}
163163

@@ -202,19 +202,19 @@ - (void)test8M {
202202

203203
- (void)testProxy {
204204
NSDictionary *proxyDict = @{
205-
@"HTTPEnable" : [NSNumber numberWithInt:1],
206-
(NSString *)kCFStreamPropertyHTTPProxyHost : @"183.136.139.16",
207-
(NSString *)kCFStreamPropertyHTTPProxyPort : @8888,
208-
};
209-
205+
@"HTTPEnable" : [NSNumber numberWithInt:1],
206+
(NSString *)kCFStreamPropertyHTTPProxyHost : @"183.136.139.16",
207+
(NSString *)kCFStreamPropertyHTTPProxyPort : @8888,
208+
};
209+
210210
QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
211211
builder.proxy = proxyDict;
212212
QNServiceAddress *s = [[QNServiceAddress alloc] init:@"http://upnono.qiniu.com" ips:nil];
213213
builder.zone = [[QNZone alloc] initWithUp:s upBackup:nil];
214214
}];
215-
215+
216216
QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
217-
217+
218218
int size = 600;
219219
NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
220220
NSString *keyUp = [NSString stringWithFormat:@"%dkproxy", size];
@@ -225,12 +225,12 @@ - (void)testProxy {
225225
info = i;
226226
}
227227
option:nil];
228-
228+
229229
AGWW_WAIT_WHILE(key == nil, 60 * 30);
230230
NSLog(@"info %@", info);
231231
XCTAssert(info.isOK, @"Pass");
232232
XCTAssert([keyUp isEqualToString:key], @"Pass");
233-
233+
234234
[QNTempFile removeTempfile:tempFile];
235235
}
236236

@@ -242,9 +242,9 @@ - (void)testUrlConvert {
242242
QNServiceAddress *s = [[QNServiceAddress alloc] init:@"http://upnono.qiniu.com" ips:nil];
243243
builder.zone = [[QNZone alloc] initWithUp:s upBackup:nil];
244244
}];
245-
245+
246246
QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
247-
247+
248248
int size = 600;
249249
NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
250250
NSString *keyUp = [NSString stringWithFormat:@"%dkconvert", size];
@@ -255,7 +255,7 @@ - (void)testUrlConvert {
255255
info = i;
256256
}
257257
option:nil];
258-
258+
259259
AGWW_WAIT_WHILE(key == nil, 60 * 30);
260260
NSLog(@"info %@", info);
261261
XCTAssert(info.isOK, @"Pass");
@@ -264,37 +264,46 @@ - (void)testUrlConvert {
264264
[QNTempFile removeTempfile:tempFile];
265265
}
266266

267-
//- (void)testHosts {
268-
// QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
269-
// QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
270-
// QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
271-
// NSArray *ips = [QNZone zone0].up.ips;
272-
// QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
273-
// QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
274-
// builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
275-
// builder.dns = dns;
276-
// }];
277-
//
278-
// QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
279-
//
280-
// int size = 600;
281-
// NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
282-
// NSString *keyUp = [NSString stringWithFormat:@"%dkconvert", size];
283-
// __block QNResponseInfo *info = nil;
284-
// __block NSString *key = nil;
285-
// [upManager putFile:tempFile.path key:keyUp token:g_token complete:^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {
286-
// key = k;
287-
// info = i;
288-
// }
289-
// option:nil];
290-
//
291-
// AGWW_WAIT_WHILE(key == nil, 60 * 30);
292-
// NSLog(@"info %@", info);
293-
// XCTAssert(info.isOK, @"Pass");
294-
// XCTAssert([keyUp isEqualToString:key], @"Pass");
295-
// XCTAssert([info.host isEqual:@"uphosttest.qiniu.com"] || [info.host isEqual:@"uphosttestbak.qiniu.com"], @"Pass");
296-
// [QNTempFile removeTempfile:tempFile];
297-
//}
267+
- (void)testHosts {
268+
__block BOOL isNotiOS8 = NO;
269+
QNResolver *resolver = [[QNResolver alloc] initWithAddres:@"114.114.115.115"];
270+
QNDnsManager *dns = [[QNDnsManager alloc] init:[NSArray arrayWithObject:resolver] networkInfo:[QNNetworkInfo normal]];
271+
QNConfiguration *config = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
272+
if(builder.isNotIOS8){
273+
isNotiOS8 = YES;
274+
NSArray *ips = [QNZone zone0].up.ips;
275+
QNServiceAddress *s1 = [[QNServiceAddress alloc] init:@"http://uphosttest.qiniu.com" ips:ips];
276+
QNServiceAddress *s2 = [[QNServiceAddress alloc] init:@"http://uphosttestbak.qiniu.com" ips:ips];
277+
builder.zone = [[QNZone alloc] initWithUp:s1 upBackup:s2];
278+
builder.dns = dns;
279+
}
280+
}];
281+
282+
QNUploadManager *upManager = [[QNUploadManager alloc] initWithConfiguration:config];
283+
284+
int size = 600;
285+
NSURL *tempFile = [QNTempFile createTempfileWithSize:size * 1024];
286+
NSString *keyUp = [NSString stringWithFormat:@"%dkconvert", size];
287+
__block QNResponseInfo *info = nil;
288+
__block NSString *key = nil;
289+
[upManager putFile:tempFile.path key:keyUp token:g_token complete:^(QNResponseInfo *i, NSString *k, NSDictionary *resp) {
290+
key = k;
291+
info = i;
292+
}
293+
option:nil];
294+
295+
AGWW_WAIT_WHILE(key == nil, 60 * 30);
296+
NSLog(@"info %@", info);
297+
XCTAssert(info.isOK, @"Pass");
298+
XCTAssert([keyUp isEqualToString:key], @"Pass");
299+
if(isNotiOS8){
300+
XCTAssert([info.host isEqual:@"uphosttest.qiniu.com"] || [info.host isEqual:@"uphosttestbak.qiniu.com"], @"Pass");
301+
}else
302+
{
303+
XCTAssert([info.host isEqual:@"upload.qiniu.com"], @"Pass");
304+
}
305+
[QNTempFile removeTempfile:tempFile];
306+
}
298307

299308
#endif
300309
@end

0 commit comments

Comments
 (0)