From 1383d00fcd9aa2cad69baf94576b5a8d0c4e628d Mon Sep 17 00:00:00 2001
From: Desert <zyallday@qiyi.com>
Date: Wed, 26 Feb 2020 12:50:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E9=87=8F=E6=8B=A6=E6=88=AAjso?=
 =?UTF-8?q?n=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Desert <zyallday@qiyi.com>
---
 .../kit/network/bean/NetworkRecord.java          | 16 ++++++++++++++++
 .../kit/network/ui/NetworkDetailView.java        |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/bean/NetworkRecord.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/bean/NetworkRecord.java
index f44655ad..5c6c3f0f 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/bean/NetworkRecord.java
+++ b/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;
+
+    }
 }
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java
index 9718473b..6b119cdf 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/ui/NetworkDetailView.java
+++ b/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());
         }
     }
 }
-- 
GitLab