Skip to content

Commit 3b64845

Browse files
committed
optimize get network status type
1 parent 7bb97b1 commit 3b64845

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

QiniuSDK/Http/NetworkStatus/QNNetworkStatusManager.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ NS_ASSUME_NONNULL_BEGIN
2424

2525
+ (instancetype)sharedInstance;
2626

27+
+ (NSString *)getNetworkStatusType:(NSString *)host
28+
ip:(NSString *)ip;
29+
2730
- (QNNetworkStatus *)getNetworkStatus:(NSString *)type;
2831

2932
- (void)updateNetworkStatus:(NSString *)type

QiniuSDK/Http/NetworkStatus/QNNetworkStatusManager.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ - (void)initData{
6161
[self asyncRecordNetworkStatusInfo];
6262
}
6363

64+
+ (NSString *)getNetworkStatusType:(NSString *)host
65+
ip:(NSString *)ip {
66+
return [QNUtils getIpType:ip host:host];
67+
}
68+
6469
- (QNNetworkStatus *)getNetworkStatus:(NSString *)type{
6570
if (type == nil || type.length == 0) {
6671
return nil;

QiniuSDK/Http/NetworkStatus/QNUploadServerNetworkStatus.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ + (BOOL)isServerNetworkBetter:(QNUploadServer *)serverA thanServerB:(QNUploadSer
2323
return YES;
2424
}
2525

26-
NSString *serverTypeA = [QNUtils getIpType:serverA.ip host:serverA.host];
27-
NSString *serverTypeB = [QNUtils getIpType:serverA.ip host:serverA.host];
26+
NSString *serverTypeA = [QNNetworkStatusManager getNetworkStatusType:serverA.host ip:serverA.ip];
27+
NSString *serverTypeB = [QNNetworkStatusManager getNetworkStatusType:serverB.host ip:serverB.ip];
2828
if (serverTypeA == nil) {
2929
return NO;
3030
} else if (serverTypeB == nil) {

QiniuSDK/Http/Request/QNHttpSingleRequest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ - (void)updateHostNetworkStatus:(QNResponseInfo *)responseInfo
184184
server:(id <QNUploadServer>)server
185185
requestMetrics:(QNUploadSingleRequestMetrics *)requestMetrics{
186186
long long byte = requestMetrics.bytesSend.longLongValue;
187-
if (requestMetrics.startDate && requestMetrics.endDate && byte > 1024 * 1024) {
187+
if (requestMetrics.startDate && requestMetrics.endDate && byte >= 1024 * 1024) {
188188
double second = [requestMetrics.endDate timeIntervalSinceDate:requestMetrics.startDate];
189189
if (second > 0) {
190190
int speed = (int)(byte / second);
191-
NSString *type = [QNUtils getIpType:server.ip host:server.host];
191+
NSString *type = [QNNetworkStatusManager getNetworkStatusType:server.host ip:server.ip];
192192
[kQNNetworkStatusManager updateNetworkStatus:type speed:speed];
193193
}
194194
}

0 commit comments

Comments
 (0)