feat: 前端添加切换摄像头功能

This commit is contained in:
2025-07-21 17:24:22 +08:00
parent d1c9710afe
commit e872f24936
3 changed files with 246 additions and 164 deletions

View File

@@ -8,17 +8,14 @@
控制面板
</h2>
<div class="grid grid-cols-1 md:grid-cols-4 gap-4">
<div class="grid grid-cols-1 gap-4"
:class="{ 'md:grid-cols-3': streamType === 'usbCamera', 'md:grid-cols-4': streamType === 'videoStream' }">
<!-- 服务状态 -->
<div class="stats shadow">
<div class="stat bg-base-100">
<div class="stat-figure text-primary">
<div
class="badge"
:class="
statusInfo.isRunning ? 'badge-success' : 'badge-error'
"
>
<div class="badge" :class="statusInfo.isRunning ? 'badge-success' : 'badge-error'
">
{{ statusInfo.isRunning ? "运行中" : "已停止" }}
</div>
</div>
@@ -43,30 +40,23 @@
</div>
<!-- 分辨率控制 -->
<div class="stats shadow">
<div v-show="streamType === 'videoStream'" class="stats shadow">
<div class="stat bg-base-100">
<div class="stat-figure text-info">
<Settings class="w-8 h-8" />
</div>
<div class="stat-title">分辨率设置</div>
<div class="stat-value text-sm">
<select
class="select select-sm select-bordered max-w-xs"
v-model="selectedResolution"
@change="changeResolution"
:disabled="changingResolution"
>
<select class="select select-sm select-bordered max-w-xs" v-model="selectedResolution"
@change="changeResolution" :disabled="changingResolution">
<option v-for="res in supportedResolutions" :key="`${res.width}x${res.height}`" :value="res">
{{ res.width }}×{{ res.height }}
</option>
</select>
</div>
<div class="stat-desc">
<button
class="btn btn-xs btn-outline btn-info mt-1"
@click="refreshResolutions"
:disabled="loadingResolutions"
>
<button class="btn btn-xs btn-outline btn-info mt-1" @click="refreshResolutions"
:disabled="loadingResolutions">
<RefreshCw v-if="loadingResolutions" class="animate-spin h-3 w-3" />
{{ loadingResolutions ? "刷新中..." : "刷新" }}
</button>
@@ -86,30 +76,18 @@
</div>
<div class="stat-desc">
<div class="dropdown dropdown-hover dropdown-top">
<div
tabindex="0"
role="button"
class="text-xs underline cursor-help"
>
<div tabindex="0" role="button" class="text-xs underline cursor-help">
查看客户端
</div>
<ul
tabindex="0"
class="dropdown-content z-20 menu p-2 shadow bg-base-200 rounded-box w-64 max-h-48 overflow-y-auto"
>
<li
v-for="(client, index) in statusInfo.clientEndpoints"
:key="index"
class="text-xs"
>
<ul tabindex="0"
class="dropdown-content z-20 menu p-2 shadow bg-base-200 rounded-box w-64 max-h-48 overflow-y-auto">
<li v-for="(client, index) in statusInfo.clientEndpoints" :key="index" class="text-xs">
<a class="break-all">{{ client }}</a>
</li>
<li
v-if="
!statusInfo.clientEndpoints ||
statusInfo.clientEndpoints.length === 0
"
>
<li v-if="
!statusInfo.clientEndpoints ||
statusInfo.clientEndpoints.length === 0
">
<a class="text-xs opacity-50">无活跃连接</a>
</li>
</ul>
@@ -121,29 +99,21 @@
<!-- 操作按钮 -->
<div class="card-actions justify-end mt-4">
<button
class="btn btn-outline btn-primary"
@click="configCamera"
:dsiabled="configing"
>
<button class="btn btn-outline btn-warning mr-2" @click="toggleStreamType" :disabled="isSwitchingStreamType">
<SwitchCamera class="h-4 w-4 mr-2" />
{{ streamType === 'usbCamera' ? '切换到视频流' : '切换到USB摄像头' }}
</button>
<button v-show="streamType === 'videoStream'" class="btn btn-outline btn-primary" @click="configCamera" :disabled="configing">
<RefreshCw v-if="configing" class="animate-spin h-4 w-4 mr-2" />
<CogIcon v-else class="h-4 w-4 mr-2" />
{{ configing ? "配置中..." : "配置摄像头" }}
</button>
<button
class="btn btn-outline btn-primary"
@click="refreshStatus"
:disabled="loading"
>
<button class="btn btn-outline btn-primary" @click="refreshStatus" :disabled="loading">
<RefreshCw v-if="loading" class="animate-spin h-4 w-4 mr-2" />
<RefreshCw v-else class="h-4 w-4 mr-2" />
{{ loading ? "刷新中..." : "刷新状态" }}
</button>
<button
class="btn btn-primary"
@click="testConnection"
:disabled="testing"
>
<button v-show="streamType === 'videoStream'" class="btn btn-primary" @click="testConnection" :disabled="testing">
<RefreshCw v-if="testing" class="animate-spin h-4 w-4 mr-2" />
<TestTube v-else class="h-4 w-4 mr-2" />
{{ testing ? "测试中..." : "测试连接" }}
@@ -160,42 +130,24 @@
视频预览
</h2>
<div
class="relative bg-black rounded-lg overflow-hidden cursor-pointer"
:class="[
focusAnimationClass,
{ 'cursor-not-allowed': !isPlaying || hasVideoError }
]"
style="aspect-ratio: 4/3"
@click="handleVideoClick"
>
<div class="relative bg-black rounded-lg overflow-hidden cursor-pointer" :class="[
focusAnimationClass,
{ 'cursor-not-allowed': !isPlaying || hasVideoError }
]" style="aspect-ratio: 4/3" @click="handleVideoClick">
<!-- 视频播放器 - 使用img标签直接显示MJPEG流 -->
<div
v-show="isPlaying"
class="w-full h-full flex items-center justify-center"
>
<img
:src="currentVideoSource"
alt="视频流"
class="max-w-full max-h-full object-contain"
@error="handleVideoError"
@load="handleVideoLoad"
/>
<div v-show="isPlaying" class="w-full h-full flex items-center justify-center">
<img :src="currentVideoSource" alt="视频流" class="max-w-full max-h-full object-contain"
@error="handleVideoError" @load="handleVideoLoad" />
</div>
<!-- 对焦提示 -->
<div
v-if="isPlaying && !hasVideoError"
class="absolute top-4 right-4 text-white text-sm bg-black bg-opacity-50 px-2 py-1 rounded"
>
<div v-if="isPlaying && !hasVideoError"
class="absolute top-4 right-4 text-white text-sm bg-black bg-opacity-50 px-2 py-1 rounded">
{{ isFocusing ? '对焦中...' : '点击画面对焦' }}
</div>
<!-- 错误信息显示 -->
<div
v-if="hasVideoError"
class="absolute inset-0 flex items-center justify-center bg-black bg-opacity-70"
>
<div v-if="hasVideoError" class="absolute inset-0 flex items-center justify-center bg-black bg-opacity-70">
<div class="card bg-error text-white shadow-lg w-full max-w-lg">
<div class="card-body">
<h3 class="card-title flex items-center gap-2">
@@ -209,10 +161,7 @@
<li>端口 {{ statusInfo.serverPort }} 是否可访问</li>
</ul>
<div class="card-actions justify-end mt-2">
<button
class="btn btn-sm btn-outline btn-primary"
@click="tryReconnect"
>
<button class="btn btn-sm btn-outline btn-primary" @click="tryReconnect">
重试连接
</button>
</div>
@@ -221,10 +170,8 @@
</div>
<!-- 占位符 -->
<div
v-show="!isPlaying && !hasVideoError"
class="absolute inset-0 flex items-center justify-center text-white"
>
<div v-show="!isPlaying && !hasVideoError"
class="absolute inset-0 flex items-center justify-center text-white">
<div class="text-center">
<Video class="w-16 h-16 mx-auto mb-4 opacity-50" />
<p class="text-lg opacity-75">{{ videoStatus }}</p>
@@ -245,18 +192,11 @@
</div>
<div class="space-x-2">
<div class="dropdown dropdown-hover dropdown-top dropdown-end">
<div
tabindex="0"
role="button"
class="btn btn-sm btn-outline btn-accent"
>
<div tabindex="0" role="button" class="btn btn-sm btn-outline btn-accent">
<MoreHorizontal class="w-4 h-4 mr-1" />
更多功能
</div>
<ul
tabindex="0"
class="dropdown-content z-[1] menu p-2 shadow bg-base-200 rounded-box w-52"
>
<ul tabindex="0" class="dropdown-content z-[1] menu p-2 shadow bg-base-200 rounded-box w-52">
<li>
<a @click="openInNewTab(streamInfo.htmlUrl)">
<ExternalLink class="w-4 h-4" />
@@ -277,19 +217,11 @@
</li>
</ul>
</div>
<button
class="btn btn-success btn-sm"
@click="startStream"
:disabled="isPlaying"
>
<button class="btn btn-success btn-sm" @click="startStream" :disabled="isPlaying">
<Play class="w-4 h-4 mr-1" />
播放视频流
</button>
<button
class="btn btn-error btn-sm"
@click="stopStream"
:disabled="!isPlaying"
>
<button class="btn btn-error btn-sm" @click="stopStream" :disabled="!isPlaying">
<Square class="w-4 h-4 mr-1" />
停止视频流
</button>
@@ -299,7 +231,7 @@
</div>
<!-- 日志区域 -->
<div class="card bg-base-200 shadow-xl mx-5">
<div class="card bg-base-200 shadow-xl mx-5">
<div class="card-body">
<h2 class="card-title text-primary">
<FileText class="w-6 h-6" />
@@ -307,20 +239,11 @@
</h2>
<div class="bg-base-300 rounded-lg p-4 h-48 overflow-y-auto">
<div
v-for="(log, index) in logs"
:key="index"
class="text-sm font-mono mb-1"
>
<span class="text-base-content/50"
>[{{ formatTime(log.time) }}]</span
>
<div v-for="(log, index) in logs" :key="index" class="text-sm font-mono mb-1">
<span class="text-base-content/50">[{{ formatTime(log.time) }}]</span>
<span :class="getLogClass(log.level)">{{ log.message }}</span>
</div>
<div
v-if="logs.length === 0"
class="text-base-content/50 text-center py-8"
>
<div v-if="logs.length === 0" class="text-base-content/50 text-center py-8">
暂无日志记录
</div>
</div>
@@ -352,8 +275,9 @@ import {
FileText,
AlertTriangle,
MoreHorizontal,
SwitchCamera,
} from "lucide-vue-next";
import { VideoStreamClient, CameraConfigRequest, ResolutionConfigRequest } from "@/APIClient";
import { VideoStreamClient, CameraConfigRequest, ResolutionConfigRequest, StreamInfoResult } from "@/APIClient";
import { useEquipments } from "@/stores/equipments";
const eqps = useEquipments();
@@ -366,6 +290,10 @@ const isPlaying = ref(false);
const hasVideoError = ref(false);
const videoStatus = ref('点击"播放视频流"按钮开始查看实时视频');
// 视频流类型切换相关
const streamType = ref<'usbCamera' | 'videoStream'>('videoStream');
const isSwitchingStreamType = ref(false);
// 对焦相关状态
const isFocusing = ref(false);
const focusAnimationClass = ref('');
@@ -390,7 +318,7 @@ const statusInfo = ref({
clientEndpoints: [] as string[],
});
const streamInfo = ref({
const streamInfo = ref<StreamInfoResult>(new StreamInfoResult({
frameRate: 30,
frameWidth: 640,
frameHeight: 480,
@@ -398,7 +326,8 @@ const streamInfo = ref({
htmlUrl: "",
mjpegUrl: "",
snapshotUrl: "",
});
usbCameraUrl: "",
}));
const currentVideoSource = ref("");
const logs = ref<Array<{ time: Date; level: string; message: string }>>([]);
@@ -462,6 +391,27 @@ const openInNewTab = (url: string) => {
addLog("info", `已在新标签打开视频页面: ${url}`);
};
// 切换视频流类型
const toggleStreamType = async () => {
if (isSwitchingStreamType.value) return;
isSwitchingStreamType.value = true;
try {
// 这里假设后端有API: setStreamType(type: string)
addLog('info', `正在切换视频流类型到${streamType.value === 'usbCamera' ? '视频流' : 'USB摄像头'}...`);
refreshStatus();
// 设置视频源
streamType.value = streamType.value === 'usbCamera' ? 'videoStream' : 'usbCamera';
addLog('success', `已切换到${streamType.value === 'usbCamera' ? 'USB摄像头' : '视频流'}`);
stopStream();
} catch (error) {
addLog('error', `切换视频流类型失败: ${error}`);
console.error('切换视频流类型失败:', error);
} finally {
isSwitchingStreamType.value = false;
}
};
// 获取并下载快照
const takeSnapshot = async () => {
try {
@@ -585,7 +535,7 @@ const tryReconnect = () => {
// 执行对焦
const performFocus = async () => {
if (isFocusing.value || !isPlaying.value) return;
try {
isFocusing.value = true;
focusAnimationClass.value = 'focus-starting';
@@ -599,7 +549,7 @@ const performFocus = async () => {
// 对焦成功动画
focusAnimationClass.value = 'focus-success';
addLog("success", "自动对焦执行成功");
// 2秒后消失
setTimeout(() => {
focusAnimationClass.value = '';
@@ -608,7 +558,7 @@ const performFocus = async () => {
// 对焦失败动画
focusAnimationClass.value = 'focus-error';
addLog("error", `自动对焦执行失败: ${result.message || '未知错误'}`);
// 2秒后消失
setTimeout(() => {
focusAnimationClass.value = '';
@@ -619,7 +569,7 @@ const performFocus = async () => {
focusAnimationClass.value = 'focus-error';
addLog("error", `自动对焦执行失败: ${error}`);
console.error("自动对焦执行失败:", error);
// 2秒后消失
setTimeout(() => {
focusAnimationClass.value = '';
@@ -636,10 +586,10 @@ const performFocus = async () => {
const handleVideoClick = (event: MouseEvent) => {
// 只在播放状态下才允许对焦
if (!isPlaying.value || hasVideoError.value) return;
// 防止重复点击
if (isFocusing.value) return;
performFocus();
};
@@ -654,7 +604,7 @@ const startStream = async () => {
await refreshStatus();
// 设置视频源
currentVideoSource.value = streamInfo.value.mjpegUrl;
currentVideoSource.value = streamType.value === 'usbCamera' ? streamInfo.value.usbCameraUrl : streamInfo.value.mjpegUrl;
// 设置播放状态
isPlaying.value = true;
@@ -677,11 +627,11 @@ const refreshResolutions = async () => {
const resolutions = await videoClient.getSupportedResolutions();
supportedResolutions.value = resolutions.resolutions;
console.log("支持的分辨率列表:", supportedResolutions.value);
// 获取当前分辨率
const currentRes = await videoClient.getCurrentResolution();
selectedResolution.value = currentRes;
addLog("success", "分辨率列表获取成功");
} catch (error) {
addLog("error", `获取分辨率列表失败: ${error}`);
@@ -694,36 +644,36 @@ const refreshResolutions = async () => {
// 切换分辨率
const changeResolution = async () => {
if (!selectedResolution.value) return;
changingResolution.value = true;
const wasPlaying = isPlaying.value;
try {
addLog("info", `正在切换分辨率到 ${selectedResolution.value.width}×${selectedResolution.value.height}...`);
// 如果正在播放,先停止视频流
if (wasPlaying) {
stopStream();
await new Promise(resolve => setTimeout(resolve, 1000)); // 等待1秒
}
// 设置新分辨率
const resolutionRequest = new ResolutionConfigRequest({
width: selectedResolution.value.width,
height: selectedResolution.value.height
});
const success = await videoClient.setResolution(resolutionRequest);
if (success) {
// 刷新流信息
await refreshStatus();
// 如果之前在播放,重新启动视频流
if (wasPlaying) {
await new Promise(resolve => setTimeout(resolve, 500)); // 短暂延迟
await startStream();
}
addLog("success", `分辨率已切换到 ${selectedResolution.value.width}×${selectedResolution.value.height}`);
} else {
addLog("error", "分辨率切换失败");
@@ -810,21 +760,27 @@ img {
0% {
border-color: transparent;
}
100% {
border-color: #fbbf24; /* 黄色 */
border-color: #fbbf24;
/* 黄色 */
box-shadow: 0 0 20px rgba(251, 191, 36, 0.5);
}
}
@keyframes focus-success-animation {
0% {
border-color: #fbbf24; /* 黄色 */
border-color: #fbbf24;
/* 黄色 */
box-shadow: 0 0 20px rgba(251, 191, 36, 0.5);
}
50% {
border-color: #10b981; /* 绿色 */
border-color: #10b981;
/* 绿色 */
box-shadow: 0 0 20px rgba(16, 185, 129, 0.5);
}
100% {
border-color: transparent;
box-shadow: none;
@@ -833,13 +789,17 @@ img {
@keyframes focus-error-animation {
0% {
border-color: #fbbf24; /* 黄色 */
border-color: #fbbf24;
/* 黄色 */
box-shadow: 0 0 20px rgba(251, 191, 36, 0.5);
}
50% {
border-color: #ef4444; /* 红色 */
border-color: #ef4444;
/* 红色 */
box-shadow: 0 0 20px rgba(239, 68, 68, 0.5);
}
100% {
border-color: transparent;
box-shadow: none;