optimize connect check logic

Author: YangSen-qn

library/src/androidTest/java/com/qiniu/android/ConnectCheckTest.java

@@ -0,0 +1,19 @@
+package com.qiniu.android;
+
+import com.qiniu.android.http.connectCheck.ConnectChecker;
+
+public class ConnectCheckTest extends BaseTest {
+
+    public void testCheck() {
+
+        int maxCount = 1000;
+        int successCount = 0;
+        for (int i = 0; i < maxCount; i++) {
+            if (ConnectChecker.check()) {
+                successCount += 1;
+            }
+        }
+
+        assertEquals("maxCount:" + maxCount + " successCount:" + successCount, maxCount, successCount);
+    }
+}

library/src/main/java/com/qiniu/android/http/connectCheck/ConnectChecker.java

@@ -6,6 +6,7 @@
 import com.qiniu.android.http.request.Request;
 import com.qiniu.android.http.request.httpclient.SystemHttpClient;
 import com.qiniu.android.storage.GlobalConfiguration;
+import com.qiniu.android.utils.LogUtil;
 import com.qiniu.android.utils.SingleFlight;
 import com.qiniu.android.utils.Wait;
 
@@ -66,37 +67,44 @@ private static void checkAllHosts(final CheckCompleteHandler completeHandler) {
         allHosts = allHosts.clone();
         final CheckStatus checkStatus = new CheckStatus();
         checkStatus.totalCount = allHosts.length;
+        checkStatus.completeCount = 0;
         for (String host : allHosts) {
             checkHost(host, new CheckCompleteHandler() {
                 @Override
                 public void complete(boolean isHostConnected) {
 
-                    synchronized (this) {
+                    synchronized (checkStatus) {
                         checkStatus.completeCount += 1;
                     }
                     if (isHostConnected) {
                         checkStatus.isConnected = true;
                     }
                     if (checkStatus.completeCount == checkStatus.totalCount) {
+                        LogUtil.i("== check all hosts has completed totalCount:" + checkStatus.totalCount + " completeCount:" + checkStatus.completeCount);
                         completeHandler.complete(checkStatus.isConnected);
+                    } else {
+                        LogUtil.i("== check all hosts not completed totalCount:" + checkStatus.totalCount + " completeCount:" + checkStatus.completeCount);
                     }
                 }
             });
         }
 
     }
 
-    private static void checkHost(String host, final CheckCompleteHandler completeHandler) {
+    private static void checkHost(final String host, final CheckCompleteHandler completeHandler) {
 
-        Request request = new Request(host, "HEAD", null, null, 3);
+        Request request = new Request(host, Request.HttpMethodHEAD, null, null, 3);
         SystemHttpClient client = new SystemHttpClient();
 
+        LogUtil.i("== checkHost:" + host);
         client.request(request, true, null, null, new IRequestClient.RequestClientCompleteHandler() {
             @Override
             public void complete(ResponseInfo responseInfo, UploadSingleRequestMetrics metrics, JSONObject response) {
                 if (responseInfo.statusCode > 99) {
+                    LogUtil.i("== checkHost:" + host + "result: true");
                     completeHandler.complete(true);
                 } else {
+                    LogUtil.i("== checkHost:" + host + "result: false");
                     completeHandler.complete(false);
                 }
             }

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

@@ -6,6 +6,7 @@
 
 public class Request {
 
+    public static final String HttpMethodHEAD = "HEAD";
     public static final String HttpMethodGet = "GET";
     public static final String HttpMethodPOST = "POST";
     public static final String HttpMethodPUT = "PUT";

library/src/main/java/com/qiniu/android/http/request/httpclient/SystemHttpClient.java

@@ -214,7 +214,8 @@ private okhttp3.Request.Builder createRequestBuilder(final RequestClientProgress
         Headers allHeaders = Headers.of(currentRequest.allHeaders);
 
         okhttp3.Request.Builder requestBuilder = null;
-        if (currentRequest.httpMethod.equals(Request.HttpMethodGet)){
+        if (currentRequest.httpMethod.equals(Request.HttpMethodHEAD) ||
+                currentRequest.httpMethod.equals(Request.HttpMethodGet)){
             requestBuilder = new okhttp3.Request.Builder().get().url(currentRequest.urlString);
             for (String key : currentRequest.allHeaders.keySet()){
                 String value = currentRequest.allHeaders.get(key);