Merge pull request #272 from longbai/pandora2

add pandora
qiniu · Jul 26, 2017 · 1784381 · 1784381
2 parents 31991f8 + b381f2b
commit 1784381
Show file tree

Hide file tree

Showing 29 changed files with 2,171 additions and 212 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.travis.yml b/.travis.yml
@@ -8,28 +8,29 @@ jdk:
 
 android:
   components:
-    # Uncomment the lines below if you want to
-    # use the latest revision of Android SDK Tools
+    - tools
     - platform-tools
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-24.0.2
+    - build-tools-26.0.0
 
     # The SDK version used to compile your project
-    - android-24
+    - android-25
+    - android-22
 
     # Specify at least one system image
     # if you need to run emulator(s) during your tests
-    - sys-img-armeabi-v7a-android-19
+    - sys-img-armeabi-v7a-android-22
 
     - extra-android-support
     - extra-android-m2repository
 
 # Emulator Management: Create, Start and Wait
 before_script:
-  - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
+  - android list targets
+  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  - emulator -avd test -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,13 @@
 #Changelog
 
+## 7.3.9 (2017-07-25)
+### 增加
+* 支持Pandora 上报
+
 ## 7.3.8 (2017-07-19)
 ### 修正
 * 7.3.7 引入的进度全部为 0.95 问题
 
-
 ## 7.3.7 (2017-07-06)
 * 上传日志收集使用 v3 版本
 * happy-dns 到 0.2.13 ，其修复了潜在的并发调用问题

diff --git a/library/build.gradle b/library/build.gradle
@@ -20,12 +20,12 @@ String version = versionName()
 int code = versionNameToCode(version)
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
     defaultConfig {
         //applicationId "com.qiniu.android"
         minSdkVersion 9
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode code
         versionName version
     }

diff --git a/library/library.iml b/library/library.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -20,7 +19,7 @@
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
@@ -46,42 +45,36 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -98,18 +91,14 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
-    <orderEntry type="library" exported="" name="happy-dns-0.2.7" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-3.8.1" level="project" />
+    <orderEntry type="library" exported="" name="happy-dns-0.2.13" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.13.0" level="project" />
+    <orderEntry type="library" exported="" name="android-android-25" level="project" />
   </component>
-</module>
+</module>
diff --git a/library/src/androidTest/java/com/qiniu/android/ACollectUploadInfoTest.java b/library/src/androidTest/java/com/qiniu/android/ACollectUploadInfoTest.java
@@ -30,11 +30,6 @@ public class ACollectUploadInfoTest extends AndroidTestCase {
         offer(4l);
     }};
 
-    @Override
-    protected void setUp() throws Exception {
-        testInit();
-    }
-
     public static void testInit() {
         Config.isRecord = true;
         Config.isUpload = true;
@@ -156,4 +151,9 @@ private static void showContent(File recordFile) {
             }
         }
     }
+
+    @Override
+    protected void setUp() throws Exception {
+        testInit();
+    }
 }
diff --git a/library/src/androidTest/java/com/qiniu/android/ACollectUploadInfoUpTest.java b/library/src/androidTest/java/com/qiniu/android/ACollectUploadInfoUpTest.java
@@ -30,11 +30,6 @@ public class ACollectUploadInfoUpTest extends AndroidTestCase {
         offer(4l);
     }};
 
-    @Override
-    protected void setUp() throws Exception {
-        testInit();
-    }
-
     public static void testInit() {
         Config.isRecord = true;
         Config.isUpload = true;
@@ -155,4 +150,9 @@ private static void showContent(File recordFile) {
             }
         }
     }
+
+    @Override
+    protected void setUp() throws Exception {
+        testInit();
+    }
 }
diff --git a/library/src/androidTest/java/com/qiniu/android/JsonTest.java b/library/src/androidTest/java/com/qiniu/android/JsonTest.java
@@ -2,11 +2,18 @@
 
 import android.test.AndroidTestCase;
 
+import com.qiniu.android.utils.Json;
+
 import junit.framework.Assert;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Created by Simon on 3/3/16.
  */
@@ -88,4 +95,18 @@ public void testNull() throws JSONException {
             Assert.assertEquals(str, ex.getMessage());
         }
     }
+
+    public void testEncodeMap() {
+        Map<String, Object> m = new HashMap<>();
+        m.put("a", 1);
+        String s = Json.encodeMap(m);
+        Assert.assertEquals("{\"a\":1}", s);
+    }
+
+    public void testEncodeList() {
+        List<String> l = new ArrayList<>();
+        l.add("a");
+        String s = Json.encodeList(l);
+        Assert.assertEquals("[\"a\"]", s);
+    }
 }