update qcloud sdk to 5.6.14

Author: tothetruth

QCloudCosXml/cosxml-ktx/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 50605
-        versionName "5.6.5"
+        versionCode 50614
+        versionName "5.6.14"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -39,7 +39,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4"
-    implementation 'com.tencent.qcloud:cosxml:5.6.2'
+    implementation 'com.qcloud.cos:cos-android:5.6.7'
 
     androidTestImplementation 'junit:junit:4.13'
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.4"
@@ -48,7 +48,9 @@ dependencies {
 
 }
 
-project.extensions.add('artifactId', 'cosxml-ktx')
+project.extensions.add('artifactId', 'cos-ktx')
 project.extensions.add('artifactDesc', 'Tencent COSXml SDK Kotlin Extension')
 project.extensions.add('lang', 'kotlin')
+project.extensions.add('archiveFilePath', 'outputs/aar/cos-ktx-release.aar')
 
+apply from: '../../publishMavenCentral.gradle'

QCloudCosXml/cosxml/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'com.android.library'
 apply from: '../version.gradle'
 apply from: 'jacoco.gradle'
-apply plugin: 'com.github.dcendents.android-maven'
 
 def compileQuic() {
     return getGradle().getStartParameter().getTaskRequests()
@@ -18,8 +17,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 50605
-        versionName "5.6.5"
+        versionCode 50614
+        versionName "5.6.14"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -70,17 +69,19 @@ android {
 
     // 切换发 normal 或者 slim 包，需要同步修改 pom.artifactId 信息
     defaultPublishConfig "normalRelease"
-    // defaultPublishConfig  "slimRelease"
+    //  defaultPublishConfig  "slimRelease"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_7
         targetCompatibility = JavaVersion.VERSION_1_7
     }
+
     buildToolsVersion = '28.0.2'
 
 }
 
 dependencies {
+
     compileOnly 'androidx.appcompat:appcompat:1.2.0'
     testCompileOnly 'junit:junit:4.13'
 
@@ -89,7 +90,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
 
     api project(path: ':foundation')
-    api project(path: ':logUtils')
+    // api project(path: ':logUtils')
 
     if (compileQuic() && false) {
         api project(path: ':quic')
@@ -99,29 +100,32 @@ dependencies {
     annotationProcessor project(':xmlCompiler')
 
     //lite版本使用normalApi
-    // normalApi 'com.tencent.qcloud:beacon-android-release:4.1.13'
+    normalApi 'com.qcloud.cos:beacon-android-release:4.1.22.11'
     //normal版本使用api
-    api 'com.tencent.qcloud:beacon-android-release:4.1.13'
-    slimCompileOnly 'com.tencent.qcloud:beacon-android-release:4.1.13'
+    // api 'com.qcloud.cos:beacon-android-release:4.1.22.11'
+    slimCompileOnly 'com.qcloud.cos:beacon-android-release:4.1.22.11'
 }
 
 
 // 发布到 bintray
 
 if (android.defaultPublishConfig.contains("slim")){
-    project.extensions.add('artifactId', 'cosxml-lite')
+    project.extensions.add('artifactId', 'cos-android-lite')
     project.extensions.add('packageName', 'QCloudCosXmlLite')
     project.extensions.add('packageType', 'aar')
     project.extensions.add('artifactProduct', 'slim')
     project.extensions.add('artifactDesc', 'the tencent cloud cosxml android sdk')
+    project.extensions.add('archiveName', 'cos-android-slim-release.aar')
+    project.extensions.add('archiveFilePath', 'outputs/aar/cos-android-lite-slim-release.aar')
 }else {
-    project.extensions.add('artifactId', 'cosxml')
+    project.extensions.add('artifactId', 'cos-android')
     project.extensions.add('packageName', 'QCloudCosXml')
     project.extensions.add('packageType', 'aar')
     project.extensions.add('artifactProduct', 'normal')
     project.extensions.add('artifactDesc', 'the tencent cloud cosxml android sdk')
+    project.extensions.add('archiveFilePath', 'outputs/aar/cos-android-normal-release.aar')
 }
-
+apply from: '../../publishMavenCentral.gradle'
 
 
 // 发布到内部仓库
@@ -185,3 +189,11 @@ task(printEnvs) {
     println('System envs region are :')
     println(quotWrapper(System.getenv("REGION")))
 }
+
+
+android.libraryVariants.all { variant ->
+    variant.outputs.all {
+        // System.out.println('variant is ' + variant.name)
+        // outputFileName = "${project.extensions.artifactId}-release.aar"
+    }
+}

QCloudCosXml/cosxml/src/androidTest/java/AndroidManifest.xml renamed to QCloudCosXml/cosxml/src/androidTest/AndroidManifest.xml

@@ -28,6 +28,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application android:allowBackup="true" android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true">
 
     </application>

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/common/OtherTest.java

@@ -22,11 +22,30 @@
 
 package com.tencent.cos.xml.common;
 
+import android.os.Environment;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.tencent.cos.xml.CosXmlSimpleService;
+import com.tencent.cos.xml.core.ServiceFactory;
+import com.tencent.cos.xml.core.TestConst;
+import com.tencent.cos.xml.core.TestUtils;
+import com.tencent.cos.xml.exception.CosXmlClientException;
+import com.tencent.cos.xml.exception.CosXmlServiceException;
+import com.tencent.cos.xml.listener.CosXmlResultSimpleListener;
+import com.tencent.cos.xml.utils.DigestUtils;
+import com.tencent.qcloud.core.logger.QCloudLogger;
+
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.math.BigInteger;
+
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -42,4 +61,56 @@ public void testServerEncryptType(){
         assertEquals("SSE-C", ServerEncryptType.SSE_C.getType());
         assertEquals(ServerEncryptType.SSE_COS, ServerEncryptType.fromString("SSE-COS"));
     }
+
+    @Test
+    public void testGetService() {
+        CosXmlSimpleService cosXmlSimpleService = ServiceFactory.INSTANCE.newDefaultService();
+        boolean b = cosXmlSimpleService.preBuildConnection(TestConst.PERSIST_BUCKET);
+        Assert.assertTrue(b);
+    }
+
+    @Test
+    public void testGetServiceAsync() {
+        CosXmlSimpleService cosXmlSimpleService = ServiceFactory.INSTANCE.newDefaultService();
+        cosXmlSimpleService.preBuildConnectionAsync(TestConst.PERSIST_BUCKET, new CosXmlResultSimpleListener() {
+            @Override
+            public void onSuccess() {
+                Assert.assertTrue(true);
+            }
+
+            @Override
+            public void onFail(CosXmlClientException exception, CosXmlServiceException serviceException) {
+                Assert.fail(TestUtils.getCosExceptionMessage(exception, serviceException));
+            }
+        });
+    }
+
+    @Test public void testCRC64() {
+
+        File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "12345.zip");
+        QCloudLogger.i(TestConst.UT_TAG, "file path is " + file.getAbsolutePath());
+
+        BigInteger bi = new BigInteger("9668868296014390415");
+        QCloudLogger.i(TestConst.UT_TAG, "remote crc64 is " + bi.longValue());
+
+        try {
+            QCloudLogger.i(TestConst.UT_TAG, "file crc64 is " + DigestUtils.getCRC64(new FileInputStream(file)));
+//            QCloudLogger.i(TestConst.UT_TAG, "file crc64 is " + DigestUtils.getCRC64(new ByteArrayInputStream(
+//                    "123456789".getBytes()
+//            )));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test public void testGetObjectUrl() {
+
+        CosXmlSimpleService defaultService = ServiceFactory.INSTANCE.newDefaultService();
+        String bucket = "bucket";
+        String region = "ap-shanghai";
+        String key = "objectexample";
+        String url = defaultService.getObjectUrl(bucket, region, key);
+        QCloudLogger.i("QCloudTest", url);
+        Assert.assertEquals("https://bucket.cos.ap-shanghai.myqcloud.com/objectexample", url);
+    }
 }

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/core/ServiceFactory.java

@@ -1,5 +1,6 @@
 package com.tencent.cos.xml.core;
 
+import com.tencent.cos.xml.CosXmlService;
 import com.tencent.cos.xml.CosXmlServiceConfig;
 import com.tencent.cos.xml.CosXmlSimpleService;
 import com.tencent.cos.xml.exception.CosXmlClientException;
@@ -98,17 +99,19 @@ public TransferManager newAccelerateTransferManager() {
                 .setRegion(TestConst.PERSIST_BUCKET_REGION)
                 .builder();
 
-        return new TransferManager(newService(cosXmlServiceConfig), new TransferConfig.Builder().build());
+        return new TransferManager(newService(cosXmlServiceConfig), new TransferConfig.Builder()
+                .setDivisionForUpload(2 * 1024 * 1024)
+                .setSliceSizeForUpload(1024 * 1024)
+                .build());
     }
 
     public TransferManager newCdnTransferManager() {
         return new TransferManager(newCDNService(), new TransferConfig.Builder().build());
     }
 
     private CosXmlSimpleService newService(CosXmlServiceConfig cosXmlServiceConfig) {
-        return new CosXmlSimpleService(getContext(), cosXmlServiceConfig,
+        return new CosXmlService(getContext(), cosXmlServiceConfig,
                 new ShortTimeCredentialProvider(TestConst.SECRET_ID, TestConst.SECRET_KEY,600) );
 
     }
-
 }

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/core/TestConst.java

@@ -21,6 +21,8 @@ public class TestConst {
     public static final String PERSIST_BUCKET = BuildConfig.PERSIST_BUCKET;
     public static final String PERSIST_BUCKET_CDN_SIGN = BuildConfig.PERSIST_BUCKET_CDN_SIGN;
     public static final String PERSIST_BUCKET_PIC_PATH = "/do_not_remove/image.png";
+    public static final String PERSIST_BUCKET_QR_PATH = "/do_not_remove/qr.png";
+    public static final String PERSIST_BUCKET_VIDEO_PATH = "/do_not_rembove/video.mp4";
     public static final String PERSIST_BUCKET_SELECT_JSON_PATH = "/do_not_remove/select.json";
     public static final String PERSIST_BUCKET_SELECT_CSV_PATH = "/do_not_remove/select.csv";
     public static final String PERSIST_BUCKET_DOCUMENT_PATH = "/do_not_remove/document.docx";
@@ -30,7 +32,7 @@ public class TestConst {
     public static final String PERSIST_BUCKET_REPLICATION = BuildConfig.PERSIST_BUCKET_REPLICATION;
     public static final String PERSIST_BUCKET_REPLICATION_REGION = BuildConfig.PERSIST_BUCKET_REPLICATION_REGION;
 
-    public static final long PERSIST_BUCKET_SMALL_OBJECT_SIZE = 1024;
+    public static final long PERSIST_BUCKET_SMALL_OBJECT_SIZE = 1024 * 1024;
     public static final long PERSIST_BUCKET_BIG_OBJECT_SIZE = 10 * 1024 * 1024;
     public static final String PERSIST_BUCKET_SMALL_OBJECT_PATH = "/do_not_remove/small_object";
     public static final String PERSIST_BUCKET_BIG_OBJECT_PATH = "/do_not_remove/big_object";

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/core/TestUtils.java

@@ -82,7 +82,7 @@ public static String localPath(String subPath) {
         if (!subPath.startsWith("/")) {
             subPath = "/".concat(subPath);
         }
-
+    
         return localParentPath().concat(subPath);
     }
 

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

@@ -1,10 +1,10 @@
-package com.tencent.cos.xml.image;
+package com.tencent.cos.xml.doc;
 
+import android.os.Environment;
 import android.util.Log;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.tencent.cos.xml.CosXmlSimpleService;
 import com.tencent.cos.xml.core.ServiceFactory;
 import com.tencent.cos.xml.core.TestConst;
 import com.tencent.cos.xml.core.TestLocker;
@@ -24,7 +24,6 @@
 import com.tencent.cos.xml.transfer.COSXMLUploadTask;
 
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -33,6 +32,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static android.os.Environment.DIRECTORY_DOWNLOADS;
+
 /**
  * <p>
  * Created by rickenwang on 2020/8/14.
@@ -43,19 +44,19 @@ public class ImageTest {
 
     final static String localImageName ="/test_image.png";
 
-    @BeforeClass public static void downloadImageToLocalPath() {
-
-        TestUtils.removeLocalFile(TestUtils.localPath(localImageName));
-        GetObjectRequest getObjectRequest = new GetObjectRequest(TestConst.PERSIST_BUCKET,
-                TestConst.PERSIST_BUCKET_PIC_PATH, TestUtils.localParentPath(), localImageName);
-
-        CosXmlSimpleService cosXmlSimpleService = ServiceFactory.INSTANCE.newDefaultService();
-        try {
-            cosXmlSimpleService.getObject(getObjectRequest);
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
+//    @BeforeClass public static void downloadImageToLocalPath() {
+//
+//        TestUtils.removeLocalFile(TestUtils.localPath(localImageName));
+//        GetObjectRequest getObjectRequest = new GetObjectRequest(TestConst.PERSIST_BUCKET,
+//                TestConst.PERSIST_BUCKET_PIC_PATH, TestUtils.localParentPath(), localImageName);
+//
+//        CosXmlSimpleService cosXmlSimpleService = ServiceFactory.INSTANCE.newDefaultService();
+//        try {
+//            cosXmlSimpleService.getObject(getObjectRequest);
+//        } catch (Exception e) {
+//            Assert.fail(e.getMessage());
+//        }
+//    }
 
     // 通过 CosXmlService#putObject() 方法简单上传，返回 PutObjectResult
     @Test public void testPicOperationRule()  {
@@ -86,6 +87,30 @@ public class ImageTest {
         }
     }
 
+    // 二维码识别
+    @Test public void testQRCode()  {
+
+        PutObjectRequest putObjectRequest = new PutObjectRequest(TestConst.PERSIST_BUCKET,
+                TestConst.PERSIST_BUCKET_PIC_PATH, Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS) + "/Qrcode.jpg");
+
+        List<PicOperationRule> rules = new LinkedList<>();
+        rules.add(new PicOperationRule("/test.png", "QRcode/cover/0"));
+        PicOperations picOperations = new PicOperations(false, rules);
+        putObjectRequest.setPicOperations(picOperations);
+
+        PutObjectResult putObjectResult = null;
+        try {
+            putObjectResult = ServiceFactory.INSTANCE.newDefaultService().putObject(putObjectRequest);
+            PicUploadResult uploadResult = putObjectResult.picUploadResult();
+            Assert.assertNotNull(uploadResult);
+            // Assert.assertFalse(uploadResult.processResults.isEmpty());
+            Assert.assertEquals(200, putObjectResult.httpCode);
+        } catch (Exception exception) {
+            Assert.fail(exception.getMessage());
+        }
+    }
+
+
     // 通过 TransferManager 分片上传，返回 CompleteMultiUploadResult
     @Test public void transferManagerUploadPic() {
 

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/model/object/ObjectTest.java

@@ -64,4 +64,9 @@ public void testAsync() {
             adapter.testSyncRequest();
         }
     }
+
+    @Test public void testGetSnapshot() {
+
+
+    }
 }