Skip to content

Commit 1784381

Browse files
longbailongbai
authored
Merge pull request #272 from longbai/pandora2
add pandora
2 parents 31991f8 + b381f2b commit 1784381

29 files changed

+2171
-212
lines changed

‎.idea/gradle.xml

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

‎.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.

‎.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,29 @@ jdk:
88

99
android:
1010
components:
11-
# Uncomment the lines below if you want to
12-
# use the latest revision of Android SDK Tools
11+
- tools
1312
- platform-tools
1413
- tools
1514

1615
# The BuildTools version used by your project
17-
- build-tools-24.0.2
16+
- build-tools-26.0.0
1817

1918
# The SDK version used to compile your project
20-
- android-24
19+
- android-25
20+
- android-22
2121

2222
# Specify at least one system image
2323
# if you need to run emulator(s) during your tests
24-
- sys-img-armeabi-v7a-android-19
24+
- sys-img-armeabi-v7a-android-22
2525

2626
- extra-android-support
2727
- extra-android-m2repository
2828

2929
# Emulator Management: Create, Start and Wait
3030
before_script:
31-
- echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
32-
- emulator -avd test -no-skin -no-audio -no-window &
31+
- android list targets
32+
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
33+
- emulator -avd test -no-audio -no-window &
3334
- android-wait-for-emulator
3435
- adb shell input keyevent 82 &
3536

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#Changelog
22

3+
## 7.3.9 (2017-07-25)
4+
### 增加
5+
* 支持Pandora 上报
6+
37
## 7.3.8 (2017-07-19)
48
### 修正
59
* 7.3.7 引入的进度全部为 0.95 问题
610

7-
811
## 7.3.7 (2017-07-06)
912
* 上传日志收集使用 v3 版本
1013
* happy-dns 到 0.2.13 ，其修复了潜在的并发调用问题

‎library/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ String version = versionName()
2020
int code = versionNameToCode(version)
2121

2222
android {
23-
compileSdkVersion 24
24-
buildToolsVersion '24.0.2'
23+
compileSdkVersion 25
24+
buildToolsVersion '25.0.2'
2525
defaultConfig {
2626
//applicationId "com.qiniu.android"
2727
minSdkVersion 9
28-
targetSdkVersion 24
28+
targetSdkVersion 25
2929
versionCode code
3030
versionName version
3131
}

‎library/library.iml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -20,7 +19,7 @@
2019
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2120
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2221
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23-
<option name="LIBRARY_PROJECT" value="true" />
22+
<option name="PROJECT_TYPE" value="1" />
2423
</configuration>
2524
</facet>
2625
</component>
@@ -46,42 +45,36 @@
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5351
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5452
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5553
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5654
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5855
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5956
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6057
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6158
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6259
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6360
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6461
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6662
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6864
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6965
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7066
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7167
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7268
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7469
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7570
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7671
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7772
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7873
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7974
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8075
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
81-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8276
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8377
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8578
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8679
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8780
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -98,18 +91,14 @@
9891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9992
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
10093
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
10394
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
10795
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
10896
</content>
109-
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
97+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
11098
<orderEntry type="sourceFolder" forTests="false" />
111-
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
112-
<orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
113-
<orderEntry type="library" exported="" name="happy-dns-0.2.7" level="project" />
99+
<orderEntry type="library" exported="" name="okhttp-3.8.1" level="project" />
100+
<orderEntry type="library" exported="" name="happy-dns-0.2.13" level="project" />
101+
<orderEntry type="library" exported="" name="okio-1.13.0" level="project" />
102+
<orderEntry type="library" exported="" name="android-android-25" level="project" />
114103
</component>
115-
</module>
104+
</module>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public class ACollectUploadInfoTest extends AndroidTestCase {
3030
offer(4l);
3131
}};
3232

33-
@Override
34-
protected void setUp() throws Exception {
35-
testInit();
36-
}
37-
3833
public static void testInit() {
3934
Config.isRecord = true;
4035
Config.isUpload = true;
@@ -156,4 +151,9 @@ private static void showContent(File recordFile) {
156151
}
157152
}
158153
}
154+
155+
@Override
156+
protected void setUp() throws Exception {
157+
testInit();
158+
}
159159
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public class ACollectUploadInfoUpTest extends AndroidTestCase {
3030
offer(4l);
3131
}};
3232

33-
@Override
34-
protected void setUp() throws Exception {
35-
testInit();
36-
}
37-
3833
public static void testInit() {
3934
Config.isRecord = true;
4035
Config.isUpload = true;
@@ -155,4 +150,9 @@ private static void showContent(File recordFile) {
155150
}
156151
}
157152
}
153+
154+
@Override
155+
protected void setUp() throws Exception {
156+
testInit();
157+
}
158158
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22

33
import android.test.AndroidTestCase;
44

5+
import com.qiniu.android.utils.Json;
6+
57
import junit.framework.Assert;
68

79
import org.json.JSONException;
810
import org.json.JSONObject;
911

12+
import java.util.ArrayList;
13+
import java.util.HashMap;
14+
import java.util.List;
15+
import java.util.Map;
16+
1017
/**
1118
* Created by Simon on 3/3/16.
1219
*/
@@ -88,4 +95,18 @@ public void testNull() throws JSONException {
8895
Assert.assertEquals(str, ex.getMessage());
8996
}
9097
}
98+
99+
public void testEncodeMap() {
100+
Map<String, Object> m = new HashMap<>();
101+
m.put("a", 1);
102+
String s = Json.encodeMap(m);
103+
Assert.assertEquals("{\"a\":1}", s);
104+
}
105+
106+
public void testEncodeList() {
107+
List<String> l = new ArrayList<>();
108+
l.add("a");
109+
String s = Json.encodeList(l);
110+
Assert.assertEquals("[\"a\"]", s);
111+
}
91112
}

0 commit comments

Comments
 (0)