@ray-js/robot-data-stream 0.0.16-beta.1 → 0.0.16-beta.2

package/lib/mqtt/useRoomProperty.js

@@ -47,7 +47,7 @@ export const useRoomProperty = () => {
     setRoomProperty: data => {
       return new Promise((resolve, reject) => {
         try {
-          var _data$num, _data$suctions, _data$cleanCounts, _data$yMops, _data$sweepMopModes, _data$names, _data$routePreference;
+          var _data$num, _data$suctions, _data$cleanCounts, _data$yMops, _data$sweepMopModes, _data$names;
           if (!useMqtt) {
             reject(new Error('useMqtt is not used'));
             return;
@@ -58,7 +58,7 @@ export const useRoomProperty = () => {
             ids
           } = data;
           const len = ids.length;
-          const sendData = _objectSpread({
+          const sendData = _objectSpread(_objectSpread({
             num: (_data$num = data.num) !== null && _data$num !== void 0 ? _data$num : len,
             ids,
             suctions: (_data$suctions = data.suctions) !== null && _data$suctions !== void 0 ? _data$suctions : new Array(len).fill('closed'),
@@ -68,9 +68,10 @@ export const useRoomProperty = () => {
             names: (_data$names = data.names) !== null && _data$names !== void 0 ? _data$names : new Array(len).fill(''),
             nameLabels: data.nameLabels,
             floorTypes: data.floorTypes,
-            orders: data.orders,
-            routePreferences: (_data$routePreference = data.routePreferences) !== null && _data$routePreference !== void 0 ? _data$routePreference : new Array(len).fill('standard')
-          }, normalizeWaterPreferencePayload(data.cisterns, data.waterValues));
+            orders: data.orders
+          }, data.routePreferences && {
+            routePreferences: data.routePreferences
+          }), normalizeWaterPreferencePayload(data.cisterns, data.waterValues));
 
           // 使用 TypeBox Schema 进行参数验证（包含自定义验证逻辑）
           const validatedData = validator.validate('set_room_property', sendData);

package/lib/mqtt/useSchedule.js

@@ -1,4 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["routePreferences"];
 import "core-js/modules/esnext.iterator.map.js";
 // 定时
 import { encodeDeviceTimer0x30 } from '@ray-js/robot-protocol';
@@ -56,9 +58,12 @@ export const useSchedule = () => {
           // 使用 TypeBox Schema 进行参数验证
           const validatedData = validator.validate('set_schedule', message);
           const list = validatedData.list.map(item => {
-            var _item$routePreference, _item$ids;
-            return _objectSpread(_objectSpread(_objectSpread({}, item), normalizeWaterPreferencePayload(item.cisterns, item.waterValues)), {}, {
-              routePreferences: (_item$routePreference = item.routePreferences) !== null && _item$routePreference !== void 0 ? _item$routePreference : new Array(((_item$ids = item.ids) === null || _item$ids === void 0 ? void 0 : _item$ids.length) || 1).fill('standard')
+            const {
+                routePreferences
+              } = item,
+              rest = _objectWithoutProperties(item, _excluded);
+            return _objectSpread(_objectSpread(_objectSpread({}, rest), normalizeWaterPreferencePayload(item.cisterns, item.waterValues)), routePreferences && {
+              routePreferences
             });
           });
           if (useMqtt) {

package/lib/mqtt/useSelectRoomClean.js

@@ -2,6 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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";
+import "core-js/modules/esnext.iterator.some.js";
 // 选区清扫
 import { encodeRoomClean0x14, requestRoomClean0x15 } from '@ray-js/robot-protocol';
 import { useContext } from 'react';
@@ -84,15 +85,14 @@ export const useSelectRoomClean = () => {
             const cleanCounts = [];
             const yMops = [];
             const sweepMopModes = [];
-            const routePreferences = [];
+            const prefs = rooms.map(room => room.routePreference);
             rooms.forEach(room => {
-              var _room$suction, _room$cleanTimes, _room$yMop, _room$sweepMopMode, _room$routePreference;
+              var _room$suction, _room$cleanTimes, _room$yMop, _room$sweepMopMode;
               ids.push(room.roomId);
               suctions.push((_room$suction = room.suction) !== null && _room$suction !== void 0 ? _room$suction : '');
               cleanCounts.push((_room$cleanTimes = room.cleanTimes) !== null && _room$cleanTimes !== void 0 ? _room$cleanTimes : 1);
               yMops.push((_room$yMop = room.yMop) !== null && _room$yMop !== void 0 ? _room$yMop : -1);
               sweepMopModes.push((_room$sweepMopMode = room.sweepMopMode) !== null && _room$sweepMopMode !== void 0 ? _room$sweepMopMode : 'only_sweep');
-              routePreferences.push((_room$routePreference = room.routePreference) !== null && _room$routePreference !== void 0 ? _room$routePreference : 'standard');
             });
             const waterPayload = normalizeWaterPreferencePayload(rooms.map(room => {
               var _room$cistern;
@@ -101,14 +101,16 @@ export const useSelectRoomClean = () => {
               var _room$waterValue;
               return (_room$waterValue = room.waterValue) !== null && _room$waterValue !== void 0 ? _room$waterValue : '';
             }));
-            sendStructuredMessage(RoomCleanSetEnum.set, _objectSpread(_objectSpread({
+            sendStructuredMessage(RoomCleanSetEnum.set, _objectSpread(_objectSpread(_objectSpread({
               ids,
               suctions
             }, waterPayload), {}, {
               cleanCounts,
               yMops,
-              sweepMopModes,
-              routePreferences,
+              sweepMopModes
+            }, prefs.some(Boolean) && {
+              routePreferences: prefs.map(p => p !== null && p !== void 0 ? p : 'standard')
+            }), {}, {
               num: rooms.length
             }), resolve, error => reject(handleMqttError(error, 'Failed to set room clean')), RoomCleanSetEnum.query // 响应类型是 query，不是 set
             );
@@ -146,10 +148,7 @@ export const useSelectRoomClean = () => {
             var _room$sweepMopMode2;
             return (_room$sweepMopMode2 = room.sweepMopMode) !== null && _room$sweepMopMode2 !== void 0 ? _room$sweepMopMode2 : 'only_sweep';
           });
-          const routePreferences = rooms.map(room => {
-            var _room$routePreference2;
-            return (_room$routePreference2 = room.routePreference) !== null && _room$routePreference2 !== void 0 ? _room$routePreference2 : 'standard';
-          });
+          const prefs = rooms.map(room => room.routePreference);
           resolve(_objectSpread(_objectSpread({
             success: true,
             errCode: 0,
@@ -161,8 +160,9 @@ export const useSelectRoomClean = () => {
           }, waterPayload), {}, {
             cleanCounts,
             yMops,
-            sweepMopModes,
-            routePreferences
+            sweepMopModes
+          }, prefs.some(Boolean) && {
+            routePreferences: prefs.map(p => p !== null && p !== void 0 ? p : 'standard')
           }));
         } catch (error) {
           reject(handleMqttError(error, 'Failed to set room clean'));

package/lib/mqtt/useSpotClean.js

@@ -67,20 +67,21 @@ export const useSpotClean = () => {
             cleanCounts = new Array(num).fill(1),
             yMops = new Array(num).fill(-1),
             sweepMopModes = new Array(num).fill('only_sweep'),
-            routePreferences = new Array(num).fill('standard'),
+            routePreferences,
             names
           } = validatedData;
           if (useMqtt) {
-            sendStructuredMessage(SpotCleanEnum.set, _objectSpread(_objectSpread({
+            sendStructuredMessage(SpotCleanEnum.set, _objectSpread(_objectSpread(_objectSpread({
               num,
               polygons: spots.map(spot => pointsToString([spot], origin)),
               suctions
             }, waterPayload), {}, {
               cleanCounts,
               yMops,
-              sweepMopModes,
+              sweepMopModes
+            }, routePreferences && {
               routePreferences
-            }, names && {
+            }), names && {
               names
             }), resolve, error => reject(handleMqttError(error, 'Failed to set spot clean')), SpotCleanEnum.query // 响应类型是 query，不是 set
             );
@@ -94,7 +95,7 @@ export const useSpotClean = () => {
             point: spots[0]
           });
           devices.common.model.actions.command_trans.set(command);
-          resolve(_objectSpread(_objectSpread({
+          resolve(_objectSpread(_objectSpread(_objectSpread({
             success: true,
             errCode: 0,
             reqType: SpotCleanEnum.query,
@@ -105,9 +106,10 @@ export const useSpotClean = () => {
           }, waterPayload), {}, {
             cleanCounts,
             yMops,
-            sweepMopModes,
+            sweepMopModes
+          }, routePreferences && {
             routePreferences
-          }, names && {
+          }), names && {
             names
           }));
         } catch (error) {

package/lib/mqtt/useZoneClean.js

@@ -81,7 +81,7 @@ export const useZoneClean = () => {
             cleanCounts = new Array(num).fill(1),
             yMops = new Array(num).fill(-1),
             sweepMopModes = new Array(num).fill('only_sweep'),
-            routePreferences = new Array(num).fill('standard')
+            routePreferences
           } = params;
           const zoneCleanData = _objectSpread(_objectSpread({
             zones: zones.map(_ref => {
@@ -101,7 +101,8 @@ export const useZoneClean = () => {
           }, waterPayload), {}, {
             cleanCounts,
             yMops,
-            sweepMopModes,
+            sweepMopModes
+          }, routePreferences && {
             routePreferences
           });
 
@@ -124,7 +125,8 @@ export const useZoneClean = () => {
           }, waterPayload), {}, {
             cleanCounts: validatedData.cleanCounts,
             yMops: validatedData.yMops,
-            sweepMopModes: validatedData.sweepMopModes,
+            sweepMopModes: validatedData.sweepMopModes
+          }, validatedData.routePreferences && {
             routePreferences: validatedData.routePreferences
           });
           if (useMqtt) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-data-stream",
-  "version": "0.0.16-beta.1",
+  "version": "0.0.16-beta.2",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [