Merge pull request #373 from JemyCheung/v4log

V4log

Author: bachue

.gitignore

@@ -32,3 +32,4 @@ build/
 .idea/libraries
 .idea/kotlinc.xml
 .idea/caches/
+library/library.iml

library/build.gradle

@@ -24,7 +24,7 @@ android {
     buildToolsVersion '29.0.2'
     defaultConfig {
         //applicationId "com.qiniu.android"
-        minSdkVersion 15
+        minSdkVersion 18
         targetSdkVersion 26
         versionCode code
         versionName version
@@ -55,6 +55,7 @@ dependencies {
 //    implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
 }
 
 task releaseJar(type: Jar, dependsOn: 'build') {

library/library.iml

@@ -108,6 +108,7 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.6@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.test.mock-android-29" level="project" />
     <orderEntry type="library" name="Gradle: android.test.base-android-29" level="project" />
     <orderEntry type="library" name="Gradle: android.test.runner-android-29" level="project" />

library/src/androidTest/java/com/qiniu/android/HttpTest.java

@@ -46,7 +46,7 @@ protected void setUp() throws Exception {
 
     @SmallTest
     public void testPost1() throws Throwable {
-        httpManager.asyncPost("http://www.baidu.com",
+        httpManager.asyncPost(null,"http://www.baidu.com",
                 "hello".getBytes(), null, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
                 null, new CompletionHandler() {
                     @Override
@@ -69,7 +69,7 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
     @SmallTest
     public void testPost2() throws Throwable {
 
-        httpManager.asyncPost("http://up.qiniu.com", "hello".getBytes(), null,
+        httpManager.asyncPost(null,"http://up.qiniu.com", "hello".getBytes(), null,
                 UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
                 null, new CompletionHandler() {
                     @Override
@@ -92,7 +92,7 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
     public void testPost3() throws Throwable {
         runTestOnUiThread(new Runnable() { // THIS IS THE KEY TO SUCCESS
             public void run() {
-                httpManager.asyncPost("http://httpbin.org/status/500", "hello".getBytes(),
+                httpManager.asyncPost(null,"http://httpbin.org/status/500", "hello".getBytes(),
                         null, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
                         null, new CompletionHandler() {
                             @Override
@@ -118,7 +118,7 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
     public void testPost4() throws Throwable {
         runTestOnUiThread(new Runnable() { // THIS IS THE KEY TO SUCCESS
             public void run() {
-                httpManager.asyncPost("http://httpbin.org/status/418",
+                httpManager.asyncPost(null,"http://httpbin.org/status/418",
                         "hello".getBytes(),
                         null, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
                         null, new CompletionHandler() {
@@ -144,7 +144,7 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
     @SmallTest
     public void testPostNoDomain() throws Throwable {
 
-        httpManager.asyncPost("http://no-domain.qiniu.com", "hello".getBytes(),
+        httpManager.asyncPost(null,"http://no-domain.qiniu.com", "hello".getBytes(),
                 null, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
                 null, new CompletionHandler() {
                     @Override
@@ -190,7 +190,7 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
     @SmallTest
     public void testPostIP() throws Throwable {
         StringMap x = new StringMap().put("Host", "up.qiniu.com");
-        httpManager.asyncPost("http://183.131.7.18", "hello".getBytes(),
+        httpManager.asyncPost(null,"http://183.131.7.18", "hello".getBytes(),
                 x, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
                 null, new CompletionHandler() {
                     @Override
@@ -215,7 +215,7 @@ public void testProxy() throws Throwable {
         StringMap x = new StringMap();
         ProxyConfiguration p = new ProxyConfiguration("115.238.101.32", 80);
         Client c = new Client(p, 10, 30, null, null);
-        c.asyncPost("http://upproxy1.qiniu.com", "hello".getBytes(),
+        c.asyncPost(null,"http://upproxy1.qiniu.com", "hello".getBytes(),
                 x, UpToken.parse(TestConfig.token_z0), "hello".getBytes().length,
                 null, new CompletionHandler() {
                     @Override

library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java

@@ -59,7 +59,7 @@ public void testSplitE() {
     public void testC1() {
         AutoZone autoZone = new AutoZone();
         final CountDownLatch countDownLatch = new CountDownLatch(1);
-        autoZone.preQueryIndex(new AutoZone.ZoneIndex(ak, bkt), new Zone.QueryHandler() {
+        autoZone.preQueryIndex(null, new AutoZone.ZoneIndex(ak, bkt), new Zone.QueryHandler() {
             @Override
             public void onSuccess() {
                 countDownLatch.countDown();

library/src/main/AndroidManifest.xml

@@ -1,9 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.qiniu.android">
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application android:label="@string/app_name">
         <uses-library

library/src/main/java/com/qiniu/android/bigdata/pipeline/Pipeline.java

@@ -73,7 +73,8 @@ private void send(String repo, StringBuilder builder, String token, final PumpCo
         StringMap headers = new StringMap();
         headers.put(HTTPHeaderAuthorization, token);
         headers.put(Client.ContentTypeHeader, TEXT_PLAIN);
-        client.asyncPost(url(repo), data, headers, null, data.length, null, new CompletionHandler() {
+        // TODO: 2020-04-15  repo上报时不记录，logHandler为null
+        client.asyncPost(null, url(repo), data, headers, null, data.length, null, new CompletionHandler() {
             @Override
             public void complete(ResponseInfo info, JSONObject response) {
                 handler.complete(info);

library/src/main/java/com/qiniu/android/collect/Config.java

@@ -11,7 +11,7 @@ public final class Config {
     /**
      * 上传信息收集文件的地址
      */
-    public final static String serverURL = "https://uplog.qbox.me/log/3";
+    public final static String serverURL = "https://uplog.qbox.me/log/4";
     /**
      * 是否记录上传状态信息。 true 表示记录，false 表示不记录。
      * <p>

library/src/main/java/com/qiniu/android/collect/LogHandler.java

@@ -0,0 +1,11 @@
+package com.qiniu.android.collect;
+
+/**
+ * 实现接口，需要log打点时直接send回来处理
+ * 后面拓展直接搜LogHandler.send可查询打点位置，新增直接LogHandler.send即可
+ */
+public interface LogHandler {
+    void send(String key, Object value);
+
+    Object getUploadInfo();
+}

library/src/main/java/com/qiniu/android/collect/UploadInfo.java

@@ -0,0 +1,16 @@
+package com.qiniu.android.collect;
+
+public class UploadInfo {
+
+    public static UploadInfoElement.ReqInfo getReqInfo() {
+        return new UploadInfoElement.ReqInfo();
+    }
+
+    public static UploadInfoElement.BlockInfo getBlockInfo() {
+        return new UploadInfoElement.BlockInfo();
+    }
+
+    public static UploadInfoElement.UploadQuality getUploadQuality() {
+        return new UploadInfoElement.UploadQuality();
+    }
+}