From 5ca2b601848c62607d88fee5afdae6af80f6eea7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 三月 2024 16:12:26 +0800
Subject: [PATCH] 2024年03月20日16:12:17
---
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 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 2945f6a..26259ec 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 com.google.gson.Gson;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.utils.TimeUtils;
/**
@@ -8,61 +10,60 @@
*/
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 = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�";
/**
* 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;
- }
+ private static void printBase(String msg, String code, boolean isAddToMemory) {
CustomLogObject customLogObject = new CustomLogObject();
customLogObject.msgOrData = msg;
customLogObject.code = code;
- String json = title;
+ String json = logTitle + (UserConfigManage.getInstance().isBAccount() ? "(B绔�):" : "(C绔�):");
json += customLogObject.getJointMessage();
- System.out.println(json);
- if (isBoolean) {
+ if (isPrintLogcat) {
+ System.out.println(json);
+ }
+ if (isAddToMemory) {
writeLog(customLogObject.getJointMessage());
}
}
@@ -75,8 +76,8 @@
*/
public static void writeLog(String strLog) {
synchronized (HdlLogLogic.class) {
- strLog = TimeUtils.getTimeFromTimestamp(System.currentTimeMillis()) + "s%" + " " + strLog;//鍔犳墦鍗版椂闂�(s%鍗犱綅绗︼紝鏄剧ず鏃堕棿鏃惰缃笉鍚屽瓧浣撻鑹�)
- HdlFileLogic.getInstance().appendFile(HdlFileLogic.getInstance().getLogFilePath(), strLog);
+ strLog = TimeUtils.getTimeFromTimestamp(System.currentTimeMillis()) + "s%" + " " + strLog;//鍔犳墦鍗版椂闂�(s%鍗犱綅绗︼紝璁剧疆鏄剧ず鏃堕棿涓嶅悓瀛椾綋棰滆壊)
+ HdlFileLogic.getInstance().appendFile(HdlFileLogic.getInstance().getLogFileNamePath(), strLog);
}
}
@@ -86,7 +87,7 @@
* @return 鏃ュ織鍐呭
*/
public static String readLog() {
- return HdlFileLogic.getInstance().readFile(HdlFileLogic.getInstance().getLogFilePath());
+ return HdlFileLogic.getInstance().readFile(HdlFileLogic.getInstance().getLogFileNamePath());
}
--
Gitblit v1.8.0