From da080a8f0333f5e3d5b44e2bfa068f713d23880b Mon Sep 17 00:00:00 2001 From: "let5sne.win10" Date: Thu, 12 Feb 2026 22:41:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20MjpegServer.ClientH?= =?UTF-8?q?andler.isAlive=20=E6=96=B9=E6=B3=95=E5=90=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重命名为 isClientAlive 以避免与 Thread.isAlive() 冲突 Co-Authored-By: Claude Opus 4.6 --- android-app/app/src/main/java/com/usbwebcam/MjpegServer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-app/app/src/main/java/com/usbwebcam/MjpegServer.kt b/android-app/app/src/main/java/com/usbwebcam/MjpegServer.kt index 20cc08f..bf54ce8 100644 --- a/android-app/app/src/main/java/com/usbwebcam/MjpegServer.kt +++ b/android-app/app/src/main/java/com/usbwebcam/MjpegServer.kt @@ -60,7 +60,7 @@ class MjpegServer(private val port: Int) { val iterator = clients.iterator() while (iterator.hasNext()) { val handler = iterator.next() - if (handler.isAlive()) { + if (handler.isClientAlive()) { handler.sendFrame(frame) } else { iterator.remove() @@ -144,7 +144,7 @@ class MjpegServer(private val port: Int) { } } - fun isAlive(): Boolean { + fun isClientAlive(): Boolean { return !socket.isClosed && socket.isConnected } }