Merge pull request #409 from YangSen-qn/sdk_v7_upload_gzip

version v7: uplog gzip

Author: bachue

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

@@ -22,7 +22,6 @@ public final class TestConfig {
     public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:b46IRIripBu1p2dV1VVBvqM9au4=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTYwNjQ2MDAzOH0=";
     public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
 
-
     //测试通用的token
     public static final String commonToken = token_na0;
 

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

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

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

@@ -2,11 +2,14 @@
 
 import com.qiniu.android.http.UserAgent;
 import com.qiniu.android.storage.UpToken;
+import com.qiniu.android.utils.GZipUtil;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.nio.charset.Charset;
 import java.util.Date;
 import java.util.concurrent.ExecutorService;
@@ -241,9 +244,17 @@ private void tryUploadAndClean(final UpToken upToken, File recordFile) {
 
     //同步上传
     private boolean upload(final UpToken upToken, File recordFile) {
+
+        byte[] logData = getLogData(recordFile);
+        logData = GZipUtil.gZip(logData);
+        if (logData == null || logData.length == 0){
+            return false;
+        }
+
         try {
+
             OkHttpClient client = getHttpClient();
-            RequestBody reqBody = RequestBody.create(MediaType.parse("text/plain"), recordFile);
+            RequestBody reqBody = RequestBody.create(MediaType.parse("text/plain"), logData);
 
             Request.Builder requestBuilder = new Request.Builder().url(serverURL).
                     addHeader("Authorization", "UpToken " + upToken.token).
@@ -271,6 +282,37 @@ private boolean upload(final UpToken upToken, File recordFile) {
         }
     }
 
+    private byte[] getLogData(File recordFile){
+        if (recordFile == null || recordFile.length() == 0){
+            return null;
+        }
+
+        int fileSize = (int)recordFile.length();
+        RandomAccessFile randomAccessFile = null;
+        byte[] data = null;
+        try {
+            randomAccessFile = new RandomAccessFile(recordFile, "r");
+            ByteArrayOutputStream out = new ByteArrayOutputStream(fileSize);
+            int len = 0;
+            byte[] buff = new byte[fileSize];
+            while ((len = randomAccessFile.read(buff)) >= 0){
+                out.write(buff, 0, len);
+            }
+            data = out.toByteArray();
+        } catch (FileNotFoundException ignored) {
+        } catch (IOException e) {
+            data = null;
+        } finally {
+            if (randomAccessFile != null) {
+                try {
+                    randomAccessFile.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+        return data;
+    }
+
     private boolean isOk(Response res) {
         return res.isSuccessful() && res.header("X-Reqid") != null;
     }

library/src/main/java/com/qiniu/android/utils/GZipUtil.java

@@ -0,0 +1,77 @@
+package com.qiniu.android.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+public class GZipUtil {
+
+    public static byte[] gZip(String string){
+        if (string == null){
+            return null;
+        }
+        return gZip(string.getBytes());
+    }
+
+    public static byte[] gZip(byte[] bytes){
+        if (bytes == null){
+            return null;
+        }
+        if (bytes.length == 0){
+            return bytes;
+        }
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = null;
+        try {
+            gzip = new GZIPOutputStream(out);
+            gzip.write(bytes);
+        } catch (IOException e){
+        } finally {
+            if (gzip != null){
+                try {
+                    gzip.close();
+                } catch (IOException e){
+                }
+            }
+        }
+
+        return out.toByteArray();
+    }
+
+    public static byte[] gUnzip(byte[] bytes) {
+        if (bytes == null){
+            return null;
+        }
+        if (bytes.length == 0){
+            return bytes;
+        }
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ByteArrayInputStream in = new ByteArrayInputStream(bytes);
+
+        GZIPInputStream gunzip = null;
+        try {
+            gunzip = new GZIPInputStream(in);
+            byte[] buffer = new byte[256];
+            int n;
+            while ((n = gunzip.read(buffer)) >= 0) {
+                out.write(buffer, 0, n);
+            }
+        } catch (IOException e) {
+        } finally {
+            if (gunzip != null) {
+                try {
+                    gunzip.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+
+        return out.toByteArray();
+    }
+}