Merge pull request #405 from YangSen-qn/refactor

bachue · web-flow · commit fc762c2f12ea · 2020-08-11T17:35:01.000+08:00
change readme
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,24 @@
 #Changelog
+## 8.0.0 (2020-08-06)
+## 重构
+8.0.0版本相对于7.4.6版本的改进：
+- 优化上传流程
+- 优化重试方案
+
+8.0.0版本是在7.x版本基础上，在保证上传接口不变的条件下进行的升级，代码修改信息如下：
+- 增加的内部使用类：GlobalConfiguration(dns配置类)、HttpRegionRequest、UploadRequestState等
+- 废弃类：HttpResponseInfo、UploadInfoReporter
+- 修改了一些7.x内部使用类的API
+- UploadManager上传接口进行了少量调整
+
+如果您并未对7.x SDK 进行过深度定制，而是直接对接QNUploadManager进行上传，那么SDK版本升级只需要花费几分钟的时间进行即可。
+
+详细情况请参考：[Android_Changes_from_7.x_to_8.0.0.md](./doc/Android_Changes_from_7.x_to_8.0.0.md)
+
+注：
+- dns配置类：GlobalConfiguration
+- 设置并发上传：Configuration -> useConcurrentResumeUpload & concurrentTaskCount
+
 # 7.6.5
 * 优化Dns local cache
 
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ https://github.com/qiniudemo/qiniu-lab-android
 
 | Qiniu SDK 版本 | 最低 Android版本   |       依赖库版本           | 
 |------------ |-----------------|------------------------|
+|  8.0.x        |  Android 5.0+     |        okhttp 4+         |
 |  7.6.x        |  Android 5.0+     |        okhttp 4+         |
 |  7.5.x        |  Android 5.0+     |        okhttp 4+         |
 |  7.4.6        |  Android 4.0+     |        okhttp 3.12.6     |
@@ -25,13 +26,12 @@ https://github.com/qiniudemo/qiniu-lab-android
 |  7.0.7        |  Android 2.2+     | android-async-http 1.4.8 |
 
 ### 注意
-* 推荐使用最新版：7.6.5
+* 推荐使用最新版：8.0.0
 * AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
 ```
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 ```
-* 从 7.3.13 开始，不在强制依赖 `happy-dns-android`，默认不再提供 `httpDns`，可以调用 `Configuration.Builder#dns(com.qiniu.android.http.Dns)`方法设置外部 `Dns`，自定义 `Dns` 要求实现 `com.qiniu.android.http.Dns` 接口。
 * 从7.5.0开始增加了DNS预取和缓存策略，减少dns解析错误
 * 如果可以明确 区域 的话，最好指定固定区域，这样可以少一步网络请求，少一步出错的可能。
 
@@ -44,10 +44,10 @@ https://github.com/qiniudemo/qiniu-lab-android
 * Adroid Studio中添加dependencies 或者 在项目中添加maven依赖
 ```
 // 1. 直接导入
-implementation 'com.qiniu:qiniu-android-sdk:7.6.+'
+implementation 'com.qiniu:qiniu-android-sdk:8.0.+'
 
 // 2. 如果要修改okhttp依赖的版本，可采用以下方式（强烈建议使用七牛库依赖的okhttp版本）
-implementation ('com.qiniu:qiniu-android-sdk:7.6.+'){
+implementation ('com.qiniu:qiniu-android-sdk:8.0.+'){
     exclude (group: 'com.squareup.okhttp3', module: 'okhttp')
 }
 implementation 'com.squareup.okhttp3:okhttp:4.2.2'
@@ -62,15 +62,15 @@ UploadManager 可以创建一次，一直使用。
 ```java
 import com.qiniu.android.storage.UploadManager;
 ...
-    String token = "从服务端SDK获取";
-    UploadManager uploadManager = new UploadManager();
-    uploadManager.put("Hello, World!".getBytes(), "hello", token,
-    new UpCompletionHandler() {
-        @Override
-        public void complete(String key, ResponseInfo info, JSONObject response) {
-            LogUtil.i(info);
-        }
-    }, null);
+String token = "从服务端SDK获取";
+UploadManager uploadManager = new UploadManager();
+uploadManager.put("Hello, World!".getBytes(), "hello", token,
+new UpCompletionHandler() {
+    @Override
+    public void complete(String key, ResponseInfo info, JSONObject response) {
+        LogUtil.i(info);
+    }
+}, null);
 ...
 ```
 
@@ -554,6 +554,8 @@ public class MainActivity extends Activity implements View.OnClickListener {
 具体可以参考源码：
 https://github.com/qiniu/android-sdk/blob/c4cd1437aa1f2a0d68122e46b83580facdf1b74a/library/src/main/java/com/qiniu/android/http/ResponseInfo.java
 ```
