support Uri & InputStream

.github/workflows/ci-test.yml

@@ -18,6 +18,8 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: 22
+          profile: Nexus 6
+          arch: x86_64
           script: |
             ./gradlew connectedCheck
             ./gradlew build

CHANGELOG.md

@@ -1,9 +1,11 @@
 #Changelog
+## 8.3.0(2021-05-12)
+* 支持资源通过 Uri 和 InputStream 方式上传
+
 ## 8.2.1(2021-04-14)
 * 优化分片上传逻辑，增加重试
 
 ## 8.2.0(2021-02-20)
-## 增加
 * 增加网络监控功能，选择最优 Host 进行上传
 * 优化日志统计
 

README.md

@@ -15,6 +15,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 
 | Qiniu SDK 版本 | 最低 Android版本   |       依赖库版本           |
 |------------ |-----------------|------------------------|
+|  8.3.x        |  Android 5.0+     |        okhttp 4+         |
 |  8.2.x        |  Android 5.0+     |        okhttp 4+         |
 |  8.1.x        |  Android 5.0+     |        okhttp 4+         |
 |  8.0.x        |  Android 5.0+     |        okhttp 4+         |
@@ -29,7 +30,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 |  7.0.7        |  Android 2.2+     | android-async-http 1.4.8 |
 
 ### 注意
