Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

 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("\\", ""));
        }
    }