+public static final int MaliciousResponseError = -8;
+public static final int LocalIOError = -7;
 public static final int ZeroSizeFile = -6;
 public static final int InvalidToken = -5;
 public static final int InvalidArgument = -4;
diff --git a/doc/Android_Changes_from_7.x_to_8.0.0.md b/doc/Android_Changes_from_7.x_to_8.0.0.md
@@ -0,0 +1,212 @@
+
+# Differences from 7.6.4 to 8.0.0
+
+注：
+- dns配置类：`GlobalConfiguration`
+- 设置并发上传：`Configuration` -> `useConcurrentResumeUpload` & `concurrentTaskCount`
+
+
+## 1. com.qiniu.android.storage
+### 1.1 change class
+**remove:**
+- com.qiniu.android.storage.ResumeUploaderFast
+
+
+### 1.2 change file
+#### 1.2.1 com.qiniu.android.storage.UploadManager
+**remove:**
+- `UploadManager(Configuration config, int multitread)`
+- `UploadManager(Recorder recorder, int multitread)`
+- `UploadManager(Recorder recorder, KeyGenerator keyGen, int multitread)`
+
+#### 1.2.2 com.qiniu.android.storage.Builder 
+**add:**
+- `property` : `allowBackupHost`
+- `property` : `concurrentTaskCount`
+- `property` : `useConcurrentResumeUpload`
+
+**remove:**
+- `func` : `UploadManager(Configuration config, int multitread)`
+- `func` : `UploadManager(Recorder recorder, int multitread)`
+- `func` : `UploadManager(Recorder recorder, KeyGenerator keyGen, int multitread)`
+- `property` : `dns`
+- `property` : `dnsCacheTimeMs`
+
+
+
+
+## 2. com.qiniu.android.bigdata.client
+### 2.1 change class
+**add:** 
+- com.qiniu.android.bigdata.client.Client
+- com.qiniu.android.bigdata.client.PostArgs
+
+
+## 3. com.qiniu.android.collect
+### 3.1 change class
+**add:** 
+- com.qiniu.android.collect.ReportConfig
+- com.qiniu.android.collect.ReportItem
+- com.qiniu.android.collect.UploadInfoReporter
+
+**remove:**
+- com.qiniu.android.collect.Config
+- com.qiniu.android.collect.UploadInfo
+- com.qiniu.android.collect.UploadInfoCollector
+- com.qiniu.android.collect.UploadInfoCollector.RecordMsg
+- com.qiniu.android.collect.UploadInfoElement
+- com.qiniu.android.collect.UploadInfoElement.BlockInfo
+- com.qiniu.android.collect.UploadInfoElement.ReqInfo
+- com.qiniu.android.collect.UploadInfoElement.UploadQuality
+- com.qiniu.android.collect.UploadInfoElementCollector
+
+
+## 4. com.qiniu.android.common
+### 4.1 change class
+**add:** 
+- com.qiniu.android.common.ZoneInfo.UploadServerGroup
+- com.qiniu.android.common.Config
+
+### 4.2 change file
+#### 4.2.1 com.qiniu.android.common.Zone.QueryHandler
+**add:**
+- `func` : `void complete(int code, ResponseInfo responseInfo, UploadRegionRequestMetrics metrics)`
+
+**remove:**
+- `func` : `void onSuccess()`
+- `func` : `void onFailure(int reason)`
+
+
+#### 4.2.2 com.qiniu.android.common.FixedZone
+**add:**
+- `func` : `FixedZone(java.lang.String[] upDomains, java.lang.String[] ioDomains)`
+- `func` : `FixedZone(ZonesInfo zonesInfo)`
+- `func` : `ZonesInfo getZonesInfo(UpToken token)`
+- `func` : `static FixedZone    localsZoneInfo()`
+- `func` : `void    preQuery(UpToken token, Zone.QueryHandler completeHandler)`
+
+**remove:**
+- `property` : arrayzone0
+- `property` : arrayzone1
+- `property` : arrayzone2
+- `property` : arrayzoneAs0
+- `property` : arrayzoneNa0
+- `func` : `static ZoneInfo createZoneInfo(java.lang.String[] upDomains)`
+- `func` : `void    frozenDomain(java.lang.String upHostUrl)`
+- `func` : `static java.util.List<ZoneInfo> getZoneInfos()`
+- `func` : `boolean preQuery(LogHandler logHandler, java.lang.String token)`
+- `func` : `void    preQuery(LogHandler logHandler, java.lang.String token, Zone.QueryHandler complete)`
+- `func` : `java.lang.String    upHost(java.lang.String upToken, boolean useHttps, java.lang.String frozenDomain)`
+
+
+
+## 5 com.qiniu.android.http
+### 5.1 change class
+**remove:**
+- com.qiniu.android.http.Client
+- com.qiniu.android.http.Client.ResponseTag
+- com.qiniu.android.http.CountingRequestBody
+- com.qiniu.android.http.DnsPrefetcher
+- com.qiniu.android.http.HttpEventListener
+- com.qiniu.android.http.MultipartBody
+- com.qiniu.android.http.MultipartBody.Builder
+- com.qiniu.android.http.MultipartBody.Part
+- com.qiniu.android.http.PostArgs
+
+### 5.2 change file
+#### 5.2.1 com.qiniu.android.http.ResponseInfo
+**add:**
+- `LocalIOError`
+- `static MaliciousResponseError`
+- `message`
+- `static NetworkSlow`
+- `static NetworkSSLError`
+- `static PasrseError `
+- `responseHeader`
+- `static ResquestSuccess `
+
+**remove:**
+- `bytes_sent`
+- `duration`
+- `requests_count`
+- `totalSize`
+
+
+## 6 com.qiniu.android.http.dns
+### 6.1 change class
+**add:**
+- com.qiniu.android.http.dns.Dns
+- com.qiniu.android.http.dns.IDnsNetworkAddress
+- com.qiniu.android.http.dns.DnsCacheFile
+- com.qiniu.android.http.dns.DnsPrefetcher
+- com.qiniu.android.http.dns.DnsPrefetchTransaction
+- com.qiniu.android.http.dns.HappyDns
+- com.qiniu.android.http.dns.SystemDns
+
+
+## 7 com.qiniu.android.http.metrics
+### 7.1 change class
+**add:**
+- com.qiniu.android.http.metrics.UploadRegionRequestMetrics
+- com.qiniu.android.http.metrics.UploadSingleRequestMetrics
+- com.qiniu.android.http.metrics.UploadTaskMetrics
+
+
+## 8 com.qiniu.android.http.request
+### 8.1 change class
+**add:**
+- com.qiniu.android.http.request.IRequestClient
+- com.qiniu.android.http.request.IRequestClient.RequestClientCompleteHandler
+- com.qiniu.android.http.request.IRequestClient.RequestClientProgress
+- com.qiniu.android.http.request.IUploadServer
+- com.qiniu.android.http.request.RequestTransaction.RequestCompleteHandler
+- com.qiniu.android.http.request.IUploadRegion
+- com.qiniu.android.http.request.Request
+- com.qiniu.android.http.request.RequestTransaction
+- com.qiniu.android.http.request.UploadFileInfo
+- com.qiniu.android.http.request.UploadFileInfo.UploadBlock
+- com.qiniu.android.http.request.UploadFileInfo.UploadData
+
+
+## 9 com.qiniu.android.http.request.handler
+### 9.1 change class
+**add:**
+- com.qiniu.android.http.request.handler.CheckCancelHandler
+- com.qiniu.android.http.request.handler.RequestProgressHandler
+- com.qiniu.android.http.request.handler.RequestShouldRetryHandler
+
+
+## 10 com.qiniu.android.http.request.httpclient
+### 10.1 change class
+**add:**
+- com.qiniu.android.http.request.httpclient.ByteBody
+- com.qiniu.android.http.request.httpclient.CountingRequestBody
+- com.qiniu.android.http.request.httpclient.MultipartBody
+- com.qiniu.android.http.request.httpclient.MultipartBody.Builder
+- com.qiniu.android.http.request.httpclient.MultipartBody.Part
+- com.qiniu.android.http.request.httpclient.SystemHttpClient
+
+
+## 11 com.qiniu.android.http.request.serverRegion
+### 11.1 change class
+**add:**
+- com.qiniu.android.http.request.serverRegion.UploadDomainRegion
+- com.qiniu.android.http.request.serverRegion.UploadServer
+- com.qiniu.android.http.request.serverRegion.UploadServerFreezeManager
+
+
+## 12 com.qiniu.android.transaction
+### 12.1 change class
+**add:**
+- com.qiniu.android.transaction.TransactionManager
+- com.qiniu.android.transaction.TransactionManager.Transaction
+
+
+## 13 com.qiniu.android.transaction
+### 13.1 change class
+**add:**
+- com.qiniu.android.transaction.GroupTaskThread.GroupTaskCompleteHandler
+- com.qiniu.android.transaction.GroupTaskThread
+- com.qiniu.android.transaction.LogUtil
+- com.qiniu.android.transaction.Utils
+- com.qiniu.android.transaction.Wait
diff --git a/library/src/main/java/com/qiniu/android/common/Constants.java b/library/src/main/java/com/qiniu/android/common/Constants.java
@@ -2,7 +2,7 @@
 
 
 public final class Constants {
-    public static final String VERSION = "7.6.5";
+    public static final String VERSION = "8.0.0";
 
     public static final String UTF_8 = "utf-8";
 }
