From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 14 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 8c9892c..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,30 +1,114 @@
package com.hdl.photovoltaic.other;
-import android.util.Log;
+
+import com.google.gson.Gson;
+import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.utils.TimeUtils;
/**
* 鏃ュ織閫昏緫
*/
public class HdlLogLogic {
- private static volatile HdlLogLogic sHdlLogLogic;
+ //鏄惁闇�瑕佹墦鍗板埌Logcat涓�(false涓嶉渶瑕佹墦鍗�)
+ public static boolean isPrintLogcat = true;
- public static synchronized HdlLogLogic getInstance() {
- if (sHdlLogLogic == null) {
- synchronized (HdlLogLogic.class) {
- if (sHdlLogLogic == null) {
- sHdlLogLogic = new HdlLogLogic();
- }
- }
+ //榛樿鎵撳嵃鏍囬
+ private static String logTitle = "鑷畾涔夎緭鍑烘墦鍗颁俊鎭�";
+
+ /**
+ * java鎵撳嵃
+ *
+ * @param customizeContentFormat 鑷畾涔夊唴瀹规牸寮�
+ */
+ public static void print(String customizeContentFormat) {
+ printBase(customizeContentFormat, "0", false);
+ }
+
+ /**
+ * java鎵撳嵃
+ *
+ * @param customizeContentFormat 鑷畾涔夊唴瀹规牸寮�
+ * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
+ */
+ public static void print(String customizeContentFormat, boolean isAddToMemory) {
+ printBase(customizeContentFormat, "0", isAddToMemory);
+ }
+
+ /**
+ * java鎵撳嵃
+ *
+ * @param msg 鑷畾涔夊唴瀹规牸寮�
+ * @param code 鐘舵�佺爜
+ * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
+ */
+ public static void print(String msg, int code, boolean isAddToMemory) {
+ printBase(msg, code + "", isAddToMemory);
+ }
+
+
+ /**
+ * java鎵撳嵃鍜屽瓨鍌ㄦ棩蹇�
+ *
+ * @param msg 淇℃伅鎻忚堪
+ * @param code 鐘舵��
+ * @param isAddToMemory 鏄惁鍔犲叆鍐呭瓨(鏈湴鏃ュ織鐢ㄥ埌)
+ */
+ private static void printBase(String msg, String code, boolean isAddToMemory) {
+ CustomLogObject customLogObject = new CustomLogObject();
+ customLogObject.msgOrData = msg;
+ customLogObject.code = code;
+ String json = logTitle + (UserConfigManage.getInstance().isBAccount() ? "(B绔�):" : "(C绔�):");
+ json += customLogObject.getJointMessage();
+ if (isPrintLogcat) {
+ System.out.println(json);
}
- return sHdlLogLogic;
- }
-
- public static void print(String tag, String mgs) {
- Log.d(tag, mgs);
+ if (isAddToMemory) {
+ writeLog(customLogObject.getJointMessage());
+ }
}
+ /**
+ * 鍐欏叆鏃ュ織鍐呭鍒版湰鍦�
+ *
+ * @param strLog 鍐欏叆鍐呭
+ */
+ public static void writeLog(String strLog) {
+ synchronized (HdlLogLogic.class) {
+ strLog = TimeUtils.getTimeFromTimestamp(System.currentTimeMillis()) + "s%" + " " + strLog;//鍔犳墦鍗版椂闂�(s%鍗犱綅绗︼紝璁剧疆鏄剧ず鏃堕棿涓嶅悓瀛椾綋棰滆壊)
+ HdlFileLogic.getInstance().appendFile(HdlFileLogic.getInstance().getLogFileNamePath(), strLog);
+ }
+ }
+
+ /**
+ * 璇诲彇鏃ュ織鍐呭
+ *
+ * @return 鏃ュ織鍐呭
+ */
+ public static String readLog() {
+ return HdlFileLogic.getInstance().readFile(HdlFileLogic.getInstance().getLogFileNamePath());
+ }
+
+
+ /**
+ * 鑷畾涔夋棩蹇楃被
+ */
+ static class CustomLogObject {
+ //淇℃伅鎻忚堪
+ public String msgOrData = "";
+ //鐘舵�佺爜
+ public String code = "0";
+
+ public String getJointMessage() {
+
+ if ("0".equals(code)) {
+ return msgOrData;
+ }
+ return msgOrData + "(" + code + ")";
+
+ }
+ }
}
--
Gitblit v1.8.0