From a7aae1cda30332b73e46ef24e0e264455024067e Mon Sep 17 00:00:00 2001 From: liufumingren Date: Wed, 26 Aug 2026 23:45:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(osd):=20=E6=96=B0=E5=A2=9Ecamera.osd.set/cl?= =?UTF-8?q?ear=20WS=E5=88=AB=E5=90=8D=E6=9C=8D=E5=8A=A1=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8B?= =?UTF-8?q?=E5=8F=91OSD=E6=97=A0=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nodemon.json | 3 ++- services/camera.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 services/camera.js diff --git a/nodemon.json b/nodemon.json index 29ce6e8..d8b0a80 100644 --- a/nodemon.json +++ b/nodemon.json @@ -3,7 +3,8 @@ "index.js", "core/*", "views/*", - "services/*" + "services/*", + "utils/*" ], "ext": "js,json,html", "ignore": [ diff --git a/services/camera.js b/services/camera.js new file mode 100644 index 0000000..0736516 --- /dev/null +++ b/services/camera.js @@ -0,0 +1,44 @@ +import service from '../core/BaseService.js'; + +/** + * 摄像头 OSD 别名服务 + * WS method: camera.osd.set / camera.osd.clear(服务器下发入口) + * 转发到 utils/cameraOsd.js(ONVIF 失败自动回退海康 ISAPI) + */ +class CameraService extends service { + constructor() { + super(); + this.osd = { + set: this._set.bind(this), + clear: this._clear.bind(this) + }; + } + + async _set(data) { + if (!data || !data.rtspUrl || !data.text) { + return { ok: false, message: '参数不完整: 需要 rtspUrl 和 text' }; + } + try { + const { setCameraOSD } = await import('../utils/cameraOsd.js'); + const x = Number.isFinite(Number(data.x)) ? Number(data.x) : -0.9; + const y = Number.isFinite(Number(data.y)) ? Number(data.y) : 0.8; + return await setCameraOSD(data.rtspUrl, data.text, x, y); + } catch (e) { + return { ok: false, message: e.message }; + } + } + + async _clear(data) { + if (!data || !data.rtspUrl) { + return { ok: false, message: '参数不完整: 需要 rtspUrl' }; + } + try { + const { clearCameraOSD } = await import('../utils/cameraOsd.js'); + return await clearCameraOSD(data.rtspUrl); + } catch (e) { + return { ok: false, message: e.message }; + } + } +} + +export default new CameraService();