update qcloud sdk to 1.5.63

Author: jordanqin

QCloudFoundation/foundation/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 10563
-        versionName "1.5.63"
+        versionCode 10564
+        versionName "1.5.64"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

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

@@ -206,9 +206,10 @@ public Response intercept(Chain chain) throws IOException {
         }
         QCloudLogger.i(HTTP_LOG_TAG, " %s begin to execute", request);
         IOException e;
+        Response response = null;
         try {
             long startNs = System.nanoTime();
-            Response response = processRequest(chain, request);
+            response = processRequest(chain, request);
             // because we want to calculate the whole task duration, including downloading procedure,
             // we put download operation here
             if (task.isDownloadTask()) {
@@ -242,6 +243,10 @@ public Response intercept(Chain chain) throws IOException {
                 strategy.reportException(request, e);
             }
         }
+        //解决okhttp 3.14 以上版本报错 cannot make a new request because the previous response is still open: please call response.close()
+        if (response != null && response.body() != null) {
+            response.close();
+        }
         throw e;
     }
 

QCloudFoundation/qcloud-track/consumer-rules.pro

@@ -3,4 +3,30 @@
 # beacon
 -keep class com.tencent**qimei.** { *;}
 -keep class com.tencent.qmsp.oaid2.** {*;}
--keep class com.tencent.beacon.** { *;}
+-keep class com.tencent.beacon.** { *;}
+
+# R8
+-dontwarn com.tencent.beacon.event.open.BeaconConfig$Builder
+-dontwarn com.tencent.beacon.event.open.BeaconConfig
+-dontwarn com.tencent.beacon.event.open.BeaconEvent$Builder
+-dontwarn com.tencent.beacon.event.open.BeaconEvent
+-dontwarn com.tencent.beacon.event.open.BeaconReport
+-dontwarn com.tencent.beacon.event.open.EventResult
+-dontwarn com.tencent.beacon.event.open.EventType
+
+-dontwarn com.tencent.qimei.sdk.IQimeiSDK
+-dontwarn com.tencent.qimei.sdk.QimeiSDK
+-dontwarn com.tencent.qimei.strategy.terminal.ITerminalStrategy
+-dontwarn com.tencent.qimei.codez.FalconSdk
+-dontwarn com.tencent.qimei.codez.IFalconSdk
+-dontwarn com.tencent.qimei.codez.shell.UserInfoType
+-dontwarn com.tencent.smtt.export.external.extension.interfaces.IX5WebViewExtension
+-dontwarn com.tencent.smtt.sdk.WebSettings
+-dontwarn com.tencent.smtt.sdk.WebView
+-dontwarn com.tencent.smtt.sdk.WebViewClient
+
+-dontwarn com.tencentcloudapi.cls.android.producer.AsyncProducerClient
+-dontwarn com.tencentcloudapi.cls.android.producer.AsyncProducerConfig
+-dontwarn com.tencentcloudapi.cls.android.producer.Callback
+-dontwarn com.tencentcloudapi.cls.android.producer.common.LogItem
+-dontwarn com.tencentcloudapi.cls.android.producer.errors.ProducerException

QCloudFoundation/qcloud-track/libs/beacon-android-release-4.2.80.6-official.aar

@@ -35,7 +35,7 @@ public void init() {
 
         ClsTrackService clsTrackService = new ClsTrackService();
 //        clsTrackService.init(appContext, "9ab664b4-f657-4ef9-8b8c-305b819e477d", "ap-guangzhou.cls.tencentcs.com");
-        clsTrackService.init(appContext, "f8140102-7b5b-4f50-9667-4611a2e23aea", "ap-guangzhou.cls.tencentcs.com");
+        clsTrackService.init(appContext, "d4bb2a4f-99a0-4b42-960b-87249b0f6c33", "ap-guangzhou.cls.tencentcs.com");
         // 临时秘钥
 //        clsTrackService.setCredentialProvider(new MyClsLifecycleCredentialProvider());
         // 固定秘钥
@@ -62,7 +62,7 @@ public void inputData() {
         // 每隔100s上报一次上传、下载、其他基础接口
         while (true) {
             try {
-                Thread.sleep(100000);
+                Thread.sleep(10000);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }