version to 8.9.0

Author: YangSen-qn

.idea/gradle.xml

@@ -1,4 +1,8 @@
 #Changelog
+## 8.9.0（2025-06-12）
+* 调整
+  * 分片上传版本默认调整为 V2
+
 ## 8.8.0（2024-06-24）
 * 增加
   * 上传支持加速域名 

.idea/misc.xml

@@ -15,6 +15,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 
 | Qiniu SDK 版本 | 最低 Android版本   |       依赖库版本           |
 |--------------|-----------------|------------------------|
+| 8.9.x        |  Android 4.0+     |        okhttp 4+         |
 | 8.8.x        |  Android 4.0+     |        okhttp 4+         |
 | 8.7.x        |  Android 4.0+     |        okhttp 4+         |
 | 8.6.x        |  Android 4.0+     |        okhttp 4+         |
@@ -56,10 +57,10 @@ https://github.com/qiniudemo/qiniu-lab-android
 * Android Studio中添加dependencies 或者 在项目中添加maven依赖
 ```
 // 1. 直接导入
-implementation 'com.qiniu:qiniu-android-sdk:8.8.+'
+implementation 'com.qiniu:qiniu-android-sdk:8.9.+'
 
 // 2. 如果要修改okhttp依赖的版本，可采用以下方式（强烈建议使用七牛库依赖的okhttp版本）
-implementation ('com.qiniu:qiniu-android-sdk:8.8.+'){
+implementation ('com.qiniu:qiniu-android-sdk:8.9.+'){
     exclude (group: 'com.squareup.okhttp3', module: 'okhttp')
 }
 implementation 'com.squareup.okhttp3:okhttp:4.9.1'

CHANGELOG.md

@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.10.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

README.md

@@ -1,6 +1,6 @@
 #Tue Jun 10 16:58:52 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

build.gradle

@@ -21,7 +21,7 @@ int code = versionNameToCode(version)
 
 android {
     namespace 'com.qiniu.android'
-    compileSdk 36
+    compileSdk 33
 
     defaultConfig {
         minSdkVersion 14

gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,4 @@ POM_NAME=qiniu-android-sdk-library
 POM_ARTIFACT_ID=qiniu-android-sdk
 POM_PACKAGING=aar
 android.debug.obsoleteApi=true
-android.enableAapt2=false
 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

library/build.gradle

@@ -1,75 +1,74 @@
 package com.qiniu.android;
 
-import com.qiniu.android.common.FixedZone;
-import com.qiniu.android.common.Zone;
-
 /**
- * Created by bailong on 14/10/12.
+ * @author Created by bailong on 14/10/12.
+ * 测试用例参数配置
  */
 public final class TestConfig {
     // TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
-    // 华东上传凭证
-    public static final String bucket_z0 = "kodo-phone-zone0-space";
-    public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:wmvcWRPZgKz1WOc3ngyRRY1V1E4=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
-    // 华北上传凭证
-    public static final String bucket_z1 = "kodo-phone-zone1-space";
-    public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:gYdNM4k8dD9O9TlJZZg1N91eCxg=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
-    // 华南上传凭证
-    public static final String bucket_z2 = "kodo-phone-zone2-space";
-    public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:vqpz0ZxRvYg72NMJUZIvJ2xzwkM=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
-    // 北美上传凭证
-    public static final String bucket_na0 = "kodo-phone-zone-na0-space";
-    public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:y7lkaVlY_uY9lT1mNU65OnC3dSQ=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
-    // 东南亚上传凭证
-    public static final String bucket_as0 = "kodo-phone-zone-as0-space";
-    public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:t2hHmzO7XZbPSdEVD5G0B8Zt_V8=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczMTg0MSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
-    // 华北浙江2上传凭证
-    public static final String bucket_cn_east_2 = "kodo-phone-cn-east-2";
-    public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:obdz2DnVxpp5ATqjyUvncGAWj0U=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3NTQ3MzE4NDEsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
-    public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:S8GPcADE_SvizTqYBIr4Ho8VxPQ=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNzU0NzMxODQxLCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
-    // -----------
-    public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
+    /**
+     * 华东上传 Bucket
+     */
+    public static final String BUCKET_Z0 = "kodo-phone-zone0-space";
 
+    /**
+     * 华东上传 Token
+     */
+    public static final String TOKEN_Z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:yOpxWejHk_3fbAgKMXrU2hcHdn4=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    /**
+     * 华北上传 Bucket
+     */
+    public static final String BUCKET_Z1 = "kodo-phone-zone1-space";
 
-    //测试通用的token
-    public static final String commonToken = token_na0;
-    //dns prefetch token
-    public static final String uptoken_prefetch = "MP_Ebql_lSsUrDr7WrXn_5vKocQDLvTPCNEFeVmp:3KJpXCGMqm6EAYU71RF1HDmQrcE=:eyJzY29wZSI6ImFuZHJvaWR0ZXN0IiwiZGVhZGxpbmUiOjE1Njc0OTAxODF9";
+    /**
+     * 华北上传 Token
+     */
+    public static final String TOKEN_Z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:zfUWM_fef9HBm-rxBCr4vS7Cpew=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    /**
+     * 华南上传 Bucket
+     */
+    public static final String BUCKET_Z2 = "kodo-phone-zone2-space";
 
     /**
-     * 华东机房
+     * 华南上传 Token
      */
-    public static final Zone mock_bucket_zone0 = new FixedZone(new String[]{
-            "mock.upload.qiniup.com", "mock.upload-nb.qiniup.com",
-            "mock.upload-xs.qiniup.com", "mock.up.qiniup.com",
-            "mock.up-nb.qiniup.com", "mock.up-xs.qiniup.com",
-            "mock.upload.qbox.me", "up.qbox.me"
-    });
+    public static final String TOKEN_Z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:KMKQCK93-eNG26UoTrvVbbdnriI=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    /**
+     * 北美上传 Bucket
+     */
+    public static final String BUCKET_NA0 = "kodo-phone-zone-na0-space";
 
     /**
-     * 华北机房
+     * 北美上传 Token
+     */
+    public static final String TOKEN_NA0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:HB0atzwUWFZM58cYyssBKtPrTOQ=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    /**
+     * 东南亚上传 Bucket
      */
-    public static final Zone mock_bucket_zone1 = new FixedZone(new String[]{
-            "mock.upload-z1.qiniup.com", "mock.up-z1.qiniup.com",
-            "mock.upload-z1.qbox.me", "up-z1.qbox.me"
-    });
+    public static final String BUCKET_AS0 = "kodo-phone-zone-as0-space";
 
     /**
-     * 华南机房
+     * 东南亚上传 Token
      */
-    public static final Zone mock_bucket_zone2 = new FixedZone(new String[]{
-            "mock.upload-z2.qiniup.com", "mock.upload-gz.qiniup.com",
-            "mock.upload-fs.qiniup.com", "mock.up-z2.qiniup.com",
-            "mock.up-gz.qiniup.com", "mock.up-fs.qiniup.com",
-            "mock.upload-z2.qbox.me", "up-z2.qbox.me"
-    });
+    public static final String TOKEN_AS0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:PLEc_wBAnhcWAqIw_BTC9lBhyzs=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
+    /**
+     * 华北浙江2上传 Bucket
+     */
+    public static final String BUCKET_CN_EAST_2 = "kodo-phone-cn-east-2";
 
     /**
-     * 北美机房
+     * 华北浙江2上传 Token
      */
-    public static final Zone mock_bucket_zoneNa0 = new FixedZone(new String[]{
-            "mock.upload-na0.qiniu.com", "mock.up-na0.qiniup.com",
-            "mock.upload-na0.qbox.me", "up-na0.qbox.me"
-    });
+    public static final String TOKEN_CN_EAST_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:lrPAesFMWkyi310xoagnn5oKu08=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3NTQ3MzUyNjUsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
 
+    /**
+     * 测试使用的 AK
+     */
+    public static final String AK = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
+
+
+    /**
+     * 测试通用的token
+     */
+    public static final String COMMON_TOKEN = BUCKET_NA0;
 }

library/gradle.properties

@@ -52,7 +52,7 @@ public void testMultipartSyncPost() {
         postArgs.params = new StringMap();
         postArgs.params.put("x:foo", "foo");
 
-        UpToken token = UpToken.parse(TestConfig.commonToken);
+        UpToken token = UpToken.parse(TestConfig.COMMON_TOKEN);
 
         Client client = new Client(null, 90, 90, null, null);
         ResponseInfo responseInfo = client.syncMultipartPost("https://up.qiniup.com", postArgs, token);
@@ -70,7 +70,7 @@ public void testMultipartAsyncPost() {
         postArgs.mimeType = "text/plain";
         postArgs.params = new StringMap();
 
-        UpToken token = UpToken.parse(TestConfig.commonToken);
+        UpToken token = UpToken.parse(TestConfig.COMMON_TOKEN);
 
         Client client = new Client(null, 90, 90, null, null);
         client.asyncMultipartPost("https://up.qiniu.com", postArgs, token, null, new CompletionHandler() {