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/internet/HttpServer/MyNanoHttpService.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
index 7a06185..99228dc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpServer/MyNanoHttpService.java
@@ -4,8 +4,16 @@
import android.content.Intent;
import android.os.Binder;
import android.os.IBinder;
+import android.text.TextUtils;
import androidx.annotation.Nullable;
+
+import com.hdl.photovoltaic.other.HdlLogLogic;
+
+import org.w3c.dom.Text;
+
+import java.io.IOException;
+import java.util.Objects;
/**
* 鏈湴鏈嶅姟鍣�
@@ -21,12 +29,26 @@
try {
myNanoHttpServer.start();
} catch (Exception e) {
-// if (serverSocket.isBound() && !serverSocket.isClosed()) {
+// if (myNanoHttpServer!=null&&myNanoHttpServer.gserverSocket.isBound() && !serverSocket.isClosed()) {
// // Port is available
// } else {
// // Port is not available
// }
- e.printStackTrace();
+// e.printStackTrace();
+// if (!TextUtils.isEmpty(e.getMessage()) && Objects.requireNonNull(e.getMessage()).contains("Address already in use")) {
+// myNanoHttpServer = null;
+// for (int i = MyNanoHttpServer.HTTP_PORT + 1; i < 65535; i++) {
+// try {
+// MyNanoHttpServer.HTTP_PORT = i;
+// myNanoHttpServer = MyNanoHttpServer.getInstance(null);
+// myNanoHttpServer.start();
+// } catch (Exception ex) {
+// String s = ex.getMessage();
+// }
+// }
+//
+// }
+ HdlLogLogic.print("鍒濆鍖朒ttp鏈嶅姟鍣ㄥけ璐�---" + e.getMessage(), true);
startService(new Intent(this, MyNanoHttpService.class));
}
}
--
Gitblit v1.8.0