update qcloud sdk to 1.5.49

Author: jordanqin

QCloudFoundation/foundation/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 10548
-        versionName "1.5.48"
+        versionCode 10549
+        versionName "1.5.49"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpRequest.java

@@ -124,6 +124,18 @@ public void addHeader(String name, String value) {
         }
     }
 
+    public void addOrReplaceHeader(String name, String value) {
+        List<String> values = headers.get(name);
+        if (values != null && values.size() > 0) {
+            headers.remove(name);
+            requestBuilder.removeHeader(name);
+            removeHeaderNameValue(headers, name);
+        }
+
+        requestBuilder.addHeader(name, value);
+        addHeaderNameValue(headers, name, value);
+    }
+
     public void setUrl(String url){
         requestBuilder.url(url);
     }
@@ -201,6 +213,10 @@ private static void addHeaderNameValue(Map<String, List<String>> headers, String
         values.add(value.trim());
     }
 
+    private static void removeHeaderNameValue(Map<String, List<String>> headers, String name) {
+        headers.remove(name);
+    }
+
     public static class Builder<T> {
         Object tag;
 

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTaskMetrics.java

@@ -70,6 +70,7 @@ public class HttpTaskMetrics {
     @Nullable String domainName;
     @Nullable List<InetAddress> remoteAddress;
     @Nullable InetAddress connectAddress;
+    private int retryCount;
 
     void onTaskStart() {
         fullTaskStartTime = System.nanoTime();
@@ -235,6 +236,14 @@ public void setDomainName(@Nullable String domainName) {
         this.domainName = domainName;
     }
 
+    public int getRetryCount() {
+        return retryCount;
+    }
+
+    public void setRetryCount(int retryCount) {
+        this.retryCount = retryCount;
+    }
+
     private double toSeconds(long nanotime) {
         return (double)nanotime / 1_000_000_000.0;
     }
@@ -289,6 +298,7 @@ synchronized public HttpTaskMetrics merge(HttpTaskMetrics taskMetrics) {
         if (taskMetrics.connectAddress != null) {
             connectAddress = taskMetrics.getConnectAddress();
         }
+        retryCount += taskMetrics.retryCount;
         return this;
     }
 
@@ -297,6 +307,7 @@ synchronized public HttpTaskMetrics merge(HttpTaskMetrics taskMetrics) {
     public String toString() {
         return new StringBuilder().append("Http Metrics: \n")
                 .append("domain : ").append(domainName).append("\n")
+                .append("retryCount : ").append(retryCount).append("\n")
                 .append("dns : ").append(connectAddress != null ? connectAddress.getHostAddress() : "null").append("\n")
                 .append("fullTaskTookTime : ").append(fullTaskTookTime()).append("\n")
                 .append("calculateMD5STookTime : ").append(calculateMD5STookTime()).append("\n")

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpClientImpl.java

@@ -22,6 +22,7 @@
 
 package com.tencent.qcloud.core.http;
 
+import com.tencent.qcloud.core.BuildConfig;
 import com.tencent.qcloud.core.http.interceptor.HttpMetricsInterceptor;
 import com.tencent.qcloud.core.http.interceptor.RetryInterceptor;
 import com.tencent.qcloud.core.http.interceptor.TrafficControlInterceptor;
@@ -31,7 +32,6 @@
 import javax.net.ssl.HostnameVerifier;
 
 import okhttp3.Call;
-import okhttp3.ConnectionPool;
 import okhttp3.Dns;
 import okhttp3.OkHttpClient;
 
@@ -51,7 +51,11 @@ public void init(QCloudHttpClient.Builder b, HostnameVerifier hostnameVerifier,
                      final Dns dns, HttpLogger httpLogger) {
         super.init(b, hostnameVerifier, dns, httpLogger);
         HttpLoggingInterceptor logInterceptor = new HttpLoggingInterceptor(httpLogger);
-        logInterceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS);
+        if(BuildConfig.DEBUG){
+            logInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+        } else {
+            logInterceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS);
+        }
         OkHttpClient.Builder builder = b.mBuilder;
         okHttpClient = builder
                 .followRedirects(true)

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/StreamingRequestBody.java

@@ -23,15 +23,12 @@
 package com.tencent.qcloud.core.http;
 
 import android.content.ContentResolver;
-import android.content.Context;
 import android.net.Uri;
-import android.os.Environment;
 
 import com.tencent.qcloud.core.common.QCloudDigistListener;
 import com.tencent.qcloud.core.common.QCloudProgressListener;
 import com.tencent.qcloud.core.logger.QCloudLogger;
 import com.tencent.qcloud.core.util.Base64Utils;
-import com.tencent.qcloud.core.util.ContextHolder;
 import com.tencent.qcloud.core.util.QCloudUtils;
 
 import java.io.ByteArrayInputStream;
@@ -179,7 +176,7 @@ protected long getContentRawLength() throws IOException {
             } else if (bytes != null) {
                 contentRawLength = bytes.length;
             } else if (uri != null) {
-                contentRawLength = QCloudUtils.getUriContentLength2(uri, contentResolver);
+                contentRawLength = QCloudUtils.getUriContentLength(uri, contentResolver);
             }
         }
 

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/RetryInterceptor.java

@@ -31,6 +31,7 @@
 import com.tencent.qcloud.core.http.HttpConfiguration;
 import com.tencent.qcloud.core.http.HttpConstants;
 import com.tencent.qcloud.core.http.HttpTask;
+import com.tencent.qcloud.core.http.HttpTaskMetrics;
 import com.tencent.qcloud.core.http.QCloudHttpRetryHandler;
 import com.tencent.qcloud.core.logger.QCloudLogger;
 import com.tencent.qcloud.core.task.RetryStrategy;
@@ -174,6 +175,12 @@ Response processRequest(Chain chain, Request request, HttpTask task) throws IOEx
             }
             QCloudLogger.i(HTTP_LOG_TAG, "%s start to execute, attempts is %d", request, attempts);
 
+            //记录重试次数
+            HttpTaskMetrics metrics = task.metrics();
+            if (metrics != null) {
+                metrics.setRetryCount(attempts);
+            }
+
             attempts++;
             int statusCode = -1;
             try {
@@ -209,6 +216,10 @@ Response processRequest(Chain chain, Request request, HttpTask task) throws IOEx
             } else if (shouldRetry(request, response, attempts, task.getWeight(), startTime, e, statusCode) && !task.isCanceled()) {
                 QCloudLogger.i(HTTP_LOG_TAG, "%s failed for %s, code is %d", request, e, statusCode);
                 retryStrategy.onTaskEnd(false, e);
+                //解决okhttp 3.14 以上版本报错 cannot make a new request because the previous response is still open: please call response.close()
+//                if (response != null) {
+//                    Util.closeQuietly(response.body());
+//                }
             } else {
                 QCloudLogger.i(HTTP_LOG_TAG, "%s ends for %s, code is %d", request, e, statusCode);
                 break;

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/util/QCloudUtils.java

@@ -56,38 +56,26 @@ public static boolean isNotEmpty(String str) {
     public static long getUriContentLength(Uri uri, ContentResolver contentResolver) {
         String scheme = uri.getScheme();
         if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
+            long length = -1;
             Cursor cursor = contentResolver.query(uri,
                     null, null, null, null);
             if (cursor != null) {
                 try {
                     int sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE);
                     if (cursor.moveToFirst()) {
-                        return cursor.getLong(sizeIndex);
+                        length = cursor.getLong(sizeIndex);
                     }
-                    return -1;
                 } finally {
                     cursor.close();
                 }
             }
-        } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
-            File file = new File(uri.getPath());
-            return file.length();
-        }
 
-        return -1;
-    }
+            //适配部分 vivo 机型
+            if(length == -1){
+                length = getUriContentLengthByRead(uri, contentResolver);
+            }
 
-    /**
-     * 部分 vivo 机型
-     *
-     * @param uri
-     * @param contentResolver
-     * @return
-     */
-    public static long getUriContentLength2(Uri uri, ContentResolver contentResolver) {
-        String scheme = uri.getScheme();
-        if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
-            return getUriContentLengthByRead(uri, contentResolver);
+            return length;
         } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
             File file = new File(uri.getPath());
             return file.length();