diff --git a/library/src/main/java/com/qiniu/android/storage/ConcurrentResumeUpload.java b/library/src/main/java/com/qiniu/android/storage/ConcurrentResumeUpload.java
@@ -6,6 +6,7 @@
 import com.qiniu.android.http.request.IUploadRegion;
 import com.qiniu.android.http.request.handler.RequestProgressHandler;
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
+import com.qiniu.android.utils.AsyncRun;
 import com.qiniu.android.utils.GroupTaskThread;
 
 import org.json.JSONException;
@@ -74,7 +75,12 @@ public void complete(ResponseInfo responseInfo, JSONObject response) {
                                     completeAction(responseInfo, response);
                                 }
                             } else {
-                                option.progressHandler.progress(key, 1.0);
+                                AsyncRun.runInMain(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        option.progressHandler.progress(key, 1.0);
+                                    }
+                                });
                                 removeUploadInfoRecord();
                                 completeAction(responseInfo, response);
                             }
diff --git a/library/src/main/java/com/qiniu/android/storage/FormUpload.java b/library/src/main/java/com/qiniu/android/storage/FormUpload.java
@@ -4,6 +4,7 @@
 import com.qiniu.android.http.request.RequestTransaction;
 import com.qiniu.android.http.request.handler.RequestProgressHandler;
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
+import com.qiniu.android.utils.AsyncRun;
 
 import org.json.JSONObject;
 
