@ray-js/robot-map 0.0.5-beta.31 → 0.0.5-beta.33

package/lib/RjsComponent/index.js

@@ -106,10 +106,20 @@ const componentOptions = {
         }
       }
     },
+    furnitures: {
+      type: Array,
+      observer: function (newValue, oldValue) {
+        if (!isEqual(newValue, oldValue) && this.data.initialized && this.render) {
+          this.render.onReceiveFurnitures(newValue);
+        }
+      }
+    },
     config: {
       type: Object,
-      observer: function () {
-        // config在初始化时设置，不需要动态更新
+      observer: function (newValue, oldValue) {
+        if (!isEqual(newValue, oldValue) && this.data.initialized && this.render) {
+          this.render.onUpdateConfig(newValue);
+        }
       }
     },
     runtime: {
@@ -171,6 +181,9 @@ const componentOptions = {
       if (this.data.customElements) {
         this.render.onReceiveCustomElements(this.data.customElements);
       }
+      if (this.data.furnitures) {
+        this.render.onReceiveFurnitures(this.data.furnitures);
+      }
       if (this.data.runtime) {
         var _this$data$runtime$di;
         this.render.onUpdateRuntime(_objectSpread(_objectSpread({}, this.data.runtime), {}, {

package/lib/RjsComponent/index.rjs

@@ -123,6 +123,18 @@ export default Render({
     this.mapInstance.drawCustomElements(elements)
   },
 
+  // 接收家具
+  onReceiveFurnitures(furnitures) {
+    if (!this.mapInstance || !furnitures) return
+    this.mapInstance.drawFurnitures(furnitures)
+  },
+
+  // 更新静态配置
+  onUpdateConfig(config) {
+    if (!this.mapInstance || !config) return
+    this.mapInstance.updateConfig(config)
+  },
+
   // 更新运行时配置
   onUpdateRuntime(runtime) {
     if (!this.mapInstance || !runtime) return

package/lib/RjsRobotMap.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "config", "runtime", "onMapReady"];
+const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "furnitures", "config", "runtime", "onMapReady"];
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
@@ -27,6 +27,7 @@ const RjsRobotMap = _ref => {
       wayPoints = [],
       detectedObjects = [],
       customElements = [],
+      furnitures = [],
       config,
       runtime,
       onMapReady
@@ -149,6 +150,7 @@ const RjsRobotMap = _ref => {
     wayPoints: wayPoints,
     detectedObjects: detectedObjects,
     customElements: customElements,
+    furnitures: furnitures,
     config: config,
     runtime: runtime,
     containerId: containerId

package/lib/RobotMap.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { AppOptions } from '@ray-js/robot-map-sdk';
 import { RobotMapProps } from './props';
 declare const RobotMap: {
-    ({ map, path, roomProperties, forbiddenSweepZones, forbiddenMopZones, cleanZones, virtualWalls, spots, wayPoints, detectedObjects, customElements, customCarpets, heatmap, onMapReady, config, runtime, ...callbacks }: RobotMapProps & AppOptions['events']): React.JSX.Element;
+    ({ map, path, roomProperties, forbiddenSweepZones, forbiddenMopZones, cleanZones, virtualWalls, spots, wayPoints, detectedObjects, customElements, customCarpets, furnitures, heatmap, onMapReady, config, runtime, ...callbacks }: RobotMapProps & AppOptions['events']): React.JSX.Element;
     defaultProps: RobotMapProps;
     displayName: string;
 };

package/lib/RobotMap.js

@@ -1,6 +1,6 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "customCarpets", "heatmap", "onMapReady", "config", "runtime"];
+const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "customCarpets", "furnitures", "heatmap", "onMapReady", "config", "runtime"];
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
@@ -10,6 +10,7 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import createInvoke from '@ray-js/webview-invoke/native';
 import { createWebviewContext, WebView } from '@ray-js/ray';
+import { isEqual } from 'lodash-es';
 import { MAP_API_METHODS, MAP_CALLBACK_METHODS } from '@ray-js/robot-map-sdk';
 import { nanoid } from 'nanoid/non-secure';
 import { robotMapDefaultProps } from './props';
@@ -34,6 +35,7 @@ const RobotMap = _ref => {
       detectedObjects,
       customElements,
       customCarpets,
+      furnitures,
       heatmap,
       onMapReady,
       config = {},
@@ -41,6 +43,9 @@ const RobotMap = _ref => {
     } = _ref,
     callbacks = _objectWithoutProperties(_ref, _excluded);
   const [mapApi, setMapApi] = useState(null);
+  const prevConfigRef = useRef(null);
+  const prevRuntimeRef = useRef(null);
+  const hasSkippedInitialConfigUpdateRef = useRef(false);
   const webviewId = useRef(nanoid()).current;
   const webviewContext = useRef(null);
   const invoke = useRef(null);
@@ -57,6 +62,8 @@ const RobotMap = _ref => {
     onReceiveWayPoints: () => {},
     onReceiveDetectedObjects: () => {},
     onReceiveCustomElements: () => {},
+    onReceiveFurnitures: () => {},
+    onUpdateConfig: () => {},
     onUpdateRuntime: () => {},
     onReceiveCustomCarpets: () => {},
     onReceiveHeatmap: () => {}
@@ -106,6 +113,8 @@ const RobotMap = _ref => {
     triggersRef.current.onReceiveWayPoints = invoke.current.bind('onReceiveWayPoints');
     triggersRef.current.onReceiveDetectedObjects = invoke.current.bind('onReceiveDetectedObjects');
     triggersRef.current.onReceiveCustomElements = invoke.current.bind('onReceiveCustomElements');
+    triggersRef.current.onReceiveFurnitures = invoke.current.bind('onReceiveFurnitures');
+    triggersRef.current.onUpdateConfig = invoke.current.bind('onUpdateConfig');
     triggersRef.current.onUpdateRuntime = invoke.current.bind('onUpdateRuntime');
     triggersRef.current.onReceiveCustomCarpets = invoke.current.bind('onReceiveCustomCarpets');
     triggersRef.current.onReceiveHeatmap = invoke.current.bind('onReceiveHeatmap');
@@ -188,27 +197,47 @@ const RobotMap = _ref => {
       triggersRef.current.onReceiveCustomElements(customElements);
     }
   }, [customElements, mapApi]);
+  useEffect(() => {
+    if (mapApi && furnitures) {
+      triggersRef.current.onReceiveFurnitures(furnitures);
+    }
+  }, [furnitures, mapApi]);
   useEffect(() => {
     if (mapApi && customCarpets) {
       triggersRef.current.onReceiveCustomCarpets(customCarpets);
     }
   }, [customCarpets, mapApi]);
+  useEffect(() => {
+    if (mapApi && config) {
+      // 初始化配置由 initApp 注入，这里跳过首次触发，避免重复 updateConfig
+      if (!hasSkippedInitialConfigUpdateRef.current) {
+        hasSkippedInitialConfigUpdateRef.current = true;
+        prevConfigRef.current = config;
+        return;
+      }
+
+      // 避免相同配置内容重复触发 updateConfig
+      if (isEqual(prevConfigRef.current, config)) {
+        return;
+      }
+      triggersRef.current.onUpdateConfig(config);
+      prevConfigRef.current = config;
+    }
+  }, [config, mapApi]);
   useEffect(() => {
     if (mapApi && runtime) {
       var _runtime$dividingRoom;
+      // runtime 需要初始化时下发，因此不跳过首次触发；仅做内容去重
+      if (isEqual(prevRuntimeRef.current, runtime)) {
+        return;
+      }
       triggersRef.current.onUpdateRuntime(_objectSpread(_objectSpread({}, runtime), {}, {
         // 最初版本定义null为不显示分割线，但安卓在message序列化的过程中，null会被序列化为undefined导致丢失，在组件兼容处理成-1
         dividingRoomId: (_runtime$dividingRoom = runtime.dividingRoomId) !== null && _runtime$dividingRoom !== void 0 ? _runtime$dividingRoom : -1
       }));
+      prevRuntimeRef.current = runtime;
     }
   }, [runtime, mapApi]);
-  useEffect(() => {
-    if (mapApi) {
-      setTimeout(() => {
-        mapApi.getCleanZones();
-      }, 2000);
-    }
-  }, [mapApi]);
   return /*#__PURE__*/React.createElement(WebView, {
     src: "webview://node_modules/@ray-js/robot-map-sdk/dist-app/index.html"
     // src="http://127.0.0.1:3000"

package/lib/props.d.ts

@@ -1,4 +1,4 @@
-import { DeepPartialAppConfig, DeepPartialRuntimeConfig, RoomProperty, ZoneParam, VirtualWallParam, DetectedObjectParam, CustomElementParam, MapState, PathState, Point, RoomData, SpotParam, WayPointParam, CustomCarpetParam, IconPoint } from '@ray-js/robot-map-sdk';
+import { DeepPartialAppConfig, DeepPartialRuntimeConfig, RoomProperty, ZoneParam, VirtualWallParam, DetectedObjectParam, CustomElementParam, MapState, PathState, Point, RoomData, SpotParam, WayPointParam, CustomCarpetParam, IconPoint, FurnitureParam } from '@ray-js/robot-map-sdk';
 import { MapApi } from './types';
 /**
  * 机器人地图组件属性接口
@@ -91,6 +91,13 @@ export interface RobotMapProps {
      * @description.en User-defined carpet information, which can be images, GIFs, and HTML.
      */
     customCarpets?: CustomCarpetParam[];
+    /**
+     * @description.zh 家具
+     * @description.en Furnitures
+     * @description.zh 地图上的家具信息，支持编辑、拖拽、旋转和缩放。
+     * @description.en Furniture data on the map, supporting edit, drag, rotate and scale.
+     */
+    furnitures?: FurnitureParam[];
     /**
      * @description.zh 配置项
      * @description.en Configuration options
@@ -337,6 +344,33 @@ export interface RobotMapProps {
      * @param.en element - Clicked custom element data
      */
     onClickCustomElement?: (element: CustomElementParam) => void;
+    /**
+     * @description.zh 点击家具回调
+     * @description.en Callback when clicking furniture
+     * @description.zh 当用户点击家具时触发。
+     * @description.en Triggered when user clicks furniture.
+     * @param.zh furniture - 被点击的家具数据
+     * @param.en furniture - Clicked furniture data
+     */
+    onClickFurniture?: (furniture: FurnitureParam) => void;
+    /**
+     * @description.zh 更新家具回调
+     * @description.en Callback when updating furniture
+     * @description.zh 当用户操作家具（如拖拽、旋转、缩放）后触发。
+     * @description.en Triggered when user updates furniture (such as drag, rotate or scale).
+     * @param.zh furniture - 更新后的家具数据
+     * @param.en furniture - Updated furniture data
+     */
+    onUpdateFurniture?: (furniture: FurnitureParam) => void;
+    /**
+     * @description.zh 删除家具回调
+     * @description.en Callback when removing furniture
+     * @description.zh 当用户删除家具时触发。
+     * @description.en Triggered when user removes furniture.
+     * @param.zh id - 被删除的家具ID
+     * @param.en id - ID of removed furniture
+     */
+    onRemoveFurniture?: (id: string) => void;
     /**
      * @description.zh 更新分割线回调
      * @description.en Callback when updating divider

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-map",
-  "version": "0.0.5-beta.31",
+  "version": "0.0.5-beta.33",
   "description": "机器人地图组件",
   "main": "lib/index",
   "files": [
@@ -33,7 +33,7 @@
     "@ray-js/ray": "^1.7.39"
   },
   "dependencies": {
-    "@ray-js/robot-map-sdk": "0.0.9-beta.3",
+    "@ray-js/robot-map-sdk": "^0.0.9",
     "clsx": "^1.2.1",
     "nanoid": "^5.1.6"
   },