model-action 2.3.5 → 2.4.2

package/src/modules/Status.ts

@@ -1,150 +1,165 @@
-/**
- * 状态操作方法
- */
-import { Action } from "./Action";
-
-// 状态信息
-export interface StatusInfo {
-    id: string;      // 唯一标识
-    state: string;   // 状态值：normal | alarm | color=FFFFFF
-}
-
-// Status命令类型（不继承SendParam，因为data中没有action字段）
-type StatusType = {
-    cmd: "status";
-    data: {
-        isLocation?: boolean;  // 是否定位到第一个ID对应的设备，默认false
-        type?: string;         // 变换状态的类型，非必须，如"POI"
-        infos: StatusInfo[];   // 要切换状态的设备的数据
-    };
-}
-
-export class StatusAction extends Action {
-    /**
-     * 切换指定ID的模型、POI等的状态
-     * @param infos 状态信息数组，包含id和state
-     * @param options 可选参数
-     * @param options.isLocation 是否定位到第一个ID对应的设备，默认false
-     * @param options.type 变换状态的类型，如"POI"
-     */
-    static statusChange(
-        infos: StatusInfo[],
-        options?: {
-            isLocation?: boolean;
-            type?: string;
-        }
-    ) {
-        const data: {
-            isLocation?: boolean;
-            type?: string;
-            infos: StatusInfo[];
-        } = {
-            infos
-        };
-
-        // 如果提供了 isLocation，则添加（默认false，所以只有为true时才添加）
-        if (options?.isLocation !== undefined) {
-            data.isLocation = options.isLocation;
-        }
-
-        // 如果提供了 type，则添加
-        if (options?.type) {
-            data.type = options.type;
-        }
-
-        const param: StatusType = {
-            cmd: "status",
-            data
-        };
-
-        // 生成描述信息
-        let msg = '切换状态';
-        if (options?.type) {
-            msg = `切换${options.type}状态`;
-        }
-        if (infos.length === 1) {
-            msg += ` - ID: ${infos[0].id}, 状态: ${infos[0].state}`;
-        } else {
-            msg += ` - 共${infos.length}个设备`;
-        }
-
-        // 使用类型断言调用sendParam，因为StatusType不严格符合SendParam（缺少action字段）
-        return this.sendParam(param as any, msg);
-    }
-
-    /**
-     * 设置设备为正常状态
-     * @param id 设备ID
-     * @param options 可选参数
-     */
-    static setNormal(
-        id: string,
-        options?: {
-            isLocation?: boolean;
-            type?: string;
-        }
-    ) {
-        this.statusChange([{ id, state: 'normal' }], options);
-    }
-
-    /**
-     * 设置设备为报警状态
-     * @param id 设备ID
-     * @param options 可选参数
-     */
-    static setAlarm(
-        id: string,
-        options?: {
-            isLocation?: boolean;
-            type?: string;
-        }
-    ) {
-        this.statusChange([{ id, state: 'alarm' }], options);
-    }
-
-    /**
-     * 设置设备颜色
-     * @param id 设备ID
-     * @param color 颜色值，格式如 "FFFFFF" 或 "93050C"（不需要#前缀）
-     * @param options 可选参数
-     */
-    static setColor(
-        id: string,
-        color: string,
-        options?: {
-            isLocation?: boolean;
-            type?: string;
-        }
-    ) {
-        // 移除可能的#前缀
-        const colorValue = color.startsWith('#') ? color.slice(1) : color;
-        this.statusChange([{ id, state: `color=${colorValue}` }], options);
-    }
-
-    /**
-     * 批量设置多个设备的状态
-     * @param statusMap 状态映射，key为设备ID，value为状态值（normal | alarm | color值）
-     * @param options 可选参数
-     */
-    static batchSetStatus(
-        statusMap: Record<string, string>,
-        options?: {
-            isLocation?: boolean;
-            type?: string;
-        }
-    ) {
-        const infos: StatusInfo[] = [];
-        for (const id in statusMap) {
-            if (statusMap.hasOwnProperty(id)) {
-                const state = statusMap[id];
-                // 如果state是颜色值（6位十六进制），自动添加color=前缀
-                let finalState = state;
-                if (/^[0-9A-Fa-f]{6}$/.test(state) && !state.startsWith('color=')) {
-                    finalState = `color=${state}`;
-                }
-                infos.push({ id, state: finalState });
-            }
-        }
-        this.statusChange(infos, options);
-    }
+/**
+ * 状态操作方法
+ */
+import { Action } from "./Action";
+
+// 状态信息
+export interface StatusInfo {
+    id: string;      // 唯一标识
+    state: string;   // 状态值：normal | alarm | color=FFFFFF
+}
+
+// Status命令类型（不继承SendParam，因为data中没有action字段）
+type StatusType = {
+    cmd: "status";
+    data: {
+        isLocation?: boolean;  // 是否定位到第一个ID对应的设备，默认false
+        type?: string;         // 变换状态的类型，非必须，如"POI"
+        infos: StatusInfo[];   // 要切换状态的设备的数据
+    };
+}
+
+export class StatusAction extends Action {
+    /**
+     * 切换指定ID的模型、POI等的状态
+     * @param infos 状态信息数组，包含id和state
+     * @param options 可选参数
+     * @param options.isLocation 是否定位到第一个ID对应的设备，默认false
+     * @param options.type 变换状态的类型，如"POI"
+     */
+    static statusChange(
+        infos: StatusInfo[],
+        options?: {
+            isLocation?: boolean;
+            type?: string;
+        }
+    ) {
+        const data: {
+            isLocation?: boolean;
+            type?: string;
+            infos: StatusInfo[];
+        } = {
+            infos
+        };
+
+        // 如果提供了 isLocation，则添加（默认false，所以只有为true时才添加）
+        if (options?.isLocation !== undefined) {
+            data.isLocation = options.isLocation;
+        }
+
+        // 如果提供了 type，则添加
+        if (options?.type) {
+            data.type = options.type;
+        }
+
+        const param: StatusType = {
+            cmd: "status",
+            data
+        };
+
+        // 生成描述信息
+        let msg = '切换状态';
+        if (options?.type) {
+            msg = `切换${options.type}状态`;
+        }
+        if (infos.length === 1) {
+            msg += ` - ID: ${infos[0].id}, 状态: ${infos[0].state}`;
+        } else {
+            msg += ` - 共${infos.length}个设备`;
+        }
+
+        // 使用类型断言调用sendParam，因为StatusType不严格符合SendParam（缺少action字段）
+        return this.sendParam(param as any, msg);
+    }
+
+    /**
+     * 设置设备为正常状态
+     * @param id 设备ID
+     * @param options 可选参数
+     */
+    static setNormal(
+        id: string,
+        options?: {
+            isLocation?: boolean;
+            type?: string;
+        }
+    ) {
+        this.statusChange([{ id, state: 'normal' }], options);
+    }
+
+    /**
+     * 设置设备为离线状态
+     * @param id 设备ID
+     * @param options 可选参数
+     */
+    static setOffline(
+        id: string,
+        options?: {
+            isLocation?: boolean;
+            type?: string;
+        }
+    ) {
+        this.statusChange([{ id, state: 'offline' }], options);
+    }
+
+    /**
+     * 设置设备为报警状态
+     * @param id 设备ID
+     * @param options 可选参数
+     */
+    static setAlarm(
+        id: string,
+        options?: {
+            isLocation?: boolean;
+            type?: string;
+        }
+    ) {
+        this.statusChange([{ id, state: 'alarm' }], options);
+    }
+
+    /**
+     * 设置设备颜色
+     * @param id 设备ID
+     * @param color 颜色值，格式如 "FFFFFF" 或 "93050C"（不需要#前缀）
+     * @param options 可选参数
+     */
+    static setColor(
+        id: string,
+        color: string,
+        options?: {
+            isLocation?: boolean;
+            type?: string;
+        }
+    ) {
+        // 移除可能的#前缀
+        const colorValue = color.startsWith('#') ? color.slice(1) : color;
+        this.statusChange([{ id, state: `color=${colorValue}` }], options);
+    }
+
+    /**
+     * 批量设置多个设备的状态
+     * @param statusMap 状态映射，key为设备ID，value为状态值（normal | alarm | color值）
+     * @param options 可选参数
+     */
+    static batchSetStatus(
+        statusMap: Record<string, string>,
+        options?: {
+            isLocation?: boolean;
+            type?: string;
+        }
+    ) {
+        const infos: StatusInfo[] = [];
+        for (const id in statusMap) {
+            if (statusMap.hasOwnProperty(id)) {
+                const state = statusMap[id];
+                // 如果state是颜色值（6位十六进制），自动添加color=前缀
+                let finalState = state;
+                if (/^[0-9A-Fa-f]{6}$/.test(state) && !state.startsWith('color=')) {
+                    finalState = `color=${state}`;
+                }
+                infos.push({ id, state: finalState });
+            }
+        }
+        this.statusChange(infos, options);
+    }
 }

package/src/peer-stream.js

@@ -174,7 +174,7 @@ class PeerStream extends HTMLVideoElement {
 			// overlayDiv.style.borderRadius = '5px';
 			// overlayDiv.style.display = 'block'; // Initially hidden
 			// this.parentNode.appendChild(overlayDiv)
-			console.warn('你的浏览器版本过低!<br>推荐使用谷歌100以上版本浏览器!!')
+			console.warn("你的浏览器版本过低 推荐使用谷歌100以上版本浏览器")
 		}
 
 		// This will happen each time the node is moved, and may happen before the element"s contents have been fully parsed. may be called once your element is no longer connected
@@ -284,6 +284,8 @@ class PeerStream extends HTMLVideoElement {
 				if ((now - this.lastmouseTime) > this.mouseReleaseTime * 1000) {
 					msg.type = "mouseRelease"
 					this.ws.send(JSON.stringify(msg));
+					this.mouseReleaseTime = undefined
+					this.dispatchEvent(new CustomEvent("mouseRelease", { detail: "" }));
 				}
 			}
 		}