@@ -50,7 +51,12 @@ public void progress(long totalBytesWritten, long totalBytesExpectedToWrite) {
             public void complete(ResponseInfo responseInfo, UploadRegionRequestMetrics requestMetrics, JSONObject response) {
                 addRegionRequestMetricsOfOneFlow(requestMetrics);
                 if (responseInfo.isOK()){
-                    option.progressHandler.progress(key, 1.0);
+                    AsyncRun.runInMain(new Runnable() {
+                        @Override
+                        public void run() {
+                            option.progressHandler.progress(key, 1.0);
+                        }
+                    });
                     completeAction(responseInfo, response);
                 } else if (responseInfo.couldRetry() && config.allowBackupHost){
                     boolean isSwitched = switchRegionAndUpload();
diff --git a/library/src/main/java/com/qiniu/android/storage/ResumeUpload.java b/library/src/main/java/com/qiniu/android/storage/ResumeUpload.java
@@ -6,6 +6,7 @@
 import com.qiniu.android.http.request.IUploadRegion;
 import com.qiniu.android.http.request.handler.RequestProgressHandler;
 import com.qiniu.android.http.metrics.UploadRegionRequestMetrics;
+import com.qiniu.android.utils.AsyncRun;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -64,7 +65,12 @@ public void complete(ResponseInfo responseInfo, JSONObject response) {
                                     completeAction(responseInfo, response);
                                 }
                             } else {
-                                option.progressHandler.progress(key, 1.0);
+                                AsyncRun.runInMain(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        option.progressHandler.progress(key, 1.0);
+                                    }
+                                });
                                 removeUploadInfoRecord();
                                 completeAction(responseInfo, response);
                             }
diff --git a/library/src/main/java/com/qiniu/android/storage/UploadManager.java b/library/src/main/java/com/qiniu/android/storage/UploadManager.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`public final class Constants {`
`5`		`- public static final String VERSION = "7.6.5";`
	`5`	`+ public static final String VERSION = "8.0.0";`
`6`	`6`
`7`	`7`	`public static final String UTF_8 = "utf-8";`
`8`	`8`	`}`