update qcloud sdk to 5.5.8

Author: jordanqin

QCloudCosXml/cosext/build.gradle

@@ -29,7 +29,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode sdkVersionCode
-        versionName "5.5.7"
+        versionName "5.5.8"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

QCloudCosXml/cosxml-ktx/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 50507
-        versionName "5.5.7"
+        versionCode 50508
+        versionName "5.5.8"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

QCloudCosXml/cosxml/build.gradle

@@ -15,8 +15,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 50507
-        versionName "5.5.7"
+        versionCode 50508
+        versionName "5.5.8"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -64,7 +64,7 @@ android {
     }
 
     // 切换发 normal 或者 slim 包，需要同步修改 pom.artifactId 信息
-    defaultPublishConfig "normalRelease"
+    defaultPublishConfig "slimRelease"
     // "slimRelease"
 
     compileOptions {
@@ -84,7 +84,6 @@ dependencies {
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
 
     api project(path: ':foundation')
-    api project(path: ':mtaUtils')
     api project(path: ':logUtils')
 
     if (compileQuic()) {
@@ -94,7 +93,8 @@ dependencies {
     compileOnly project(':xmlAnnoation')
     annotationProcessor project(':xmlCompiler')
 
-    implementation 'com.tencent.qcloud:beacon-android-release:4.1.9'
+    normalApi 'com.tencent.qcloud:beacon-android-release:4.1.13'
+    slimCompileOnly 'com.tencent.qcloud:beacon-android-release:4.1.13'
 }
 
 

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/image/ImageTest.java

@@ -128,8 +128,9 @@ public void onFail(CosXmlRequest request, CosXmlClientException exception, CosXm
 
     @Test public void testThumbnail() {
 
+        final TestLocker testLocker = new TestLocker(1);
         GetObjectRequest getObjectRequest = new GetObjectRequest(TestConst.PERSIST_BUCKET, TestConst.PERSIST_BUCKET_PIC_PATH,
-                TestUtils.localParentPath());
+                Environment.getExternalStorageDirectory().getAbsolutePath(), TestUtils.localPath(localImageName));
 
         Map<String, String> paras = new HashMap<>();
         paras.put("imageMogr2/thumbnail/!50p", null);

QCloudCosXml/cosxml/src/main/java/com/tencent/cos/xml/BeaconService.java

@@ -98,16 +98,19 @@ public static void init(Context applicationContext, CosXmlServiceConfig serviceC
             if (instance == null) {
                 instance = new BeaconService(applicationContext, serviceConfig);
 
-                BeaconConfig config = BeaconConfig.builder()
-                        .auditEnable(false)
-                        .bidEnable(false)
-                        .collectMACEnable(false)
-                        .collectIMEIEnable(false)
-                        .pagePathEnable(false)
-                        .build();
-                BeaconReport beaconReport = BeaconReport.getInstance();
-                beaconReport.setLogAble(IS_DEBUG);//是否打开日志
-                beaconReport.start(applicationContext, APP_KEY, config);
+                if(isIncludeBeacon()) {
+                    BeaconConfig config = BeaconConfig.builder()
+                            .auditEnable(false)
+                            .bidEnable(false)
+                            .collectMACEnable(false)
+                            .collectIMEIEnable(false)
+                            .pagePathEnable(false)
+                            .setNormalPollingTime(5000)
+                            .build();
+                    BeaconReport beaconReport = BeaconReport.getInstance();
+                    beaconReport.setLogAble(IS_DEBUG);//是否打开日志
+                    beaconReport.start(applicationContext, APP_KEY, config);
+                }
             }
         }
     }
@@ -117,14 +120,16 @@ public static BeaconService getInstance() {
     }
 
     private void report(String eventcode, Map<String, String> params) {
+        if(!isIncludeBeacon()) return;
+
         BeaconEvent.Builder builder = BeaconEvent.builder()
                 .withAppKey(APP_KEY)
                 .withCode(eventcode)
                 .withType(EventType.NORMAL)
                 .withParams(params);
         try {
             builder.withIsSimpleParams(true);
-        } catch (NoSuchMethodError error){
+        } catch (NoSuchMethodError error) {
             //APP使用了标准版的灯塔SDK 不支持withIsSimpleParams
         }
         EventResult result = BeaconReport.getInstance().report(builder.build());
@@ -281,6 +286,15 @@ public void reportError(String source, Exception e) {
         report(EVENT_CODE_ERROR, params);
     }
 
+    private static boolean isIncludeBeacon(){
+        try {
+            Class.forName("com.tencent.beacon.event.open.BeaconReport");
+            return true;
+        } catch (ClassNotFoundException e){
+            return false;
+        }
+    }
+
     private Map<String, String> getBaseServiceParams(CosXmlRequest cosXmlRequest, long tookTime, boolean isSuccess) {
         Map<String, String> params = getCommonParams();
 
@@ -345,6 +359,8 @@ private Map<String, String> getUploadParams(String region, boolean isSuccess) {
      * @return 公共参数
      */
     private Map<String, String> getCommonParams() {
+        if(!isIncludeBeacon()) return new HashMap<>();
+
         Map<String, String> params = new HashMap<>();
         BeaconPubParams pubParams = BeaconReport.getInstance().getCommonParams(applicationContext);
         params.put("boundle_id", pubParams.getBoundleId());
@@ -468,7 +484,10 @@ private int subdivisionIOException(Throwable causeException) {
      */
     private boolean isReport(CosXmlRequest cosXmlRequest) {
         String requestName = cosXmlRequest.getClass().getSimpleName();
-        return !"InitMultipartUploadRequest".equals(requestName) &&
+        return !"PutObjectRequest".equals(requestName) &&
+                !"GetObjectRequest".equals(requestName) &&
+                !"SelectObjectContentRequest".equals(requestName) &&
+                !"InitMultipartUploadRequest".equals(requestName) &&
                 !"ListPartsRequest".equals(requestName) &&
                 !"UploadPartRequest".equals(requestName) &&
                 !"CompleteMultiUploadRequest".equals(requestName) &&

QCloudCosXml/cosxml/src/normal/java/com/tencent/cos/xml/model/tag/eventstreaming/SelectObjectContentEvent.java

@@ -54,6 +54,8 @@ public RecordsEvent withPayload(ByteBuffer payload) {
             return this;
         }
 
+
+
     }
 
     /**

QCloudCosXml/cosxml/src/normal/java/com/tencent/cos/xml/transfer/XmlBuilder.java

@@ -680,7 +680,7 @@ public static String buildSelectRequest(SelectRequest selectRequest) throws IOEx
             addElement(xmlSerializer, "QuoteCharacter", csvInput.getQuoteCharacterAsString());
             addElement(xmlSerializer, "QuoteEscapeCharacter", csvInput.getQuoteEscapeCharacterAsString());
             addElement(xmlSerializer, "Comments", csvInput.getCommentsAsString());
-            addElement(xmlSerializer, "AllowQuotedRecordDelimiter", String.valueOf(csvInput.getAllowQuotedRecordDelimiter()));
+            addElement(xmlSerializer, "AllowQuotedRecordDelimiter", csvInput.getAllowQuotedRecordDelimiter() ? "TRUE" : "FALSE");
             xmlSerializer.endTag("", "CSV");
 
         } else if (selectRequest.getInputSerialization().getJson() != null) {

QCloudCosXml/logUtils/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
         versionCode sdkVersionCode
-        versionName "5.5.7"
+        versionName "5.5.8"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'