From 77688e52fdc2761f17ce24be9704ee25bff2194d Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 04 十二月 2024 13:55:21 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0
---
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 ff3cde6..357d044 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
@@ -12,13 +12,18 @@
*/
public class HdlLogLogic {
- //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(false涓嶉渶瑕佹墦鍗�)
- public static boolean isPrintLogcat = true;
+ //鏄惁鍚姩鎵撳嵃鍒癓ogcat涓婄殑鏍囩(true:琛ㄧず鎵撳嵃锛宖alse锛氳〃绀轰笉鎵撳嵃)
+ public static boolean isStartPrintLogcat = true;
+
+ //鏄惁鍚姩鍔犲埌鍐呭瓨閲岄潰鐨勬爣绛�(true:琛ㄧず鍔犲叆锛宖alse锛氳〃绀轰笉鍔犲叆)
+ public static boolean isStartAddToMemory = false;
//榛樿鎵撳嵃鏍囬
private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�";
- private static Gson gson = new Gson();
+ private static final Gson gson = new Gson();
+
+ private static final CustomLogObject customLogObject = new CustomLogObject();
/**
* java鎵撳嵃
@@ -60,15 +65,18 @@
*/
private static void printBase(String msg, String code, boolean isAddToMemory) {
try {
- CustomLogObject customLogObject = new CustomLogObject();
+// //濡傛灉杩欓噷棰戠箒鐨刵ew瀵硅薄鍙兘浼氬奖鍝嶅姞杞芥暟鎹�熷害
+// CustomLogObject customLogObject = new CustomLogObject();
customLogObject.setMsgOrData(msg);
customLogObject.setCode(code);
String json = logTitle + (UserConfigManage.getInstance().isBAccount() ? "(B绔�)==" : "(C绔�)==") + gson.toJson(customLogObject);
- if (isPrintLogcat) {
+ if (isStartPrintLogcat) {
System.out.println(json);
}
- if (isAddToMemory) {
- writeLog(json);
+ if (isStartAddToMemory) {
+ if (isAddToMemory) {
+ writeLog(json);
+ }
}
} catch (Exception ignored) {
}
--
Gitblit v1.8.0