From f91ef956cf482ed4ce0885dc47794b783c20c415 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 10:14:43 +0800
Subject: [PATCH] Merge branch '1.2.0' into 1.5.1_google
---
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 2e9e0dd..dab21db 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
@@ -19,7 +19,7 @@
public static boolean isStartAddToMemory = true;
//榛樿鎵撳嵃鏍囬
- private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�";
+ private static String logTitle = "";//鑷畾涔夎緭鍑烘墦鍗颁俊鎭�
private static final Gson gson = new Gson();
@@ -71,7 +71,7 @@
customLogObject.setCode(code);
String json = logTitle + (UserConfigManage.getInstance().isBAccount() ? "(B绔�)==" : "(C绔�)==") + gson.toJson(customLogObject);
if (isStartPrintLogcat) {
- System.out.println(json);
+ System.out.println(json.replace("\\", ""));
}
if (isStartAddToMemory) {
if (isAddToMemory) {
@@ -90,8 +90,9 @@
*/
public static void writeLog(String strLog) {
synchronized (HdlLogLogic.class) {
- strLog = TimeUtils.getTimeFromTimestamp(System.currentTimeMillis()) + "s%" + " " + strLog;//鍔犳墦鍗版椂闂�(s%鍗犱綅绗︼紝璁剧疆鏄剧ず鏃堕棿涓嶅悓瀛椾綋棰滆壊)
- HdlFileLogic.getInstance().appendFile(HdlFileLogic.getInstance().getLogFileNamePath(), strLog);
+ strLog = TimeUtils.getTimeFromTimestamp(System.currentTimeMillis(), true) + "s%" + " " + strLog;//鍔犳墦鍗版椂闂�(s%鍗犱綅绗︼紝璁剧疆鏄剧ず鏃堕棿涓嶅悓瀛椾綋棰滆壊)
+
+ HdlFileLogic.getInstance().appendFile(HdlFileLogic.getInstance().getLogFileNamePath(), strLog.replace("\\", ""));
}
}
--
Gitblit v1.8.0