Merge branch 'refactor' into develop

YangSen-qn · YangSen-qn · commit f5ba9e83d0f4 · 2020-09-08T11:30:24.000+08:00
diff --git a/library/library.iml b/library/library.iml
@@ -31,16 +31,16 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
diff --git 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
@@ -114,6 +114,8 @@ private void saveReportJsonString(final String jsonString){
             }
         }
 
+        LogUtil.d("=== log: \r\n" + jsonString);
+
         if (recorderFile.length() > config.maxRecordFileSize){
             return;
         }
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
@@ -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
@@ -17,6 +17,6 @@ class UploadRequestInfo {
     String currentRegionId;
 
     boolean shouldReportRequestLog(){
-        return requestType.equals(RequestTypeUpLog);
+        return !requestType.equals(RequestTypeUpLog);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@ private void saveReportJsonString(final String jsonString){`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ LogUtil.d("=== log: \r\n" + jsonString);`
	`118`	`+`
`117`	`119`	`if (recorderFile.length() > config.maxRecordFileSize){`
`118`	`120`	`return;`
`119`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ class UploadRequestInfo {`
`17`	`17`	`String currentRegionId;`
`18`	`18`
`19`	`19`	`boolean shouldReportRequestLog(){`
`20`		`- return requestType.equals(RequestTypeUpLog);`
	`20`	`+ return !requestType.equals(RequestTypeUpLog);`
`21`	`21`	`}`
`22`	`22`	`}`