From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 22 八月 2024 13:43:47 +0800
Subject: [PATCH] 2024年08月22日13:43:45
---
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 96 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 39 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 75225f8..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,10 @@
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;
/**
@@ -8,62 +12,65 @@
*/
public class HdlLogLogic {
- //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(true涓嶉渶瑕佹墦鍗�)
- public static boolean isPrintLogcat = false;
+ //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(false涓嶉渶瑕佹墦鍗�)
+ public static boolean isPrintLogcat = true;
+
//榛樿鎵撳嵃鏍囬
- private static final String title = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�:";
+ private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�";
+ private static Gson gson = new Gson();
/**
* java鎵撳嵃
*
- * @param content 鑷畾涔変俊鎭弿杩�
+ * @param customizeContentFormat 鑷畾涔夊唴瀹规牸寮�
*/
- public static void print(String content) {
- printBase(content, "0", false);
+ public static void print(String customizeContentFormat) {
+ printBase(customizeContentFormat, "0", false);
}
/**
* java鎵撳嵃
*
- * @param content 鑷畾涔変俊鎭弿杩�
- * @param isBoolean 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
+ * @param customizeContentFormat 鑷畾涔夊唴瀹规牸寮�
+ * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
*/
- public static void print(String content, boolean isBoolean) {
- printBase(content, "0", isBoolean);
+ public static void print(String customizeContentFormat, boolean isAddToMemory) {
+ printBase(customizeContentFormat, "0", isAddToMemory);
}
/**
* java鎵撳嵃
*
- * @param msg 鑷畾涔変俊鎭弿杩�
- * @param code 鐘舵�佺爜
- * @param isBoolean 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
+ * @param msg 鑷畾涔夊唴瀹规牸寮�
+ * @param code 鐘舵�佺爜
+ * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
*/
- public static void print(String msg, int code, boolean isBoolean) {
- printBase(msg, code + "", isBoolean);
+ public static void print(String msg, int code, boolean isAddToMemory) {
+ printBase(msg, code + "", isAddToMemory);
}
/**
* java鎵撳嵃鍜屽瓨鍌ㄦ棩蹇�
*
- * @param msg 淇℃伅鎻忚堪
- * @param code 鐘舵��
- * @param isBoolean 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
+ * @param msg 淇℃伅鎻忚堪
+ * @param code 鐘舵��
+ * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
*/
- private static void printBase(String msg, String code, boolean isBoolean) {
- if (isPrintLogcat) {
- return;
- }
- CustomLogObject customLogObject = new CustomLogObject();
- customLogObject.msgOrData = msg;
- customLogObject.code = code;
- String json = title;
- json += customLogObject.getJointMessage();
- System.out.println(json);
- if (isBoolean) {
- writeLog(customLogObject.getJointMessage());
+ private static void printBase(String msg, String code, boolean isAddToMemory) {
+ 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) {
}
}
@@ -94,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