From 7bb1c6a82b35290b4b28d53977fad2fe4080d3db Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 31 五月 2024 12:01:58 +0800 Subject: [PATCH] 2024年05月31日12:01:45 --- app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 59 +++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java index 9ddb078..ff3cde6 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java @@ -1,6 +1,9 @@ package com.hdl.photovoltaic.other; +import android.util.LruCache; + +import com.google.gson.Gson; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.utils.TimeUtils; @@ -11,8 +14,11 @@ //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(false涓嶉渶瑕佹墦鍗�) public static boolean isPrintLogcat = true; + //榛樿鎵撳嵃鏍囬 - private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�"+ (UserConfigManage.getInstance().isBAccount() ? "(B):" : "(C):"); + private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�"; + + private static Gson gson = new Gson(); /** * java鎵撳嵃 @@ -53,16 +59,18 @@ * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌) */ private static void printBase(String msg, String code, boolean isAddToMemory) { - CustomLogObject customLogObject = new CustomLogObject(); - customLogObject.msgOrData = msg; - customLogObject.code = code; - String json =logTitle; - json += customLogObject.getJointMessage(); - if (isPrintLogcat) { - System.out.println(json); - } - if (isAddToMemory) { - writeLog(customLogObject.getJointMessage()); + try { + CustomLogObject customLogObject = new CustomLogObject(); + customLogObject.setMsgOrData(msg); + customLogObject.setCode(code); + String json = logTitle + (UserConfigManage.getInstance().isBAccount() ? "(B绔�)==" : "(C绔�)==") + gson.toJson(customLogObject); + if (isPrintLogcat) { + System.out.println(json); + } + if (isAddToMemory) { + writeLog(json); + } + } catch (Exception ignored) { } } @@ -93,19 +101,30 @@ * 鑷畾涔夋棩蹇楃被 */ static class CustomLogObject { + //淇℃伅鎻忚堪 - public String msgOrData = ""; + private String msgOrData; + //鐘舵�佺爜 - public String code = "0"; + private String code; - public String getJointMessage() { - - if ("0".equals(code)) { - return msgOrData; - } - return msgOrData + "(" + code + ")"; - + public String getMsgOrData() { + return msgOrData == null ? "" : msgOrData; } + + public void setMsgOrData(String msgOrData) { + this.msgOrData = msgOrData; + } + + public String getCode() { + return code == null ? "0" : code; + } + + public void setCode(String code) { + this.code = code; + } + + } -- Gitblit v1.8.0