Skip to content

Commit 5192960

Browse files
author
yangsen
committed
optimize network stat update
1 parent 9948c04 commit 5192960

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

library/src/main/java/com/qiniu/android/http/networkStatus/NetworkStatusManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public synchronized void initData() {
3737
if (hasInit){
3838
return;
3939
}
40+
hasInit = true;
4041
networkStatusManager.networkStatusInfo = new ConcurrentHashMap<>();
4142
networkStatusManager.asyncRecoverNetworkStatusFromDisk();
4243
}

library/src/main/java/com/qiniu/android/http/networkStatus/UploadServerNetworkStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static boolean isServerNetworkBetter(IUploadServer serverA, IUploadServer
1717
}
1818

1919
String serverTypeA = NetworkStatusManager.getNetworkStatusType(serverA.getHttpVersion(), serverA.getHost(), serverA.getIp());
20-
String serverTypeB = NetworkStatusManager.getNetworkStatusType(serverA.getHttpVersion(), serverB.getHost(), serverB.getIp());
20+
String serverTypeB = NetworkStatusManager.getNetworkStatusType(serverB.getHttpVersion(), serverB.getHost(), serverB.getIp());
2121
if (serverTypeA == null || serverTypeA.length() == 0) {
2222
return false;
2323
} else if (serverTypeB == null || serverTypeB.length() == 0) {

library/src/main/java/com/qiniu/android/http/serverRegion/UploadDomainRegion.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,19 +215,25 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
215215
}
216216
}
217217

218+
if (http2Server != null) {
219+
http2Server.setHttpVersion(IUploadServer.HttpVersion2);
220+
}
221+
218222
UploadServer server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(http3Server, http2Server);
219223
if (server == null && !hasFreezeHost && hostList.size() > 0) {
220224
int index = (int) (Math.random() * hostList.size());
221225
String host = hostList.get(index);
222226
UploadServerDomain domain = domainInfo.get(host);
223227
if (domain != null) {
224228
server = domain.getOneServer();
229+
if (server != null) {
230+
server.setHttpVersion(IUploadServer.HttpVersion2);
231+
}
225232
}
226233
unfreezeServer(server);
227234
}
228235

229236
if (server != null) {
230-
server.setHttpVersion(IUploadServer.HttpVersion2);
231237
LogUtil.i("get server host:" + StringUtils.toNonnullString(server.getHost()) + " ip:" + StringUtils.toNonnullString(server.getIp()));
232238
} else {
233239
isAllFrozen = true;

0 commit comments

Comments
 (0)