Merge branch 'wjc_new' into develop_new

mac

2024-04-19 788c70114287306db20e9a4539018d6e32fb5cb7

 app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java

@@ -148,7 +148,7 @@
        HdlThreadLogic.runSubThread(new Runnable() {
            @Override
            public void run() {
                HdlFileLogic.getInstance().delFileLien(HdlFileLogic.getInstance().getLogFileNamePath(), 2);
//                HdlFileLogic.getInstance().delFileLien(HdlFileLogic.getInstance().getLogFileNamePath(), 2);
                String content = HdlLogLogic.readLog();
                HdlThreadLogic.runMainThread(new Runnable() {
                    @Override