optimize http version chose logic

Author: yangsen

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

@@ -70,6 +70,8 @@ public void updateNetworkStatus(String type, int speed) {
         if (status == null) {
             status = new NetworkStatus();
             networkStatusInfo.put(type, status);
+        } else {
+            speed = (int)((float)speed * 0.4  + (float)status.getSpeed() * 0.6);
         }
         status.setSpeed(speed);
 
@@ -169,9 +171,10 @@ private synchronized void setupRecorder() {
         }
     }
 
+    protected static final int DefaultSpeed = 600;
     public static class NetworkStatus {
 
-        private int speed = 600;
+        private int speed = DefaultSpeed;
 
         public int getSpeed() {
             return speed;

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

@@ -8,7 +8,7 @@ public static IUploadServer getBetterNetworkServer(IUploadServer serverA, IUploa
         return isServerNetworkBetter(serverA, serverB) ? serverA : serverB;
     }
 
-    // 如果两个 Server 网速相同优先使用 serverA
+    // 如果两个 Server 网速相同且类别相同优先使用 serverA，类别不同优先使用 Http3
     public static boolean isServerNetworkBetter(IUploadServer serverA, IUploadServer serverB) {
         if (serverA == null) {
             return false;
@@ -27,6 +27,23 @@ public static boolean isServerNetworkBetter(IUploadServer serverA, IUploadServer
         NetworkStatusManager.NetworkStatus serverStatusA = NetworkStatusManager.getInstance().getNetworkStatus(serverTypeA);
         NetworkStatusManager.NetworkStatus serverStatusB = NetworkStatusManager.getInstance().getNetworkStatus(serverTypeB);
 
-        return serverStatusB.getSpeed() < serverStatusA.getSpeed();
+        int serverASpeed = serverStatusA.getSpeed();
+        int serverBSpeed = serverStatusB.getSpeed();
+        String serverAHttpVersion = serverA.getHttpVersion();
+        String serverBHttpVersion = serverB.getHttpVersion();
+        if (serverAHttpVersion.equals(IUploadServer.HttpVersion3) && !serverAHttpVersion.equals(serverBHttpVersion)) {
+            if (serverASpeed < 200 && serverBSpeed == NetworkStatusManager.DefaultSpeed) {
+                return true;
+            } else if (serverASpeed > NetworkStatusManager.DefaultSpeed && serverBSpeed > 400) {
+                return false;
+            }
+        } else if (serverBHttpVersion.equals(IUploadServer.HttpVersion3) && !serverAHttpVersion.equals(serverBHttpVersion)) {
+            if (serverBSpeed < 200 && serverASpeed == NetworkStatusManager.DefaultSpeed) {
+                return true;
+            } else if (serverASpeed > NetworkStatusManager.DefaultSpeed && serverBSpeed > 400) {
+                return false;
+            }
+        }
+        return serverBSpeed <= serverASpeed;
     }
 }

library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java

@@ -1,5 +1,7 @@
 package com.qiniu.android.http.request;
 
+import android.util.Log;
+
 import com.qiniu.android.collect.ReportItem;
 import com.qiniu.android.collect.UploadInfoReporter;
 import com.qiniu.android.http.ResponseInfo;
@@ -220,7 +222,7 @@ private void updateHostNetworkStatus(ResponseInfo responseInfo, IUploadServer se
         }
         long byteCount = requestMetrics.bytesSend();
         long milliSecond = requestMetrics.totalElapsedTime();
-        if (milliSecond <= 0) {
+        if (milliSecond <= 0 || byteCount < 1024) {
             return;
         }
 
@@ -235,9 +237,9 @@ private void updateHostNetworkStatus(ResponseInfo responseInfo, IUploadServer se
         } else if (byteCount <= 128 * 1024) {
             milliSecond = (long)((float)milliSecond * 0.45);
         } else if (byteCount <= 256 * 1024) {
-            milliSecond = (long)((float)milliSecond * 0.73);
+            milliSecond = (long)((float)milliSecond * 0.76);
         } else if (byteCount <= 512 * 1024) {
-            milliSecond = (long)((float)milliSecond * 0.86);
+            milliSecond = (long)((float)milliSecond * 0.88);
         } else if (byteCount <= 1024 * 1024) {
             milliSecond = (long)((float)milliSecond * 0.95);
         }
@@ -247,6 +249,7 @@ private void updateHostNetworkStatus(ResponseInfo responseInfo, IUploadServer se
         }
 
         int speed = (int) (byteCount / milliSecond);
+        Log.d("speed","httpVersion:" + server.getHttpVersion() + " byte:" + byteCount/1024.0 + "  milliSecond:" + milliSecond + "   speed:" + speed);
         String type = NetworkStatusManager.getNetworkStatusType(server.getHttpVersion(), server.getHost(), server.getIp());
         NetworkStatusManager.getInstance().updateNetworkStatus(type, speed);
     }

library/src/main/java/com/qiniu/android/utils/AsyncRun.java

@@ -19,7 +19,7 @@ public final class AsyncRun {
 
     private static final Handler mainThreadHandler = new Handler(Looper.getMainLooper());
 
-    private static int threadPoolSize = 3;
+    private static int threadPoolSize = 1;
     private static int maxThreadPoolSize = 6;
     private static ExecutorService executorService = new ThreadPoolExecutor(threadPoolSize, maxThreadPoolSize,
             1000L, TimeUnit.MILLISECONDS,