-* 推荐使用最新版：8.2.1
+* 推荐使用最新版：8.3.0
 * AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
 ```
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

library/build.gradle

@@ -24,7 +24,7 @@ android {
     buildToolsVersion '29.0.2'
     defaultConfig {
         //applicationId "com.qiniu.android"
-        minSdkVersion 15
+        minSdkVersion 19
         targetSdkVersion 26
         versionCode code
         versionName version
@@ -52,7 +52,8 @@ android {
 
 dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.2.2'
-    implementation 'com.qiniu:happy-dns:0.2.16'
+//    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+    implementation 'com.qiniu:happy-dns:0.2.18'
     // for javax.annotation.Nullable use in custom MultipartBody and Headers implements.
 //    implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'org.conscrypt:conscrypt-android:2.2.1'

library/library.iml

@@ -97,7 +97,7 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.qiniu:happy-dns:0.2.16@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.qiniu:happy-dns:0.2.18@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.conscrypt:conscrypt-android:2.2.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: android.test.mock-android-29" level="project" />
     <orderEntry type="library" name="Gradle: android.test.base-android-29" level="project" />

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

@@ -48,7 +48,9 @@ public void testMutiUploadV1(){
                 continue;
             }
 
-            uploadFile(file, keyUp, config, null, new UpCompletionHandler() {
+            UploadInfo<File> info = new UploadInfo<>(file);
+            info.configWithFile(file);
+            upload(info, keyUp, config, null, new UpCompletionHandler() {
                 @Override
                 public void complete(String key, ResponseInfo info, JSONObject response) {
                     synchronized (param){
@@ -100,7 +102,9 @@ public void testMutiUploadV2(){
                 continue;
             }
 
-            uploadFile(file, keyUp, config, null, new UpCompletionHandler() {
+            UploadInfo<File> info = new UploadInfo<>(file);
+            info.configWithFile(file);
+            upload(info, keyUp, config, null, new UpCompletionHandler() {
                 @Override
                 public void complete(String key, ResponseInfo info, JSONObject response) {
                     synchronized (param){

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

@@ -60,15 +60,15 @@ public void testCancelV1() {
             String key = "android_concurrent_resume_cancel_v1_" + size + "k";
             try {
                 File file = TempFile.createFile(size, key);
-                cancelTest(cancelPercent, file, key, configuration, null);
+                cancelTest((long) (size * cancelPercent), file, key, configuration, null);
                 TempFile.remove(file);
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
     }
 
-    public void testHttpV1(){
+    public void testHttpV1() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
                 .useConcurrentResumeUpload(true)
@@ -87,7 +87,7 @@ public void testHttpV1(){
         }
     }
 
-    public void testHttpsV1(){
+    public void testHttpsV1() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
                 .useConcurrentResumeUpload(true)
@@ -106,27 +106,27 @@ public void testHttpsV1(){
         }
     }
 
-    public void testReuploadV1(){
+    public void testReuploadV1() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
                 .useConcurrentResumeUpload(true)
                 .useHttps(true)
-                .chunkSize(1024*1024)
+                .chunkSize(1024 * 1024)
                 .build();
         int[] sizeArray = {30000};
         for (int size : sizeArray) {
             String key = "android_concurrent_resume_reupload_v1_" + size + "k";
             try {
                 File file = TempFile.createFile(size, key);
-                reuploadUploadTest((float)0.7, file, key, configuration, null);
+                reuploadUploadTest((long) (size * 0.7), file, key, configuration, null);
                 TempFile.remove(file);
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
     }
 
-    public void testNoKeyV1(){
+    public void testNoKeyV1() {
         int size = 600;
         String key = "android_concurrent_resume_no_key_v1_" + size + "k";
         File file = null;
@@ -153,7 +153,7 @@ public void testNoKeyV1(){
         TempFile.remove(file);
     }
 
-    public void test0kV1(){
+    public void test0kV1() {
         int size = 0;
         String key = "android_concurrent_resume_0k_v1_" + size + "k";
         File file = null;
@@ -185,7 +185,7 @@ public void testSwitchRegionV2() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
                 .useConcurrentResumeUpload(true)
-                .chunkSize(4*1024*1024)
+                .chunkSize(4 * 1024 * 1024)
                 .useHttps(true)
                 .build();
         int[] sizeArray = {5000, 8000, 10000, 20000};
@@ -206,30 +206,30 @@ public void testCancelV2() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
                 .useConcurrentResumeUpload(true)
-                .chunkSize(4*1024*1024)
+                .chunkSize(4 * 1024 * 1024)
                 .useHttps(true)
                 .build();
         int[] sizeArray = {10000, 20000};
         for (int size : sizeArray) {
             String key = "android_concurrent_resume_cancel_v2_" + size + "k";
             try {
                 File file = TempFile.createFile(size, key);
-                cancelTest(cancelPercent, file, key, configuration, null);
+                cancelTest((long) (size * cancelPercent), file, key, configuration, null);
                 TempFile.remove(file);
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
     }
 
-    public void testHttpV2(){
+    public void testHttpV2() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
                 .useConcurrentResumeUpload(true)
-                .chunkSize(4*1024*1024)
+                .chunkSize(4 * 1024 * 1024)
                 .useHttps(false)
                 .build();
-        int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
+        int[] sizeArray = {500, 2000, 4000, 5000, 8000, 20000};
         long timestamp = new Date().getTime();
         for (int size : sizeArray) {
             String key = "android_concurrent_resume_http_v2_" + timestamp + "_" + size + "k";
@@ -243,14 +243,14 @@ public void testHttpV2(){
         }
     }
 
-    public void testHttpsV2(){
+    public void testHttpsV2() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
                 .useConcurrentResumeUpload(true)
                 .useHttps(true)
-                .chunkSize(4*1024*1024)
+                .chunkSize(4 * 1024 * 1024)
                 .build();
-        int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
+        int[] sizeArray = {500, 2000, 4000, 5000, 8000, 20000};
         for (int size : sizeArray) {
             String key = "android_concurrent_resume_https_v2_" + size + "k";
             try {
@@ -263,27 +263,27 @@ public void testHttpsV2(){
         }
     }
 
-    public void testReuploadV2(){
+    public void testReuploadV2() {
         Configuration configuration = new Configuration.Builder()
                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
                 .useConcurrentResumeUpload(true)
                 .useHttps(true)
-                .chunkSize(4*1024*1024)
+                .chunkSize(4 * 1024 * 1024)
                 .build();
         int[] sizeArray = {30000};
         for (int size : sizeArray) {
             String key = "android_concurrent_resume_reupload_v2_" + size + "k";
             try {
                 File file = TempFile.createFile(size, key);
-                reuploadUploadTest((float)0.7, file, key, configuration, null);
+                reuploadUploadTest((long) (size * 0.7), file, key, configuration, null);
                 TempFile.remove(file);
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
     }
 
-    public void testNoKeyV2(){
+    public void testNoKeyV2() {
         int size = 600;
         String key = "android_concurrent_resume_no_key_v2_" + size + "k";
         File file = null;
@@ -310,7 +310,7 @@ public void testNoKeyV2(){
         TempFile.remove(file);
     }
 
-    public void test0kV2(){
+    public void test0kV2() {
         int size = 0;
         String key = "android_concurrent_resume_0k_v2_" + size + "k";
         File file = null;