optimize get upload server

Author: yangsen

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

@@ -31,6 +31,12 @@ public static boolean isServerNetworkBetter(IUploadServer serverA, IUploadServer
         int serverBSpeed = serverStatusB.getSpeed();
         String serverAHttpVersion = serverA.getHttpVersion();
         String serverBHttpVersion = serverB.getHttpVersion();
+        if (serverAHttpVersion == null) {
+            serverAHttpVersion = "";
+        }
+        if (serverBHttpVersion == null) {
+            serverBHttpVersion = "";
+        }
         if (serverAHttpVersion.equals(IUploadServer.HttpVersion3) && !serverAHttpVersion.equals(serverBHttpVersion)) {
             if (serverASpeed < 200 && serverBSpeed == NetworkStatusManager.DefaultSpeed) {
                 return true;

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

@@ -143,7 +143,7 @@ public IUploadServer getNextServer(UploadRequestState requestState, ResponseInfo
                 if (domain == null) {
                     continue;
                 }
-                IUploadServer domainServer = domain.getServer(new UploadServerDomain.GetServerCondition() {
+                UploadServer domainServer = domain.getServer(new UploadServerDomain.GetServerCondition() {
                     @Override
                     public boolean condition(String host, UploadServer serverP, UploadServer filterServer) {
                         String filterServerIP = filterServer == null ? null : filterServer.getIp();
@@ -165,17 +165,16 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
                         return UploadServerNetworkStatus.isServerNetworkBetter(filterServer, serverP);
                     }
                 });
+                if (domainServer != null) {
+                    domainServer.setHttpVersion(IUploadServer.HttpVersion3);
+                }
 
                 http3Server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(domainServer, http3Server);
 
                 if (http3Server != null) {
                     break;
                 }
             }
-
-            if (http3Server != null) {
-                http3Server.setHttpVersion(IUploadServer.HttpVersion3);
-            }
         }
 
         // 2. 挑选http2
@@ -185,7 +184,7 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
             if (domain == null) {
                 continue;
             }
-            IUploadServer domainServer = domain.getServer(new UploadServerDomain.GetServerCondition() {
+            UploadServer domainServer = domain.getServer(new UploadServerDomain.GetServerCondition() {
                 @Override
                 public boolean condition(String host, UploadServer serverP, UploadServer filterServer) {
                     String filterServerIP = filterServer == null ? null : filterServer.getIp();
@@ -207,6 +206,9 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
                     return UploadServerNetworkStatus.isServerNetworkBetter(filterServer, serverP);
                 }
             });
+            if (domainServer != null) {
+                domainServer.setHttpVersion(IUploadServer.HttpVersion2);
+            }
 
             http2Server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(domainServer, http2Server);
 
@@ -215,10 +217,6 @@ public boolean condition(String host, UploadServer serverP, UploadServer filterS
             }
         }
 
-        if (http2Server != null) {
-            http2Server.setHttpVersion(IUploadServer.HttpVersion2);
-        }
-
         UploadServer server = (UploadServer) UploadServerNetworkStatus.getBetterNetworkServer(http3Server, http2Server);
         if (server == null && !hasFreezeHost && hostList.size() > 0) {
             int index = (int) (Math.random() * hostList.size());