@ray-js/robot-data-stream 0.0.10-beta-14 → 0.0.10-beta-15

package/lib/mqtt/useVoice.js

@@ -3,6 +3,9 @@ import { getVoiceList } from '@ray-js/ray';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { VoiceLanguageEnum } from './type';
+import { useContext } from 'react';
+import { SingletonContext } from './mqttProvider';
+import { encodeVoice0x34 } from '@ray-js/robot-protocol';
 
 // 设置语音语言函数类型定义
 
@@ -14,6 +17,10 @@ import { VoiceLanguageEnum } from './type';
  * @returns 包含 requestAllVoices, requestVoiceInUse 和 setVoice 函数的对象
  */
 export const useVoice = devId => {
+  const {
+    useStructuredMode,
+    devices
+  } = useContext(SingletonContext);
   /**
    * 请求所有语音语言
    * @returns Promise<any> 响应结果
@@ -51,16 +58,23 @@ export const useVoice = devId => {
       return normalResolve(VoiceLanguageEnum.query, taskId);
     },
     setVoice: message => {
-      const sendData = _objectSpread(_objectSpread({}, message), {}, {
-        urlLen: message.url.length
+      if (useStructuredMode) {
+        const sendData = _objectSpread(_objectSpread({}, message), {}, {
+          urlLen: message.url.length
+        });
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: VoiceLanguageEnum.set,
+          message: sendData
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(VoiceLanguageEnum.query, params.message.taskId);
+      }
+      const command = encodeVoice0x34(message);
+      devices.common.model.actions.voice_data.set(command);
+      return Promise.resolve({
+        success: true
       });
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: VoiceLanguageEnum.set,
-        message: sendData
-      });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(VoiceLanguageEnum.query, params.message.taskId);
     }
   };
 };

package/lib/mqtt/useZoneClean.d.ts

@@ -1,4 +1,5 @@
 import { RoomPreference } from './type';
+import { Point, Zone } from '@ray-js/robot-protocol';
 type Response = {
     reqType: string;
     version: string;
@@ -13,9 +14,9 @@ type Response = {
     sweepMopModes?: string[];
 };
 type TSetZoneClean = (message: Partial<Pick<RoomPreference, 'suctions' | 'cisterns' | 'cleanCounts' | 'yMops' | 'sweepMopModes'>> & {
-    polygons: string[];
-    names?: string[];
-}) => Promise<Response>;
+    zones: Zone[];
+    origin: Point;
+}) => Promise<Response | void>;
 /**
  * 划区清扫
  * @returns

package/lib/mqtt/useZoneClean.js

@@ -1,81 +1,115 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
 // 划区清扫
 
 import { isArray } from 'lodash-es';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { ZoneCleanEnum } from './type';
+import { useContext } from 'react';
+import { SingletonContext } from './mqttProvider';
+import { encodeZoneClean0x3a, requestZoneClean0x3b } from '@ray-js/robot-protocol';
+import { pointsToString } from 'src/utils';
 /**
  * 划区清扫
  * @returns
  */
 export const useZoneClean = devId => {
+  const {
+    useStructuredMode,
+    commandVersion,
+    devices
+  } = useContext(SingletonContext);
+
   // 请求划区清扫信息
 
   // 设置划区清扫
 
   return {
     requestZoneClean: () => {
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: ZoneCleanEnum.query
-      });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(ZoneCleanEnum.query, params.message.taskId);
+      if (useStructuredMode) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: ZoneCleanEnum.query
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(ZoneCleanEnum.query, params.message.taskId);
+      }
+      return devices.common.model.actions.command_trans.set(requestZoneClean0x3b({
+        version: commandVersion
+      }));
     },
     setZoneClean: message => {
       const {
-        polygons
-      } = message;
-      if (!isArray(polygons) || isArray(polygons) && polygons.length === 0) {
-        return Promise.reject(new Error('message is required'));
-      }
-      const num = polygons.length;
-      const {
-        suctions = new Array(num).fill(''),
-        cisterns = new Array(num).fill(''),
-        cleanCounts = new Array(num).fill(1),
-        yMops = new Array(num).fill(-1),
-        sweepMopModes = new Array(num).fill('only_sweep'),
-        names = new Array(num).fill('')
+        zones,
+        origin
       } = message;
-      if (suctions && !isArray(suctions)) {
-        return Promise.reject(new Error('suctions is illegal'));
-      }
-      if (cisterns && !isArray(cisterns)) {
-        return Promise.reject(new Error('cisterns is illegal'));
-      }
-      if (cleanCounts && !isArray(cleanCounts)) {
-        return Promise.reject(new Error('cleanCounts is illegal'));
-      }
-      if (yMops && !isArray(yMops)) {
-        return Promise.reject(new Error('yMops is illegal'));
-      }
-      if (sweepMopModes && !isArray(sweepMopModes)) {
-        return Promise.reject(new Error('sweepMopModes is illegal'));
-      }
-      if (names && !isArray(names)) {
-        return Promise.reject(new Error('names is illegal'));
-      }
-      if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length || num !== names.length) {
-        return Promise.reject(new Error('The length of the parameters is inconsistent'));
-      }
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: ZoneCleanEnum.set,
-        message: {
-          num: polygons.length,
-          switchGo: true,
-          polygons,
-          suctions,
-          cisterns,
-          cleanCounts,
-          yMops,
-          sweepMopModes,
-          names
+      if (useStructuredMode) {
+        if (!isArray(zones) || isArray(zones) && zones.length === 0) {
+          return Promise.reject(new Error('message is required'));
+        }
+        const num = zones.length;
+        const {
+          suctions = new Array(num).fill(''),
+          cisterns = new Array(num).fill(''),
+          cleanCounts = new Array(num).fill(1),
+          yMops = new Array(num).fill(-1),
+          sweepMopModes = new Array(num).fill('only_sweep')
+        } = message;
+        if (suctions && !isArray(suctions)) {
+          return Promise.reject(new Error('suctions is illegal'));
+        }
+        if (cisterns && !isArray(cisterns)) {
+          return Promise.reject(new Error('cisterns is illegal'));
         }
+        if (cleanCounts && !isArray(cleanCounts)) {
+          return Promise.reject(new Error('cleanCounts is illegal'));
+        }
+        if (yMops && !isArray(yMops)) {
+          return Promise.reject(new Error('yMops is illegal'));
+        }
+        if (sweepMopModes && !isArray(sweepMopModes)) {
+          return Promise.reject(new Error('sweepMopModes is illegal'));
+        }
+        if (num !== suctions.length || num !== cisterns.length || num !== cleanCounts.length || num !== yMops.length || num !== sweepMopModes.length) {
+          return Promise.reject(new Error('The length of the parameters is inconsistent'));
+        }
+        const polygons = [];
+        const names = [];
+        zones.forEach(_ref => {
+          let {
+            points,
+            name
+          } = _ref;
+          polygons.push(pointsToString(points, origin));
+          names.push(name);
+        });
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: ZoneCleanEnum.set,
+          message: {
+            num: zones.length,
+            switchGo: true,
+            polygons,
+            suctions,
+            cisterns,
+            cleanCounts,
+            yMops,
+            sweepMopModes,
+            names
+          }
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(ZoneCleanEnum.query, params.message.taskId);
+      }
+      const command = encodeZoneClean0x3a({
+        protocolVersion: 1,
+        version: commandVersion,
+        origin,
+        zones
       });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(ZoneCleanEnum.query, params.message.taskId);
+      devices.common.model.actions.command_trans.set(command);
+      return Promise.resolve();
     }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/robot-data-stream",
-  "version": "0.0.10-beta-14",
+  "version": "0.0.10-beta-15",
   "description": "扫地机P2P数据流标准化组件",
   "main": "lib/index",
   "files": [
@@ -31,17 +31,18 @@
     "release-it": "standard-version"
   },
   "peerDependencies": {
+    "@ray-js/log4js": "^0.0.4",
     "@ray-js/ray": "^1.5.0",
-    "@ray-js/log4js": "^0.0.4"
+    "@ray-js/robot-protocol": "^0.10.0"
   },
   "dependencies": {
     "clsx": "^1.2.1",
+    "crypto-js": "^4.2.0",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "moment": "^2.30.1",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "crypto-js": "^4.2.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^7.2.1",
@@ -49,6 +50,7 @@
     "@ray-js/cli": "^1.5.20",
     "@ray-js/log4js": "^0.0.4",
     "@ray-js/ray": "^1.5.0",
+    "@ray-js/robot-protocol": "^0.10.0",
     "core-js": "^3.19.1",
     "eslint-config-tuya-panel": "^0.4.2",
     "husky": "^1.2.0",