Merge pull request #485 from YangSen-qn/develop

add ap-northeast-1

Author: bachue

CHANGELOG.md

@@ -1,4 +1,9 @@
 #Changelog
+## 8.5.1(2022-10-21)
+* 移除雾存储区域：华东一区
+* 新增首尔和华东浙江 2 区 Region
+* 优化分片上传 ctx 超时检测
+* Configuration: 增加 writeTimeout 配置属性，用于配置 tcp 写超时
 
 ## 8.5.0(2022-08-25)
 * 支持自定义 request client

README.md

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

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

@@ -10,6 +10,7 @@ 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:Qxeb7v5PXIrih_gwR-6pD1KsGgg=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTY2OTUzNDk3OCwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpfSJ9";
     // 华北上传凭证
     public static final String bucket_z1 = "kodo-phone-zone1-space";

library/src/main/java/com/qiniu/android/common/FixedZone.java

@@ -19,6 +19,13 @@ public final class FixedZone extends Zone {
             new String[]{"upload.qbox.me", "up.qbox.me"},
             "z0");
 
+    /**
+     * 华东浙江 2 机房
+     */
+    public static final Zone zoneCnEast2 = new FixedZone(new String[]{"upload-cn-east-2.qiniup.com", "up-cn-east-2.qiniup.com"},
+            null,
+            "cn-east-2");
+
     /**
      * 华北机房
      */
@@ -33,6 +40,13 @@ public final class FixedZone extends Zone {
             new String[]{"upload-z2.qbox.me", "up-z2.qbox.me"},
             "z2");
 
+    /**
+     * 首尔机房
+     */
+    public static final Zone zoneApNorthEast1 = new FixedZone(new String[]{"upload-ap-northeast-1.qiniup.com", "up-ap-northeast-1.qiniup.com"},
+            null,
+            "ap-northeast-1");
+
     /**
      * 北美机房
      */
@@ -47,29 +61,16 @@ public final class FixedZone extends Zone {
             new String[]{"upload-as0.qbox.me", "up-as0.qbox.me"},
             "as0");
 
-    /**
-     *    zone fog-cn-east-1 雾存储 华东-1
-     *    分片上传暂时仅支持分片 api v2
-     *    分片 api v2设置方式：配置 Configuration 的 resumeUploadVersion 为 Configuration.RESUME_UPLOAD_VERSION_V2
-     *    eg:
-     *    Configuration configuration = new Configuration.Builder()
-     *                 .resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
-     *                 .build();
-     *
-     *    @return 实例
-     */
-    public static final Zone zoneFogCnEast1 = new FixedZone(new String[]{"upload-fog-cn-east-1.qiniup.com", "up-fog-cn-east-1.qiniup.com"},
-            new String[]{"upload-fog-cn-east-1.qiniup.com", "up-fog-cn-east-1.qiniup.com"},
-            "fog-cn-east-1");
-
     private ZonesInfo zonesInfo;
 
     public static FixedZone localsZoneInfo() {
         ArrayList<FixedZone> localsZone = new ArrayList<>();
         localsZone.add((FixedZone)zone0);
+        localsZone.add((FixedZone)zoneCnEast2);
         localsZone.add((FixedZone)zone1);
         localsZone.add((FixedZone)zone2);
         localsZone.add((FixedZone)zoneNa0);
+        localsZone.add((FixedZone)zoneApNorthEast1);
         localsZone.add((FixedZone)zoneAs0);
 
         ArrayList<ZoneInfo> zoneInfoArray = new ArrayList<>();
@@ -115,9 +116,12 @@ private ZonesInfo createZonesInfo(String[] upDomains,
 
         List<String> upDomainsList = new ArrayList<String>(Arrays.asList(upDomains));
         List<String> oldUpDomainsList = null;
-        if (oldUpDomains != null){
+        if (oldUpDomains != null && oldUpDomains.length > 0){
             oldUpDomainsList = new ArrayList<String>(Arrays.asList(oldUpDomains));
+        } else {
+            oldUpDomainsList = new ArrayList<>();
         }
+
         ZoneInfo zoneInfo = ZoneInfo.buildInfo(upDomainsList, oldUpDomainsList, regionId);
         if (zoneInfo == null) {
             return null;

library/src/main/java/com/qiniu/android/storage/KeyGenerator.java

@@ -7,11 +7,11 @@
  */
 public interface KeyGenerator {
     /**
-     * 根据服务器的key和本地文件名生成持久化纪录的key
+     * 根据服务器的 key 和本地文件名生成持久化纪录的 key
      *
-     * @param key  服务器的key
+     * @param key  服务器的 key
      * @param file 本地文件名
-     * @return 持久化上传纪录的key
+     * @return 持久化上传纪录的 key
      */
     @Deprecated
     String gen(String key, File file);