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

package/lib/constant.d.ts

@@ -0,0 +1,3 @@
+export declare const SUCTION_MAP: Record<string, number>;
+export declare const CISTERN_MAP: Record<string, number>;
+export declare const CLEAN_MODE_MAP: Record<string, number>;

package/lib/constant.js

@@ -0,0 +1,29 @@
+// 吸力
+export const SUCTION_MAP = {
+  closed: 0,
+  gentle: 1,
+  normal: 2,
+  strong: 3,
+  max: 4
+};
+
+// 水量
+export const CISTERN_MAP = {
+  closed: 0,
+  low: 1,
+  middle: 2,
+  high: 3
+};
+
+// 清扫模式
+export const CLEAN_MODE_MAP = {
+  // 扫拖
+  both_work: 0,
+  // 仅扫
+  only_sweep: 1,
+  // 仅拖
+  only_mop: 2,
+  // 先扫后拖
+  clean_before_mop: 3,
+  sweep_after_mop: 3
+};

package/lib/mqtt/mqttProvider.d.ts

@@ -1,6 +1,21 @@
 import React from 'react';
-export declare function useMqtt(): never;
-export declare function MqttProvider({ children, devId }: {
+export declare const SingletonContext: React.Context<{
+    useStructuredMode: boolean;
+    commandVersion: '0' | '1';
+    devices: {
+        common: any;
+    };
+}>;
+export declare function useMqtt(): {
+    useStructuredMode: boolean;
+    commandVersion: "0" | "1";
+    devices: {
+        common: any;
+    };
+};
+export declare function MqttProvider({ children, useStructuredMode, commandVersion, devices }: {
     children: any;
-    devId: any;
+    useStructuredMode: any;
+    commandVersion: any;
+    devices: any;
 }): React.JSX.Element;

package/lib/mqtt/mqttProvider.js

@@ -2,8 +2,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { get, isNil } from 'lodash-es';
 import React, { createContext, useCallback, useContext, useRef, useState } from 'react';
 import { emitter } from '../utils';
+
 // 创建一个Context
-const SingletonContext = /*#__PURE__*/createContext(null);
+export const SingletonContext = /*#__PURE__*/createContext(null);
 
 // 创建一个自定义Hook来使用这个Context
 export function useMqtt() {
@@ -16,7 +17,9 @@ export function useMqtt() {
 export function MqttProvider(_ref) {
   let {
     children,
-    devId
+    useStructuredMode,
+    commandVersion,
+    devices
   } = _ref;
   const [instance, setInstance] = useState(null);
   const onMqttMessageReceived = useCallback(data => {
@@ -36,6 +39,9 @@ export function MqttProvider(_ref) {
   // 使用ref确保实例只被创建一次
   const instanceRef = useRef(null);
   if (instanceRef.current === null) {
+    const {
+      devId
+    } = devices.common.getDevInfo();
     ty.device.registerMQTTProtocolListener({
       protocol: 65,
       success: () => {
@@ -48,8 +54,12 @@ export function MqttProvider(_ref) {
       }
     });
     instanceRef.current = {
-      // 这里定义单例的状态和行为
-      someState: 'initial state'
+      // 是否结构化数据(mqtt)
+      useStructuredMode,
+      // 指令协议版本(1byte or 4bytes)
+      commandVersion,
+      // sdm
+      devices
     };
     setInstance(instanceRef.current);
   }

package/lib/mqtt/promise.js

@@ -34,6 +34,7 @@ export function normalResolve(reqType, taskId) {
         return;
       }
       clearTimeout(timer);
+      emitter.off(reqType);
       if (message.errCode === 0) {
         resolve(message);
       } else {

package/lib/mqtt/useDevInfo.d.ts

@@ -1,10 +1,10 @@
 interface DevInfoResponse {
-    reqType: string;
-    version: string;
+    reqType?: string;
+    version?: string;
     info: string;
-    success: boolean;
-    errCode: number;
-    taskId: string;
+    success?: boolean;
+    errCode?: number;
+    taskId?: string;
 }
 export declare const useDevInfo: (devId: string) => {
     requestDevInfo: () => Promise<DevInfoResponse>;

package/lib/mqtt/useDevInfo.js

@@ -1,23 +1,36 @@
+import { useContext } from 'react';
 import { createSetCommonParams } from './createCommonOptions';
+import { SingletonContext } from './mqttProvider';
 import { normalResolve } from './promise';
+import { hexToUTF8 } from '@ray-js/robot-protocol';
 var DevInfoEnum = /*#__PURE__*/function (DevInfoEnum) {
   DevInfoEnum["query"] = "devInfoQry";
   return DevInfoEnum;
 }(DevInfoEnum || {});
 // 请求设备信息
 export const useDevInfo = devId => {
+  const {
+    useStructuredMode,
+    devices
+  } = useContext(SingletonContext);
   return {
     requestDevInfo: () => {
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: DevInfoEnum.query,
-        message: {}
+      if (useStructuredMode) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: DevInfoEnum.query,
+          message: {}
+        });
+        ty.device.sendMqttMessage(params);
+        const {
+          taskId
+        } = params.message;
+        return normalResolve(DevInfoEnum.query, taskId);
+      }
+      const dpDevInfo = devices.common.model.props.device_info;
+      return Promise.resolve({
+        info: hexToUTF8(dpDevInfo)
       });
-      ty.device.sendMqttMessage(params);
-      const {
-        taskId
-      } = params.message;
-      return normalResolve(DevInfoEnum.query, taskId);
     }
   };
 };

package/lib/mqtt/useHistoryMap.d.ts

@@ -20,7 +20,7 @@ type TSaveMap = () => Promise<{
     mapId: number;
     version: string;
     taskId: string;
-}>;
+} | void>;
 /**
  * 自定义 Hook，用于管理历史地图
  * @param devId 设备ID

package/lib/mqtt/useHistoryMap.js

@@ -1,7 +1,10 @@
+import { useContext } from 'react';
 import { deleteMultipleMapFile } from '../api/deleteMultipleMapFile';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { DeleteMapEnum, SaveCurrentMapEnum, UseMapEnum } from './type';
+import { SingletonContext } from './mqttProvider';
+import { encodeDeleteMap0x2c, encodeSaveMap0x2a, encodeUseMap0x2e } from '@ray-js/robot-protocol';
 
 // 删除历史地图函数类型定义
 
@@ -13,6 +16,10 @@ import { DeleteMapEnum, SaveCurrentMapEnum, UseMapEnum } from './type';
  * @returns 包含删除历史地图、更改当前地图和保存地图的函数
  */
 export const useHistoryMap = devId => {
+  const {
+    useStructuredMode,
+    devices
+  } = useContext(SingletonContext);
   /**
    * 删除历史地图
    * @param mapId 地图ID
@@ -38,54 +45,74 @@ export const useHistoryMap = devId => {
           return Promise.reject(new Error('mapId is required'));
         }
         await deleteMultipleMapFile(mapId, devId);
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: DeleteMapEnum.set,
-          message: {
-            mapId
-          }
+        if (useStructuredMode) {
+          const params = createSetCommonParams({
+            deviceId: devId,
+            reqType: DeleteMapEnum.set,
+            message: {
+              mapId
+            }
+          });
+          ty.device.sendMqttMessage(params);
+          const {
+            taskId
+          } = params.message;
+          return normalResolve(DeleteMapEnum.rst, taskId);
+        }
+        const command = encodeDeleteMap0x2c({
+          id: mapId
         });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return await normalResolve(DeleteMapEnum.rst, taskId);
+        devices.common.model.actions.command_trans.set(command);
+        return Promise.resolve();
       } catch (err) {
         return Promise.reject(err);
       }
     },
     changeCurrentMap: async (mapId, url) => {
       try {
-        const sendData = {
-          reqType: UseMapEnum.set,
+        if (useStructuredMode) {
+          const sendData = {
+            reqType: UseMapEnum.set,
+            mapId,
+            url,
+            urlLen: url.length
+          };
+          const params = createSetCommonParams({
+            deviceId: devId,
+            reqType: UseMapEnum.set,
+            message: sendData
+          });
+          ty.device.sendMqttMessage(params);
+          const {
+            taskId
+          } = params.message;
+          return normalResolve(UseMapEnum.query, taskId);
+        }
+        const command = encodeUseMap0x2e({
           mapId,
-          url,
-          urlLen: url.length
-        };
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: UseMapEnum.set,
-          message: sendData
+          url
         });
-        ty.device.sendMqttMessage(params);
-        const {
-          taskId
-        } = params.message;
-        return await normalResolve(UseMapEnum.query, taskId);
+        devices.common.model.actions.command_trans.set(command);
+        return Promise.resolve();
       } catch (err) {
         return Promise.reject(err);
       }
     },
     saveMap: () => {
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: SaveCurrentMapEnum.set,
-        message: {
-          oper: 0
-        }
-      });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(SaveCurrentMapEnum.query, params.message.taskId);
+      if (useStructuredMode) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: SaveCurrentMapEnum.set,
+          message: {
+            oper: 0
+          }
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(SaveCurrentMapEnum.query, params.message.taskId);
+      }
+      const command = encodeSaveMap0x2a(1);
+      devices.common.model.actions.command_trans.set(command);
+      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/usePartDivision.d.ts

@@ -5,7 +5,7 @@ type TSetPartDivision = (points: Point[], roomId: number, origin: Point) => Prom
     reqType: string;
     version: string;
     taskId: string;
-}>;
+} | void>;
 /**
  * 自定义 Hook，用于房间分隔
  * @param devId 设备ID

package/lib/mqtt/usePartDivision.js

@@ -1,8 +1,11 @@
 // 房间分隔
+import { useContext } from 'react';
 import { pointsToString } from '../utils';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { PartDivisionEnum } from './type';
+import { SingletonContext } from './mqttProvider';
+import { encodePartitionDivision0x1c } from '@ray-js/robot-protocol';
 
 // 设置房间分隔函数类型定义
 
@@ -12,6 +15,12 @@ import { PartDivisionEnum } from './type';
  * @returns 包含 setPartDivision 函数的对象
  */
 export const usePartDivision = devId => {
+  const {
+    useStructuredMode,
+    devices,
+    commandVersion
+  } = useContext(SingletonContext);
+
   /**
    * 设置房间分隔
    * @param points 分隔点数组，SDK方法抛出来的坐标直接传入即可
@@ -22,17 +31,27 @@ export const usePartDivision = devId => {
 
   return {
     setPartDivision: (points, roomId, origin) => {
-      const pointStr = pointsToString(points, origin);
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: PartDivisionEnum.set,
-        message: {
-          lines: [pointStr],
-          ids: [roomId]
-        }
+      if (useStructuredMode) {
+        const pointStr = pointsToString(points, origin);
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: PartDivisionEnum.set,
+          message: {
+            lines: [pointStr],
+            ids: [roomId]
+          }
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(PartDivisionEnum.query, params.message.taskId);
+      }
+      const command = encodePartitionDivision0x1c({
+        version: commandVersion,
+        origin,
+        points,
+        roomId
       });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(PartDivisionEnum.query, params.message.taskId);
+      devices.common.model.actions.command_trans.set(command);
+      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/usePartMerge.d.ts

@@ -4,7 +4,7 @@ type TSetPartMerge = (ids: number[]) => Promise<{
     reqType: string;
     version: string;
     taskId: string;
-}>;
+} | void>;
 /**
  * 自定义 Hook，用于分区合并
  * @param devId 设备ID

package/lib/mqtt/usePartMerge.js

@@ -1,9 +1,12 @@
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.some.js";
 // 分区合并
+import { useContext } from 'react';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { PartMergeEnum } from './type';
+import { SingletonContext } from './mqttProvider';
+import { encodePartitionMerge0x1e } from '@ray-js/robot-protocol';
 
 // 设置分区合并函数类型定义
 
@@ -13,6 +16,11 @@ import { PartMergeEnum } from './type';
  * @returns 包含 setPartMerge 函数的对象
  */
 export const usePartMerge = devId => {
+  const {
+    useStructuredMode,
+    devices,
+    commandVersion
+  } = useContext(SingletonContext);
   /**
    * 设置分区合并
    * @param ids 要合并的分区ID数组
@@ -27,15 +35,23 @@ export const usePartMerge = devId => {
       if (ids.some(id => typeof id !== 'number')) {
         return Promise.reject(new Error('ids must be an array of numbers'));
       }
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: PartMergeEnum.set,
-        message: {
-          ids
-        }
+      if (useStructuredMode) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: PartMergeEnum.set,
+          message: {
+            ids
+          }
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(PartMergeEnum.query, params.message.taskId);
+      }
+      const command = encodePartitionMerge0x1e({
+        version: commandVersion,
+        roomIds: ids
       });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(PartMergeEnum.query, params.message.taskId);
+      devices.common.model.actions.command_trans.set(command);
+      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/usePassword.js

@@ -2,7 +2,13 @@ import md5 from 'crypto-js/md5';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { PasswordEnum } from './type';
+import { useContext } from 'react';
+import { SingletonContext } from './mqttProvider';
 export const usePassword = devId => {
+  const {
+    useStructuredMode
+  } = useContext(SingletonContext);
+
   // 请求密码状态
 
   // 设置密码
@@ -11,6 +17,7 @@ export const usePassword = devId => {
 
   return {
     requestPassword: () => {
+      if (!useStructuredMode) return null;
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: PasswordEnum.query

package/lib/mqtt/useQuiteHours.d.ts

@@ -42,7 +42,9 @@ type TSetQuiteHours = (params: {
     active: number;
     day: number;
     version?: string;
-}) => Promise<Response>;
+}) => Promise<Response> | Promise<{
+    success: boolean;
+}>;
 /**
  * 自定义 Hook，用于勿扰模式
  * @param devId 设备ID

package/lib/mqtt/useQuiteHours.js

@@ -2,9 +2,12 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 const _excluded = ["startTime", "endTime"];
 // 勿扰模式
+import { useContext } from 'react';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { QuietHoursEnum } from './type';
+import { SingletonContext } from './mqttProvider';
+import { encodeDoNotDisturb0x32 } from '@ray-js/robot-protocol';
 
 // 设置勿扰模式函数类型定义
 
@@ -14,6 +17,11 @@ import { QuietHoursEnum } from './type';
  * @returns 包含 setQuiteHours 和 requestQuiteHours 函数的对象
  */
 export const useQuiteHours = devId => {
+  const {
+    useStructuredMode,
+    devices,
+    commandVersion
+  } = useContext(SingletonContext);
   /**
    * 请求勿扰模式数据
    * @returns Promise<{ time: string[]; day: number; active: number }> 响应结果
@@ -32,29 +40,42 @@ export const useQuiteHours = devId => {
           endTime
         } = message,
         others = _objectWithoutProperties(message, _excluded);
-      if (!startTime || !endTime) {
-        throw new Error('Invalid time');
+      if (useStructuredMode) {
+        if (!startTime || !endTime) {
+          throw new Error('Invalid time');
+        }
+        const {
+          hour: h0,
+          minute: m0
+        } = startTime;
+        const {
+          hour: h1,
+          minute: m1
+        } = endTime;
+        if (h0 > 23 || h0 < 0 || h1 > 23 || h1 < 0 || m0 > 59 || m0 < 0 || m1 > 59 || m1 < 0) {
+          throw new Error('Invalid time');
+        }
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: QuietHoursEnum.set,
+          message: _objectSpread({
+            time: [`${h0},${m0}`, `${h1},${m1}`]
+          }, others)
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(QuietHoursEnum.query, params.message.taskId);
       }
-      const {
-        hour: h0,
-        minute: m0
-      } = startTime;
-      const {
-        hour: h1,
-        minute: m1
-      } = endTime;
-      if (h0 > 23 || h0 < 0 || h1 > 23 || h1 < 0 || m0 > 59 || m0 < 0 || m1 > 59 || m1 < 0) {
-        throw new Error('Invalid time');
-      }
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: QuietHoursEnum.set,
-        message: _objectSpread({
-          time: [`${h0},${m0}`, `${h1},${m1}`]
-        }, others)
+      const command = encodeDoNotDisturb0x32({
+        version: commandVersion,
+        startHour: startTime.hour,
+        startMinute: startTime.minute,
+        endHour: endTime.hour,
+        endMinute: endTime.minute
+      });
+      devices.common.model.actions.disturb_time_set.set(command);
+      return Promise.resolve({
+        success: true
       });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(QuietHoursEnum.query, params.message.taskId);
     },
     requestQuiteHours: () => {
       const params = createSetCommonParams({

package/lib/mqtt/useResetMap.d.ts

@@ -4,7 +4,7 @@ type TSetResetMap = () => Promise<{
     reqType: string;
     version: string;
     taskId: string;
-}>;
+} | void>;
 export declare const useResetMap: (devId: string) => {
     setResetMap: TSetResetMap;
 };

package/lib/mqtt/useResetMap.js

@@ -1,17 +1,31 @@
+import { useContext } from 'react';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { ResetCurrMapEnum } from './type';
+import { SingletonContext } from './mqttProvider';
+import { encodeResetMap0x42 } from '@ray-js/robot-protocol';
 export const useResetMap = devId => {
+  const {
+    useStructuredMode,
+    devices,
+    commandVersion
+  } = useContext(SingletonContext);
   // 重置地图
 
   return {
     setResetMap: () => {
-      const params = createSetCommonParams({
-        deviceId: devId,
-        reqType: ResetCurrMapEnum.set
-      });
-      ty.device.sendMqttMessage(params);
-      return normalResolve(ResetCurrMapEnum.query, params.message.taskId);
+      if (useStructuredMode) {
+        const params = createSetCommonParams({
+          deviceId: devId,
+          reqType: ResetCurrMapEnum.set
+        });
+        ty.device.sendMqttMessage(params);
+        return normalResolve(ResetCurrMapEnum.query, params.message.taskId);
+      }
+      devices.common.model.actions.command_trans.set(encodeResetMap0x42({
+        version: commandVersion
+      }));
+      return Promise.resolve();
     }
   };
 };

package/lib/mqtt/useRoomProperty.js

@@ -2,13 +2,20 @@ import { isArray } from 'lodash-es';
 import { createSetCommonParams } from './createCommonOptions';
 import { normalResolve } from './promise';
 import { RoomPropertyEnum } from './type';
+import { useContext } from 'react';
+import { SingletonContext } from './mqttProvider';
 export const useRoomProperty = devId => {
+  const {
+    useStructuredMode
+  } = useContext(SingletonContext);
+
   // 请求房间属性
 
   // 设置房间属性
 
   return {
     requestRoomProperty: () => {
+      if (!useStructuredMode) return null;
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: RoomPropertyEnum.query

package/lib/mqtt/useSchedule.d.ts

@@ -11,6 +11,6 @@ interface Schedule {
 type Response = BaseResponse & Schedule;
 export declare const useSchedule: (devId: string) => {
     requestSchedule: () => Promise<Response>;
-    setSchedule: (message: Schedule) => Promise<Response>;
+    setSchedule: (message: Schedule) => Promise<Response | void>;
 };
 export {};