@@ -300,6 +302,10 @@ class PeerStream extends HTMLVideoElement {
 			console.log("↓↓ getStatus:", msg);
 			this.handleGetStatus(msg)
 		}
+		else if(msg.type === "getUeinstance"){
+			console.log("↓↓ getUeinstance:", msg);
+			this.dispatchEvent(new CustomEvent("getUeinstance", { detail: msg }));
+		}
 		else {
 			console.warn("↓↓", msg);
 		}
@@ -753,19 +759,20 @@ class PeerStream extends HTMLVideoElement {
 
 		this.onmousedown = (e) => {
 			this.emitMouseDown(e.button, e.offsetX, e.offsetY);
-			// e.preventDefault();
+			//e.preventDefault();
 		};
 
 		this.onmouseup = (e) => {
 			this.emitMouseUp(e.button, e.offsetX, e.offsetY);
-			// e.preventDefault();
+			//e.preventDefault();
 		};
 
 		// When the context menu is shown then it is safest to release the button which was pressed when the event happened. This will guarantee we will get at least one mouse up corresponding to a mouse down event. Otherwise the mouse can get stuck.
 		// https://github.com/facebook/react/issues/5531
 		this.oncontextmenu = (e) => {
-			this.emitMouseUp(e.button, e.offsetX, e.offsetY);
+			//this.emitMouseUp(e.button, e.offsetX, e.offsetY);
 			e.preventDefault();
+			return false;
 		};
 
 		this.onwheel = (e) => {
@@ -906,13 +913,18 @@ class PeerStream extends HTMLVideoElement {
 			data.setUint16(byteIdx, msg.charCodeAt(i), true);
 			byteIdx += 2;
 		}
-		this.dc.send(data);
+		try{
+			this.dc.send(data);
+		}catch(error){
+			console.error(error.message);
+		}
+		
 
-		return new Promise(resolve => this.addEventListener(
-			'message',
-			e => resolve(e.detail),
-			{ once: true }
-		));
+		// return new Promise(resolve => this.addEventListener(
+		// 	'message',
+		// 	e => resolve(e.detail),
+		// 	{ once: true }
+		// ));
 	}
 
 	normalize(x, y) {
@@ -934,6 +946,15 @@ class PeerStream extends HTMLVideoElement {
 	}
 
 
+	getUeInstance(){
+		let msg={type: "getUeinstance"}
+		this.ws.send(JSON.stringify(msg));
+	}
+
+	killUe(){
+		let msg={type: "killUe"}
+		this.ws.send(JSON.stringify(msg));
+	}
 }
 
-customElements.define("peer-stream", PeerStream, { extends: "video" });
+customElements.define("peer-stream", PeerStream, { extends: "video" });