From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54
---
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 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 0dd707b..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,8 @@
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;
@@ -14,7 +16,9 @@
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鎵撳嵃
@@ -55,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) {
}
}
@@ -95,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