@ray-js/robot-map 0.0.2-beta-42 → 0.0.2-beta-44

package/lib/RjsComponent/index.js

@@ -72,6 +72,14 @@ const componentOptions = {
         }
       }
     },
+    wayPoints: {
+      type: Array,
+      observer: function (newValue, oldValue) {
+        if (!isEqual(newValue, oldValue) && this.data.initialized && this.render) {
+          this.render.onReceiveWayPoints(newValue);
+        }
+      }
+    },
     virtualWalls: {
       type: Array,
       observer: function (newValue, oldValue) {
@@ -150,6 +158,9 @@ const componentOptions = {
       if (this.data.spots) {
         this.render.onReceiveSpots(this.data.spots);
       }
+      if (this.data.wayPoints) {
+        this.render.onReceiveWayPoints(this.data.wayPoints);
+      }
       if (this.data.detectedObjects) {
         this.render.onReceiveDetectedObjects(this.data.detectedObjects);
       }

package/lib/RjsComponent/index.rjs

@@ -105,6 +105,12 @@ export default Render({
     this.mapInstance.drawSpots(spots)
   },
 
+  // 接收途经点
+  onReceiveWayPoints(wayPoints) {
+    if (!this.mapInstance || !wayPoints) return
+    this.mapInstance.drawWayPoints(wayPoints)
+  },
+
   // 接收检测对象
   onReceiveDetectedObjects(objects) {
     if (!this.mapInstance || !objects) return

package/lib/RjsRobotMap.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 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", "detectedObjects", "customElements", "config", "runtime", "onMapReady"];
+const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "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";
@@ -29,6 +29,7 @@ const RjsRobotMap = _ref => {
       cleanZones = [],
       virtualWalls = [],
       spots = [],
+      wayPoints = [],
       detectedObjects = [],
       customElements = [],
       config,
@@ -87,6 +88,7 @@ const RjsRobotMap = _ref => {
     cleanZones: cleanZones,
     virtualWalls: virtualWalls,
     spots: spots,
+    wayPoints: wayPoints,
     detectedObjects: detectedObjects,
     customElements: customElements,
     config: config,

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, detectedObjects, customElements, onMapReady, config, runtime, ...callbacks }: RobotMapProps & AppOptions['events']): React.JSX.Element;
+    ({ map, path, roomProperties, forbiddenSweepZones, forbiddenMopZones, cleanZones, virtualWalls, spots, wayPoints, detectedObjects, customElements, 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", "detectedObjects", "customElements", "onMapReady", "config", "runtime"];
+const _excluded = ["map", "path", "roomProperties", "forbiddenSweepZones", "forbiddenMopZones", "cleanZones", "virtualWalls", "spots", "wayPoints", "detectedObjects", "customElements", "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";
@@ -31,6 +31,7 @@ const RobotMap = _ref => {
       cleanZones,
       virtualWalls,
       spots,
+      wayPoints,
       detectedObjects,
       customElements,
       onMapReady,
@@ -52,6 +53,7 @@ const RobotMap = _ref => {
     onReceiveCleanZones: () => {},
     onReceiveVirtualWalls: () => {},
     onReceiveSpots: () => {},
+    onReceiveWayPoints: () => {},
     onReceiveDetectedObjects: () => {},
     onReceiveCustomElements: () => {},
     onUpdateRuntime: () => {}
@@ -98,6 +100,7 @@ const RobotMap = _ref => {
     triggersRef.current.onReceiveCleanZones = invoke.current.bind('onReceiveCleanZones');
     triggersRef.current.onReceiveVirtualWalls = invoke.current.bind('onReceiveVirtualWalls');
     triggersRef.current.onReceiveSpots = invoke.current.bind('onReceiveSpots');
+    triggersRef.current.onReceiveWayPoints = invoke.current.bind('onReceiveWayPoints');
     triggersRef.current.onReceiveDetectedObjects = invoke.current.bind('onReceiveDetectedObjects');
     triggersRef.current.onReceiveCustomElements = invoke.current.bind('onReceiveCustomElements');
     triggersRef.current.onUpdateRuntime = invoke.current.bind('onUpdateRuntime');
@@ -160,6 +163,11 @@ const RobotMap = _ref => {
       triggersRef.current.onReceiveSpots(spots);
     }
   }, [spots, mapApi]);
+  useEffect(() => {
+    if (mapApi && wayPoints) {
+      triggersRef.current.onReceiveWayPoints(wayPoints);
+    }
+  }, [wayPoints, mapApi]);
   useEffect(() => {
     if (mapApi && detectedObjects) {
       triggersRef.current.onReceiveDetectedObjects(detectedObjects);

package/lib/props.d.ts

@@ -1,4 +1,4 @@
-import { DeepPartialAppConfig, DeepPartialRuntimeConfig, MapApi, RoomProperty, ZoneParam, VirtualWallParam, DetectedObjectParam, CustomElementParam, MapState, PathState, Point, RoomData, SpotParam } from '@ray-js/robot-map-sdk';
+import { DeepPartialAppConfig, DeepPartialRuntimeConfig, MapApi, RoomProperty, ZoneParam, VirtualWallParam, DetectedObjectParam, CustomElementParam, MapState, PathState, Point, RoomData, SpotParam, WayPointParam } from '@ray-js/robot-map-sdk';
 /**
  * 机器人地图组件属性接口
  *
@@ -62,6 +62,13 @@ export interface RobotMapProps {
      * @description.en Spot clean points, the robot will perform cleaning operations at these points.
      */
     spots?: SpotParam[];
+    /**
+     * @description.zh 途经点
+     * @description.en Way points
+     * @description.zh 路径点，机器人将在这些点之间巡航。
+     * @description.en Way points, the robot will move between these points.
+     */
+    wayPoints?: WayPointParam[];
     /**
      * @description.zh 检测对象
      * @description.en Detected objects
@@ -233,6 +240,15 @@ export interface RobotMapProps {
      * @param.en spot - Updated spot clean data
      */
     onUpdateSpot?: (spot: SpotParam) => void;
+    /**
+     * @description.zh 更新途经点的回调
+     * @description.en Callback when updating way point
+     * @description.zh 当用户操作途经点后触发。
+     * @description.en Triggered when user operates way point.
+     * @param.zh wayPoint - 更新后的途经点数据
+     * @param.en wayPoint - Updated way point data
+     */
+    onUpdateWayPoint?: (wayPoint: WayPointParam) => void;
     /**
      * @description.zh 点击禁扫区域回调
      * @description.en Callback when clicking forbidden sweep zone
@@ -278,6 +294,15 @@ export interface RobotMapProps {
      * @param.en spot - Clicked spot clean data
      */
     onClickSpot?: (spot: SpotParam) => void;
+    /**
+     * @description.zh 点击途经点回调
+     * @description.en Callback when clicking way point
+     * @description.zh 当用户点击途经点时触发。
+     * @description.en Triggered when user clicks way point.
+     * @param.zh wayPoint - 被点击的途经点数据
+     * @param.en wayPoint - Clicked way point data
+     */
+    onClickWayPoint?: (wayPoint: WayPointParam) => void;
     /**
      * @description.zh 点击检测物体回调
      * @description.en Callback when clicking detected object
@@ -305,5 +330,14 @@ export interface RobotMapProps {
      * @param.en divider - Updated divider data
      */
     onUpdateDivider?: (divider: Point[]) => void;
+    /**
+     * @description.zh 点击地图回调
+     * @description.en Callback when clicking map
+     * @description.zh 当用户点击地图时触发。
+     * @description.en Triggered when user clicks map.
+     * @param.zh point - 被点击的点数据
+     * @param.en point - Clicked point data
+     */
+    onClickMap?: (point: Point) => void;
 }
 export declare const robotMapDefaultProps: RobotMapProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-map",
-  "version": "0.0.2-beta-42",
+  "version": "0.0.2-beta-44",
   "description": "机器人地图组件",
   "main": "lib/index",
   "files": [
@@ -33,7 +33,7 @@
     "@ray-js/ray": "^1.7.39"
   },
   "dependencies": {
-    "@ray-js/robot-map-sdk": "0.0.3-beta-48",
+    "@ray-js/robot-map-sdk": "0.0.3-beta-49",
     "clsx": "^1.2.1",
     "nanoid": "^5.1.6"
   },