From 1786d9430a25d59bac637c867b30919a628f2b25 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 20 Oct 2026 01:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=9A=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E8=BF=9E=E4=B8=8D=E4=B8=8A=E6=9C=AC=E6=9C=BA=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=E7=AB=8B=E5=8D=B3=E5=BC=B9=E6=8F=90=E7=A4=BA=E7=AA=97?= =?UTF-8?q?=EF=BC=88=E4=B8=8D=E5=86=8D=E5=B9=B2=E7=AD=89=2012=20=E7=A7=92?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CamerasView.openPreview 之前是「连不上 -> 自动 yuncang:// 唤起 -> 轮询 waitForLocalWs(12s) -> 再弹窗」, 用户点预览后要等 16 秒左右才看到任何提示,容易误以为「没走统一提示」。 改为:`localWs.connect` 失败就直接 `previewOffline = true`,交给 LocalServiceGate 的 「启动本机软件」按钮(唤起 + 等待 + 进度提示都在组件里,用户看得见)。 实测(7301,注入 WebSocket 构造抛错模拟离线):点预览 3 秒内弹出 「实时预览需要本机软件 / 最新安装包 1.0.75 · 103.6 MB / 稍后 · 立即下载 · 启动本机软件」; 改前同样场景需 16 秒。 --- frontend/src/views/CamerasView.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/CamerasView.vue b/frontend/src/views/CamerasView.vue index e40531f..e4b3fba 100644 --- a/frontend/src/views/CamerasView.vue +++ b/frontend/src/views/CamerasView.vue @@ -18,7 +18,7 @@ import { updateCamera, } from '@/api/videoApi'; import type { Camera, Nvr } from '@/api/video'; -import { localWs, waitForLocalWs, wakeLocalSoftware, type WsPtzCommand } from '@/api/localWs'; +import { localWs, type WsPtzCommand } from '@/api/localWs'; import LocalServiceGate from '@/components/LocalServiceGate.vue'; const list = ref([]); @@ -277,12 +277,9 @@ async function openPreview(camera: Camera, streamType = previewStreamType.value) try { await localWs.connect(2500); } catch { - // 连不上:大概率是软件没启动 → 唤起,等它起来再连;仍不行就按「没安装」处理 - wakeLocalSoftware(); - if (!(await waitForLocalWs(12000))) { - previewOffline.value = true; - return; - } + // 连不上:**立即**弹统一提示窗(启动 / 下载),由用户自己点(不在此处干等12 秒) + previewOffline.value = true; + return; } const info = await localWs.startPreview({