From 8663f8cee4baae93e6acd9d1f7c0705ec3b39743 Mon Sep 17 00:00:00 2001
From: tian <11429339@qq.com>
Date: Sun, 2 Aug 2026 14:03:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(control):=20streaming=3Dtrue=20=E5=8D=B3?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=A6=86=E7=9B=96=E5=B1=82(=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=20input=5Ffps=20=E5=88=A4=E6=96=AD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

input_rtsp 节点 input_fps 可能为 0 但实际在出帧(HLS 正常播放)，
导致'连接中'覆盖层盖在画面上。streaming=true 已是 media 实时
拉流状态，直接隐藏。
---
 control/internal/web/ui/templates/console.html | 8 ++------
 control/internal/web/ui/templates/monitor.html | 8 ++------
 edge/scripts/mock-alarm.bat                    | 2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/control/internal/web/ui/templates/console.html b/control/internal/web/ui/templates/console.html
index 1af46c3..0417953 100644
--- a/control/internal/web/ui/templates/console.html
+++ b/control/internal/web/ui/templates/console.html
@@ -210,13 +210,9 @@
       overlay.style.display = 'flex';
       return;
     }
-    if (status.streaming && status.input_fps > 0) {
-      overlay.style.display = 'none'; // 有画面，隐藏覆盖层
-      return;
-    }
     if (status.streaming) {
-      overlay.innerHTML = '<div class="video-status-text connecting">连接中</div>';
-      overlay.style.display = 'flex';
+      // streaming=true 表示正在接收视频帧（media 实时状态），有画面，隐藏覆盖层
+      overlay.style.display = 'none';
       return;
     }
     overlay.innerHTML = '<div class="video-status-text offline">离线</div>' +
diff --git a/control/internal/web/ui/templates/monitor.html b/control/internal/web/ui/templates/monitor.html
index 596c644..647372c 100644
--- a/control/internal/web/ui/templates/monitor.html
+++ b/control/internal/web/ui/templates/monitor.html
@@ -82,13 +82,9 @@ function loadAll() {
         overlay.style.display = 'flex';
         return;
       }
-      if (status.streaming && status.input_fps > 0) {
-        overlay.style.display = 'none';
-        return;
-      }
       if (status.streaming) {
-        overlay.innerHTML = '<div class="video-status-text connecting">连接中</div>';
-        overlay.style.display = 'flex';
+        // streaming=true 表示正在接收视频帧（media 实时状态），有画面，隐藏覆盖层
+        overlay.style.display = 'none';
         return;
       }
       overlay.innerHTML = '<div class="video-status-text offline">无视频输出</div>' +
diff --git a/edge/scripts/mock-alarm.bat b/edge/scripts/mock-alarm.bat
index 4e2a311..81a77ee 100644
--- a/edge/scripts/mock-alarm.bat
+++ b/edge/scripts/mock-alarm.bat
@@ -1,3 +1,3 @@
 @echo off
-cd /d "C:\Users\Tellme\apps\safesight\safesight-edge\scripts"
+cd /d "C:\Users\Tellme\apps\safesight\edge\scripts"
 uv run --with flask mock_alarm_server.py