From 62d1cbc734f18a0da7744d4d8bac25459ea47e46 Mon Sep 17 00:00:00 2001 From: ZhaoKaiQiang <419927089@qq.com> Date: Wed, 18 Nov 2015 14:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84null=E6=8C=87=E9=92=88=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AF=B9null=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/socks/sample/MainActivity.java | 10 ++- .../src/main/java/com/socks/library/KLog.java | 64 +++++++++---------- .../java/com/socks/library/XmlHelper.java | 2 - 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/socks/sample/MainActivity.java b/app/src/main/java/com/socks/sample/MainActivity.java index 2ce92ca..6f2ac60 100644 --- a/app/src/main/java/com/socks/sample/MainActivity.java +++ b/app/src/main/java/com/socks/sample/MainActivity.java @@ -75,6 +75,8 @@ public class MainActivity extends AppCompatActivity { } public void logWithJson(View view) { + KLog.json("12345"); + KLog.json(null); KLog.json(JSON); } @@ -93,6 +95,8 @@ public class MainActivity extends AppCompatActivity { } public void logWithXml(View view) { + KLog.xml("12345"); + KLog.xml(null); KLog.xml(XML); } @@ -100,7 +104,7 @@ public class MainActivity extends AppCompatActivity { httpClient.get(this, URL, new TextHttpResponseHandler() { @Override public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) { - KLog.d(responseString); + KLog.e(responseString); } @Override @@ -110,6 +114,10 @@ public class MainActivity extends AppCompatActivity { }); } + /////////////////////////////////////////////////////////////////////////// + // MENU + /////////////////////////////////////////////////////////////////////////// + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.menu_about, menu); diff --git a/library/src/main/java/com/socks/library/KLog.java b/library/src/main/java/com/socks/library/KLog.java index d7e7a0e..59c00c3 100644 --- a/library/src/main/java/com/socks/library/KLog.java +++ b/library/src/main/java/com/socks/library/KLog.java @@ -27,6 +27,7 @@ public class KLog { private static final String DEFAULT_MESSAGE = "execute"; private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final String NULL_TIPS = "Log with null object"; private static final int JSON_INDENT = 4; private static final int V = 0x1; @@ -153,19 +154,13 @@ public class KLog { String className = stackTrace[index].getFileName(); String methodName = stackTrace[index].getMethodName(); int lineNumber = stackTrace[index].getLineNumber(); - - String tag = (tagStr == null ? className : tagStr); - String methodNameShort = methodName.substring(0, 1).toUpperCase() + methodName.substring(1); StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("[ (").append(className).append(":").append(lineNumber).append(")#").append(methodNameShort).append(" ] "); - String msg = (objectMsg == null) ? "Log with null Object" : objectMsg.toString(); - if (msg != null && type != JSON) { - stringBuilder.append(msg); - } - - String logStr = stringBuilder.toString(); + String tag = (tagStr == null ? className : tagStr); + String msg = (objectMsg == null) ? NULL_TIPS : objectMsg.toString(); + String headString = stringBuilder.toString(); switch (type) { case V: @@ -174,47 +169,42 @@ public class KLog { case W: case E: case A: - printDefault(type, tag, logStr); + msg = headString + msg; + printDefault(type, tag, msg); + break; + case JSON: + printJson(tag, msg, headString); break; - case JSON: { - if (TextUtils.isEmpty(msg)) { - Log.e(tag, "Empty or Null json content"); - return; - } - printJson(tag, msg, logStr); - } - break; } } - - private static void printDefault(int type, String tag, String logStr) { + private static void printDefault(int type, String tag, String msg) { switch (type) { case V: - Log.v(tag, logStr); + Log.v(tag, msg); break; case D: - Log.d(tag, logStr); + Log.d(tag, msg); break; case I: - Log.i(tag, logStr); + Log.i(tag, msg); break; case W: - Log.w(tag, logStr); + Log.w(tag, msg); break; case E: - Log.e(tag, logStr); + Log.e(tag, msg); break; case A: - Log.wtf(tag, logStr); + Log.wtf(tag, msg); break; } } - private static void printJson(String tag, String msg, String logStr) { + private static void printJson(String tag, String msg, String headString) { - String message = null; + String message; try { if (msg.startsWith("{")) { @@ -223,6 +213,8 @@ public class KLog { } else if (msg.startsWith("[")) { JSONArray jsonArray = new JSONArray(msg); message = jsonArray.toString(JSON_INDENT); + } else { + message = msg; } } catch (JSONException e) { e(tag, e.getCause().getMessage() + "\n" + msg); @@ -230,7 +222,7 @@ public class KLog { } printLine(tag, true); - message = logStr + LINE_SEPARATOR + message; + message = headString + LINE_SEPARATOR + message; String[] lines = message.split(LINE_SEPARATOR); for (String line : lines) { Log.d(tag, "║ " + line); @@ -256,7 +248,7 @@ public class KLog { String methodNameShort = methodName.substring(0, 1).toUpperCase() + methodName.substring(1); StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("[ (").append(className).append(":").append(lineNumber).append(")#").append(methodNameShort).append(" ] "); - String msg = (objectMsg == null) ? "Log with null Object" : objectMsg.toString(); + String msg = (objectMsg == null) ? NULL_TIPS : objectMsg.toString(); String headString = stringBuilder.toString(); @@ -272,7 +264,7 @@ public class KLog { } } - private static void printXml(String tag, String html) { + private static void printXml(String tag, String xml) { if (!IS_SHOW_LOG) { return; @@ -293,13 +285,15 @@ public class KLog { String headString = stringBuilder.toString(); - if (html != null) { - html = XmlHelper.formatXML(html); - html = headString + "\n" + html; + if (xml != null) { + xml = XmlHelper.formatXML(xml); + xml = headString + "\n" + xml; + } else { + xml = headString + NULL_TIPS; } printLine(tag, true); - String[] lines = html.split(LINE_SEPARATOR); + String[] lines = xml.split(LINE_SEPARATOR); for (String line : lines) { if (!isEmpty(line)) { Log.d(tag, "║ " + line); diff --git a/library/src/main/java/com/socks/library/XmlHelper.java b/library/src/main/java/com/socks/library/XmlHelper.java index 746d8b5..ed2582f 100644 --- a/library/src/main/java/com/socks/library/XmlHelper.java +++ b/library/src/main/java/com/socks/library/XmlHelper.java @@ -28,10 +28,8 @@ public class XmlHelper { writer.flush(); requestXML = stringWriter.getBuffer().toString(); } catch (IOException e) { - e.printStackTrace(); return inputXML; } catch (DocumentException e) { - e.printStackTrace(); return inputXML; } finally { if (writer != null) { -- GitLab