Merge pull request #401 from zyallday/master

feat: 流量拦截json显示优化

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/bean/NetworkRecord.java

@@ -2,7 +2,9 @@ package com.didichuxing.doraemonkit.kit.network.bean;
 
 import android.text.TextUtils;
 
+import com.google.gson.Gson;
 import java.io.Serializable;
+import org.json.JSONObject;
 
 /**
  * @desc: 一条网络请求记录
@@ -15,6 +17,7 @@ public class NetworkRecord implements Serializable {
     public Request mRequest;
     public Response mResponse;
     public String mResponseBody;
+    public String prettyResponse;
 
     public long requestLength;
     public long responseLength;
@@ -38,4 +41,17 @@ public class NetworkRecord implements Serializable {
     public boolean isPostRecord() {
         return mRequest != null && mRequest.method != null && TextUtils.equals(METHOD_POST, mRequest.method.toLowerCase());
     }
+
+    public String responseBody() {
+        if (TextUtils.isEmpty(prettyResponse)){
+            try {
+                JSONObject json = new JSONObject(mResponseBody);
+                prettyResponse = json.toString(2);
+            }catch (Exception e){
+                prettyResponse = mResponseBody;
+            }
+        }
+        return prettyResponse;
+
+    }
 }

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java

@@ -19,6 +19,7 @@ import com.didichuxing.doraemonkit.kit.network.utils.ByteUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import org.json.JSONObject;
 
 import static android.content.Context.CLIPBOARD_SERVICE;
 
@@ -97,7 +98,7 @@ public class NetworkDetailView extends LinearLayout {
             header.setText(response.headers);
             time.setText(mDateFormat.format(new Date(record.endTime)));
             size.setText(ByteUtil.getPrintSize(record.responseLength));
-            body.setText(TextUtils.isEmpty(record.mResponseBody) ? "NULL" : record.mResponseBody);
+            body.setText(TextUtils.isEmpty(record.responseBody()) ? "NULL" : record.responseBody());
         }
     }
 }