前端:预览连不上本机软件时立即弹提示窗(不再干等 12 秒)
CamerasView.openPreview 之前是「连不上 -> 自动 yuncang:// 唤起 -> 轮询 waitForLocalWs(12s) -> 再弹窗」, 用户点预览后要等 16 秒左右才看到任何提示,容易误以为「没走统一提示」。 改为:`localWs.connect` 失败就直接 `previewOffline = true`,交给 LocalServiceGate 的 「启动本机软件」按钮(唤起 + 等待 + 进度提示都在组件里,用户看得见)。 实测(7301,注入 WebSocket 构造抛错模拟离线):点预览 3 秒内弹出 「实时预览需要本机软件 / 最新安装包 1.0.75 · 103.6 MB / 稍后 · 立即下载 · 启动本机软件」; 改前同样场景需 16 秒。
This commit is contained in:
parent
cec0254d38
commit
1786d9430a
@ -18,7 +18,7 @@ import {
|
|||||||
updateCamera,
|
updateCamera,
|
||||||
} from '@/api/videoApi';
|
} from '@/api/videoApi';
|
||||||
import type { Camera, Nvr } from '@/api/video';
|
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';
|
import LocalServiceGate from '@/components/LocalServiceGate.vue';
|
||||||
|
|
||||||
const list = ref<Camera[]>([]);
|
const list = ref<Camera[]>([]);
|
||||||
@ -277,12 +277,9 @@ async function openPreview(camera: Camera, streamType = previewStreamType.value)
|
|||||||
try {
|
try {
|
||||||
await localWs.connect(2500);
|
await localWs.connect(2500);
|
||||||
} catch {
|
} catch {
|
||||||
// 连不上:大概率是软件没启动 → 唤起,等它起来再连;仍不行就按「没安装」处理
|
// 连不上:**立即**弹统一提示窗(启动 / 下载),由用户自己点(不在此处干等12 秒)
|
||||||
wakeLocalSoftware();
|
previewOffline.value = true;
|
||||||
if (!(await waitForLocalWs(12000))) {
|
return;
|
||||||
previewOffline.value = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const info = await localWs.startPreview({
|
const info = await localWs.startPreview({
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user