Skip to content

Commit c4cd143

Browse files
longbailongbai
committed
Merge pull request #200 from longbai/release_7.2.0
release 7.2.0
2 parents 5375ac7 + ac9ce51 commit c4cd143

File tree

8 files changed

+59
-43
lines changed

8 files changed

+59
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#Changelog
22

3+
## 7.2.0 (2016-04-29)
4+
5+
### 修改
6+
* okhttp依赖 升级到3.0
7+
38
## 7.1.3 (2016-03-07)
49

510
### 修正

‎README.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,21 @@ https://github.com/qiniudemo/qiniu-lab-android
1010

1111
## 安装
1212

13+
### 运行环境
14+
15+
| Qiniu SDK 版本 | 最低 Android版本 | 依赖库版本 |
16+
|:------------ :|:-----------------:|:------------------------:|
17+
| 7.2.x | Android 2.3+ | okhttp 3+ |
18+
| 7.1.x | Android 2.3+ | okhttp 2.6+ |
19+
| 7.0.8,7.0.9 | Android 2.2+ | android-async-http 1.4.9 |
20+
| 7.0.7 | Android 2.2+ | android-async-http 1.4.8 |
21+
1322
### 直接安装
14-
将sdk jar文件 复制到项目中去，sdk依赖 http://loopj.com/android-async-http/ 7.0.7版本依赖1.4.7,1.4.8；7.0.8及7.0.9依赖1.4.9。7.1.0 以后切换到okhttp(2.6及以上)[下载地址](http://search.maven.org/remotecontent?filepath=com/qiniu/qiniu-android-sdk/)
23+
将sdk jar文件 复制到项目中去，[下载地址](http://search.maven.org/remotecontent?filepath=com/qiniu/qiniu-android-sdk/) 还有对应的依赖库
1524
还有 happy-dns [下载地址](https://repo1.maven.org/maven2/com/qiniu/happy-dns/)
1625

1726
### 通过maven
18-
* 如果在Adroid Studio中使用，添加dependencies `compile 'com.qiniu:qiniu-android-sdk:7.1.+'` 或在项目中添加maven依赖
27+
* 如果在Adroid Studio中使用，添加dependencies `compile 'com.qiniu:qiniu-android-sdk:7.2.+'` 或在项目中添加maven依赖
1928
* 如果是eclipse, 也可以直接添加依赖来处理。
2029

2130
## 使用方法

‎library/library.iml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,32 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debugAndroidTest" />
8485
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
8687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8791
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8892
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8993
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
@@ -92,8 +96,10 @@
9296
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9397
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
9498
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
95100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
96101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
97103
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
98104
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
99105
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -105,7 +111,7 @@
105111
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
106112
<orderEntry type="sourceFolder" forTests="false" />
107113
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
108-
<orderEntry type="library" exported="" name="happy-dns-0.2.5" level="project" />
109-
<orderEntry type="library" exported="" name="okhttp-2.7.2" level="project" />
114+
<orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
115+
<orderEntry type="library" exported="" name="happy-dns-0.2.7" level="project" />
110116
</component>
111117
</module>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ public void testD700k() throws Throwable {
7373
templateData(700, 0.2);
7474
}
7575

76-
// public void testD1M() throws Throwable {
77-
// templateData(1024, 0.51);
78-
// }
79-
//
80-
// public void testD4M() throws Throwable {
81-
// templateData(4 * 1024, 0.6);
82-
// }
76+
public void testD1M() throws Throwable {
77+
templateData(1024, 0.51);
78+
}
79+
80+
public void testD4M() throws Throwable {
81+
templateData(4 * 1024, 0.6);
82+
}
8383

8484
private void templateFile(final int size, final double pos) throws Throwable {
8585
final File tempFile = TempFile.createFile(size);

‎library/src/main/java/com/qiniu/android/common/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
public final class Constants {
5-
public static final String VERSION = "7.1.3";
5+
public static final String VERSION = "7.2.0";
66

77
public static final String UTF_8 = "utf-8";
88
}

‎library/src/main/java/com/qiniu/android/http/Client.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ public final class Client {
3838
public static final String DefaultMime = "application/octet-stream";
3939
public static final String JsonMime = "application/json";
4040
public static final String FormMime = "application/x-www-form-urlencoded";
41-
42-
private OkHttpClient httpClient;
4341
private final UrlConverter converter;
42+
private OkHttpClient httpClient;
4443

4544
public Client() {
4645
this(null, 10, 30, null, null);

‎library/src/main/java/com/qiniu/android/http/ResponseInfo.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import com.qiniu.android.common.Constants;
55

6-
import org.json.JSONException;
76
import org.json.JSONObject;
87

98
import java.util.Locale;

‎library/src/main/java/com/qiniu/android/storage/ResumeUploader.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,25 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
8585
this.token = token;
8686
}
8787

88+
private static boolean isChunkOK(ResponseInfo info, JSONObject response) {
89+
return info.statusCode == 200 && info.error == null && (info.hasReqId() || isChunkResOK(response));
90+
}
91+
92+
private static boolean isChunkResOK(JSONObject response) {
93+
try {
94+
// getXxxx 若获取不到值,会抛出异常
95+
response.getString("ctx");
96+
response.getLong("crc32");
97+
} catch (Exception e) {
98+
return false;
99+
}
100+
return true;
101+
}
102+
103+
private static boolean isNotChunkToQiniu(ResponseInfo info, JSONObject response) {
104+
return info.statusCode < 500 && info.statusCode >= 200 && (!info.hasReqId() && !isChunkResOK(response));
105+
}
106+
88107
public void run() {
89108
int offset = recoveryFromRecord();
90109
try {
@@ -281,27 +300,6 @@ public void complete(ResponseInfo info, JSONObject response) {
281300
putChunk(address, offset, chunkSize, context, progress, complete, options.cancellationSignal);
282301
}
283302

284-
285-
private static boolean isChunkOK(ResponseInfo info, JSONObject response) {
286-
return info.statusCode == 200 && info.error == null && (info.hasReqId() || isChunkResOK(response));
287-
}
288-
289-
private static boolean isChunkResOK(JSONObject response) {
290-
try {
291-
// getXxxx 若获取不到值,会抛出异常
292-
response.getString("ctx");
293-
response.getLong("crc32");
294-
} catch (Exception e) {
295-
return false;
296-
}
297-
return true;
298-
}
299-
300-
301-
private static boolean isNotChunkToQiniu(ResponseInfo info, JSONObject response) {
302-
return info.statusCode < 500 && info.statusCode >= 200 && (!info.hasReqId() && !isChunkResOK(response));
303-
}
304-
305303
private int recoveryFromRecord() {
306304
if (config.recorder == null) {
307305
return 0;

0 commit comments

Comments
 (0)