diff --git a/CHANGELOG.md b/CHANGELOG.md index 66359fa67..337eec7fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ #Changelog +## 8.0.1 (2020-09-08) +* 修复日志统计问题 ## 8.0.0 (2020-08-06) ## 重构 @@ -10,7 +12,7 @@ 8.0.0版本是在7.x版本基础上,在保证上传接口不变的条件下进行的升级,代码修改信息如下: - 增加的内部使用类:GlobalConfiguration(dns配置类)、HttpRegionRequest、UploadRequestState等 -- 废弃类:UploadInfoReporter +- 废弃类:HttpResponseInfo、UploadInfoReporter - 修改了一些7.x内部使用类的API - UploadManager上传接口进行了少量调整 @@ -18,6 +20,10 @@ 详细情况请参考:[Android_Changes_from_7.x_to_8.0.0.md](./doc/Android_Changes_from_7.x_to_8.0.0.md) +# 7.7.0 +* 压缩上报的日志内容 +* 获取AutoZone信息接口升级至v4 + # 7.6.7 * 修复创建dns缓存文件失败问题 diff --git a/README.md b/README.md index ce31eb4ca..b73e8819e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ https://github.com/qiniudemo/qiniu-lab-android | 7.0.7 | Android 2.2+ | android-async-http 1.4.8 | ### 注意 -* 推荐使用最新版:8.0.0 +* 推荐使用最新版:8.0.1 * AndroidNetwork.getMobileDbm()可以获取手机信号强度,需要如下权限(API>=18时生效) ``` diff --git a/library/library.iml b/library/library.iml index 70694cba8..8263cb11e 100644 --- a/library/library.iml +++ b/library/library.iml @@ -31,16 +31,16 @@ + + - - - + diff --git a/library/src/main/java/com/qiniu/android/collect/ReportItem.java b/library/src/main/java/com/qiniu/android/collect/ReportItem.java index 23482c976..747120a47 100644 --- a/library/src/main/java/com/qiniu/android/collect/ReportItem.java +++ b/library/src/main/java/com/qiniu/android/collect/ReportItem.java @@ -123,6 +123,8 @@ public static String requestReportErrorType(ResponseInfo responseInfo){ errorType = "network_error"; } else if (responseInfo.statusCode == ResponseInfo.TimedOut){ errorType = "timeout"; + } else if (responseInfo.statusCode == ResponseInfo.UnknownHost){ + errorType = "unknown_host"; } else if (responseInfo.statusCode == ResponseInfo.CannotConnectToHost){ errorType = "cannot_connect_to_host"; } else if (responseInfo.statusCode == ResponseInfo.NetworkConnectionLost){ diff --git a/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java b/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java index 48a6b37ec..652f5837f 100644 --- a/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java +++ b/library/src/main/java/com/qiniu/android/collect/UploadInfoReporter.java @@ -113,7 +113,7 @@ private void saveReportJsonString(final String jsonString){ return; } } - + if (recorderFile.length() > config.maxRecordFileSize){ return; } diff --git a/library/src/main/java/com/qiniu/android/common/Constants.java b/library/src/main/java/com/qiniu/android/common/Constants.java index 8f9becdcd..836d675d1 100644 --- 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 = "8.0.0"; + public static final String VERSION = "8.0.1"; public static final String UTF_8 = "utf-8"; } diff --git a/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java b/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java index f1d516acc..b80280cb0 100644 --- a/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java +++ b/library/src/main/java/com/qiniu/android/http/request/RequestTransaction.java @@ -20,7 +20,6 @@ import org.json.JSONException; import org.json.JSONObject; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Set; @@ -34,7 +33,7 @@ public class RequestTransaction { private final String userAgent; private UploadRequestInfo requestInfo; - private UploadRequestState requstState; + private UploadRequestState requestState; private HttpRegionRequest regionRequest; @@ -85,12 +84,13 @@ private RequestTransaction(Configuration config, private void initData(IUploadRegion targetRegion, IUploadRegion currentRegion){ - this.requstState = new UploadRequestState(); + this.requestState = new UploadRequestState(); this.requestInfo = new UploadRequestInfo(); this.requestInfo.targetRegionId = targetRegion.getZoneInfo().getRegionId(); this.requestInfo.currentRegionId = currentRegion.getZoneInfo().getRegionId(); this.requestInfo.bucket = token.bucket; - this.regionRequest = new HttpRegionRequest(config, uploadOption, token, currentRegion, this.requestInfo, this.requstState); + this.requestInfo.key = this.key; + this.regionRequest = new HttpRegionRequest(config, uploadOption, token, currentRegion, this.requestInfo, this.requestState); } diff --git a/library/src/main/java/com/qiniu/android/http/request/UploadRequestInfo.java b/library/src/main/java/com/qiniu/android/http/request/UploadRequestInfo.java index 341e30adf..2f8ddec72 100644 --- a/library/src/main/java/com/qiniu/android/http/request/UploadRequestInfo.java +++ b/library/src/main/java/com/qiniu/android/http/request/UploadRequestInfo.java @@ -17,6 +17,6 @@ class UploadRequestInfo { String currentRegionId; boolean shouldReportRequestLog(){ - return requestType.equals(RequestTypeUpLog); + return !requestType.equals(RequestTypeUpLog); } }