Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java

@@ -48,7 +48,7 @@
//                }
//
//            }
            HdlLogLogic.print("初始化Http服务器失败--->" + e.getMessage(), true);
            HdlLogLogic.print("初始化Http服务器失败---" + e.getMessage(), true);
            startService(new Intent(this, MyNanoHttpService.class));
        }
    }