Skip to content

Commit 6b9ee88

Browse files
Mei-ZhaoMei-Zhao
authored
Merge pull request #441 from YangSen-qn/develop
optimize some code
2 parents 8c0defd + 8071f14 commit 6b9ee88

25 files changed

+441
-200
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#Changelog
2+
## 8.0.5 (2020-11-18)
3+
* 缩短Host全局冻结默认时间
4+
* 优化无可用Host的处理逻辑
5+
26
## 8.0.4 (2020-11-03)
37
* 优化Host冻结逻辑带来客户端上传超时问题，提高上传成功率
48

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ https://github.com/qiniudemo/qiniu-lab-android
2727
| 7.0.7 | Android 2.2+ | android-async-http 1.4.8 |
2828

2929
### 注意
30-
* 推荐使用最新版：8.0.4
30+
* 推荐使用最新版：8.0.5
3131
* AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
3232
```
3333
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

‎library/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ android {
4949
useLibrary 'android.test.mock'
5050
}
5151

52+
5253
dependencies {
5354
implementation 'com.squareup.okhttp3:okhttp:4.2.2'
5455
implementation 'com.qiniu:happy-dns:0.2.16'

‎library/library.iml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":library" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
9+
</configuration>
10+
</facet>
11+
<facet type="android" name="Android">
12+
<configuration>
13+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
14+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
15+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
16+
<afterSyncTasks>
17+
<task>generateDebugSources</task>
18+
</afterSyncTasks>
19+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
20+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
21+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
24+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
25+
<option name="PROJECT_TYPE" value="1" />
26+
</configuration>
27+
</facet>
28+
</component>
29+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
30+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
32+
<exclude-output />
33+
<content url="file://$MODULE_DIR$">
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
46+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
90+
</content>
91+
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
92+
<orderEntry type="sourceFolder" forTests="false" />
93+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.13@jar" level="project" />
94+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
95+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.2.2@jar" level="project" />
96+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2@jar" level="project" />
97+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50@jar" level="project" />
98+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50@jar" level="project" />
99+
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
100+
<orderEntry type="library" name="Gradle: com.qiniu:happy-dns:0.2.16@jar" level="project" />
101+
<orderEntry type="library" name="Gradle: org.conscrypt:conscrypt-android:2.2.1@aar" level="project" />
102+
<orderEntry type="library" name="Gradle: android.test.mock-android-29" level="project" />
103+
<orderEntry type="library" name="Gradle: android.test.base-android-29" level="project" />
104+
<orderEntry type="library" name="Gradle: android.test.runner-android-29" level="project" />
105+
</component>
106+
</module>

‎library/src/androidTest/java/com/qiniu/android/ConcurrentResumeUploadTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private void template(int size) throws Throwable {
9696
final UploadOptions options = getUploadOptions();
9797
AsyncRun.runInMain(new Runnable() { // THIS IS THE KEY TO SUCCESS
9898
public void run() {
99-
uploadManager.put(f, expectKey, TestConfig.token_z0, new UpCompletionHandler() {
99+
uploadManager.put(f, expectKey, TestConfig.token_na0, new UpCompletionHandler() {
100100
public void complete(String k, ResponseInfo rinfo, JSONObject response) {
101101
LogUtil.i(k + rinfo);
102102
key = k;
@@ -130,14 +130,14 @@ private void template2(int size) throws Throwable {
130130

131131
final String expectKey = "android-resume-test2-" + size + "k";
132132
final File f = TempFile.createFile(size);
133-
String[] s = new String[]{"up.qbox.me", "upload.qiniup.com"};
133+
String[] s = new String[]{"upload-na0.qbox.me", "up-na0.qbox.me"};
134134
Zone z = new FixedZone(s);
135135
Configuration c = new Configuration.Builder()
136136
.zone(z).useConcurrentResumeUpload(true).useHttps(true)
137137
.build();
138138
UploadManager uploadManager2 = new UploadManager(c);
139139
final UploadOptions options = getUploadOptions();
140-
uploadManager2.put(f, expectKey, TestConfig.token_z0, new UpCompletionHandler() {
140+
uploadManager2.put(f, expectKey, TestConfig.token_na0, new UpCompletionHandler() {
141141
public void complete(String k, ResponseInfo rinfo, JSONObject response) {
142142
LogUtil.i(k + rinfo);
143143
key = k;

‎library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void template(int size, boolean useHttps) throws Throwable {
8888

8989
final String expectKey = "android-resume-test2-" + size + "k";
9090
final File f = TempFile.createFile(size);
91-
String[] s = new String[]{"up-na0.qbox.me"};
91+
String[] s = new String[]{"up-na0.qbox.me", "upload-na0.qbox.me"};
9292
Zone z = new FixedZone(s);
9393

9494
Configuration.Builder builder = new Configuration.Builder()

‎library/src/androidTest/java/com/qiniu/android/RetryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private void template(int size, boolean hasValidHost, final CompleteHandler comp
145145
"uptemp09.qbox.me", "uptemp10.qbox.me",
146146
"uptemp11.qbox.me", "uptemp12.qbox.me",
147147
"uptemp13.qbox.me", "uptemp14.qbox.me",
148-
"upload.qiniup.com"};
148+
"upload-na0.qbox.me", "up-na0.qbox.me"};
149149
} else {
150150
s = new String[]{"uptemp01.qbox.me", "uptemp02.qbox.me",
151151
"uptemp03.qbox.me", "uptemp04.qbox.me",
@@ -167,7 +167,7 @@ public void progress(String key, double percent) {
167167
LogUtil.i(("progress:" + percent));
168168
}
169169
}, null);
170-
uploadManager.put(f, expectKey, TestConfig.token_z0, new UpCompletionHandler() {
170+
uploadManager.put(f, expectKey, TestConfig.token_na0, new UpCompletionHandler() {
171171

172172
public void complete(String k, ResponseInfo rinfo, JSONObject response) {
173173

‎library/src/androidTest/java/com/qiniu/android/TokenTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package com.qiniu.android;
22

33
import android.test.AndroidTestCase;
4-
54
import com.qiniu.android.storage.UpToken;
65

7-
import junit.framework.Assert;
8-
96
/**
107
* Created by bailong on 15/6/1.
118
*/

0 commit comments

Comments
 (0)