From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java |   74 +++++++++++++++++++++++++------------
 1 files changed, 50 insertions(+), 24 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 e6a0a88..2e9e0dd 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,11 +12,18 @@
  */
 public class HdlLogLogic {
 
-    //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(true涓嶉渶瑕佹墦鍗�)
-    public static boolean isPrintLogcat = false;
-    //榛樿鎵撳嵃鏍囬
-    private static final String title = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�:";
+    //鏄惁鍚姩鎵撳嵃鍒癓ogcat涓婄殑鏍囩(true:琛ㄧず鎵撳嵃锛宖alse锛氳〃绀轰笉鎵撳嵃)
+    public static boolean isStartPrintLogcat = true;
 
+    //鏄惁鍚姩鍔犲埌鍐呭瓨閲岄潰鐨勬爣绛�(true:琛ㄧず鍔犲叆锛宖alse锛氳〃绀轰笉鍔犲叆)
+    public static boolean isStartAddToMemory = true;
+
+    //榛樿鎵撳嵃鏍囬
+    private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�";
+
+    private static final Gson gson = new Gson();
+
+    private static final CustomLogObject customLogObject = new CustomLogObject();
 
     /**
      * java鎵撳嵃
@@ -53,17 +64,21 @@
      * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
      */
     private static void printBase(String msg, String code, boolean isAddToMemory) {
-        if (isPrintLogcat) {
-            return;
-        }
-        CustomLogObject customLogObject = new CustomLogObject();
-        customLogObject.msgOrData = msg;
-        customLogObject.code = code;
-        String json = title;
-        json += customLogObject.getJointMessage();
-        System.out.println(json);
-        if (isAddToMemory) {
-            writeLog(customLogObject.getJointMessage());
+        try {
+//            //濡傛灉杩欓噷棰戠箒鐨刵ew瀵硅薄鍙兘浼氬奖鍝嶅姞杞芥暟鎹�熷害
+//            CustomLogObject customLogObject = new CustomLogObject();
+            customLogObject.setMsgOrData(msg);
+            customLogObject.setCode(code);
+            String json = logTitle + (UserConfigManage.getInstance().isBAccount() ? "(B绔�)==" : "(C绔�)==") + gson.toJson(customLogObject);
+            if (isStartPrintLogcat) {
+                System.out.println(json);
+            }
+            if (isStartAddToMemory) {
+                if (isAddToMemory) {
+                    writeLog(json);
+                }
+            }
+        } catch (Exception ignored) {
         }
     }
 
@@ -94,19 +109,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