@ray-js/robot-data-stream 0.0.10-beta-20 → 0.0.10-beta-22

package/lib/api/sweeperP2p.js

@@ -410,6 +410,10 @@ export class SweeperP2p extends P2pApi {
     let {
       fileName
     } = data;
+    if (fileName.startsWith('map')) {
+      var _FILE_NAME_MAP$fileNa;
+      this.initStructuredMode(((_FILE_NAME_MAP$fileNa = FILE_NAME_MAP[fileName]) === null || _FILE_NAME_MAP$fileNa === void 0 ? void 0 : _FILE_NAME_MAP$fileNa.type) === 6);
+    }
 
     // 因为XXXX_YYYYY会被替换为坐标值，所以这里需要替换一下
 
@@ -471,7 +475,6 @@ export class SweeperP2p extends P2pApi {
           if (type === 0 || type === 6) {
             this.onReceiveMapData(hexValue);
             this.mapUpdateCount += 1;
-            this.initStructuredMode(type === 6);
           }
           if (type === 1) {
             this.onReceivePathData(hexValue);

package/lib/mqtt/mqttProvider.d.ts

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

package/lib/mqtt/mqttProvider.js

@@ -17,7 +17,7 @@ export function useMqtt() {
 export function MqttProvider(_ref) {
   let {
     children,
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = _ref;
@@ -54,8 +54,8 @@ export function MqttProvider(_ref) {
       }
     });
     instanceRef.current = {
-      // 是否结构化数据(mqtt)
-      useStructuredMode,
+      // 是否走mqtt64/65通道
+      useMqtt,
       // 指令协议版本(1byte or 4bytes)
       commandVersion,
       // sdm

package/lib/mqtt/useDevInfo.js

@@ -10,12 +10,12 @@ var DevInfoEnum = /*#__PURE__*/function (DevInfoEnum) {
 // 请求设备信息
 export const useDevInfo = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices
   } = useContext(SingletonContext);
   return {
     requestDevInfo: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: DevInfoEnum.query,

package/lib/mqtt/useHistoryMap.js

@@ -17,7 +17,7 @@ import { encodeDeleteMap0x2c, encodeSaveMap0x2a, encodeUseMap0x2e } from '@ray-j
  */
 export const useHistoryMap = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices
   } = useContext(SingletonContext);
   /**
@@ -45,7 +45,7 @@ export const useHistoryMap = devId => {
           return Promise.reject(new Error('mapId is required'));
         }
         await deleteMultipleMapFile(mapId, devId);
-        if (useStructuredMode) {
+        if (useMqtt) {
           const params = createSetCommonParams({
             deviceId: devId,
             reqType: DeleteMapEnum.set,
@@ -70,7 +70,7 @@ export const useHistoryMap = devId => {
     },
     changeCurrentMap: async (mapId, url) => {
       try {
-        if (useStructuredMode) {
+        if (useMqtt) {
           const sendData = {
             reqType: UseMapEnum.set,
             mapId,
@@ -99,7 +99,7 @@ export const useHistoryMap = devId => {
       }
     },
     saveMap: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: SaveCurrentMapEnum.set,

package/lib/mqtt/usePartDivision.js

@@ -16,7 +16,7 @@ import { encodePartitionDivision0x1c } from '@ray-js/robot-protocol';
  */
 export const usePartDivision = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -31,7 +31,7 @@ export const usePartDivision = devId => {
 
   return {
     setPartDivision: (points, roomId, origin) => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const pointStr = pointsToString(points, origin);
         const params = createSetCommonParams({
           deviceId: devId,

package/lib/mqtt/usePartMerge.js

@@ -17,7 +17,7 @@ import { encodePartitionMerge0x1e } from '@ray-js/robot-protocol';
  */
 export const usePartMerge = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -35,7 +35,7 @@ export const usePartMerge = devId => {
       if (ids.some(id => typeof id !== 'number')) {
         return Promise.reject(new Error('ids must be an array of numbers'));
       }
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: PartMergeEnum.set,

package/lib/mqtt/usePassword.js

@@ -6,7 +6,7 @@ import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 export const usePassword = devId => {
   const {
-    useStructuredMode
+    useMqtt
   } = useContext(SingletonContext);
 
   // 请求密码状态
@@ -17,7 +17,7 @@ export const usePassword = devId => {
 
   return {
     requestPassword: () => {
-      if (!useStructuredMode) return null;
+      if (!useMqtt) return null;
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: PasswordEnum.query

package/lib/mqtt/useQuiteHours.js

@@ -18,7 +18,7 @@ import { encodeDoNotDisturb0x32 } from '@ray-js/robot-protocol';
  */
 export const useQuiteHours = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -40,7 +40,7 @@ export const useQuiteHours = devId => {
           endTime
         } = message,
         others = _objectWithoutProperties(message, _excluded);
-      if (useStructuredMode) {
+      if (useMqtt) {
         if (!startTime || !endTime) {
           throw new Error('Invalid time');
         }

package/lib/mqtt/useResetMap.js

@@ -6,7 +6,7 @@ import { SingletonContext } from './mqttProvider';
 import { encodeResetMap0x42 } from '@ray-js/robot-protocol';
 export const useResetMap = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -14,7 +14,7 @@ export const useResetMap = devId => {
 
   return {
     setResetMap: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: ResetCurrMapEnum.set

package/lib/mqtt/useRoomProperty.js

@@ -6,7 +6,7 @@ import { useContext } from 'react';
 import { SingletonContext } from './mqttProvider';
 export const useRoomProperty = devId => {
   const {
-    useStructuredMode
+    useMqtt
   } = useContext(SingletonContext);
 
   // 请求房间属性
@@ -15,7 +15,7 @@ export const useRoomProperty = devId => {
 
   return {
     requestRoomProperty: () => {
-      if (!useStructuredMode) return null;
+      if (!useMqtt) return null;
       const params = createSetCommonParams({
         deviceId: devId,
         reqType: RoomPropertyEnum.query

package/lib/mqtt/useSchedule.js

@@ -12,7 +12,7 @@ import { CISTERN_MAP, CLEAN_MODE_MAP, SUCTION_MAP } from '../constant';
 
 export const useSchedule = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices,
     commandVersion
   } = useContext(SingletonContext);
@@ -33,7 +33,7 @@ export const useSchedule = devId => {
       return normalResolve(ScheduleEnum.query, taskId);
     },
     setSchedule: message => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: ScheduleEnum.set,

package/lib/mqtt/useSelectRoomClean.js

@@ -10,7 +10,7 @@ import { SingletonContext } from './mqttProvider';
 import { encodeRoomClean0x14, requestRoomClean0x15 } from '@ray-js/robot-protocol';
 export const useSelectRoomClean = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -22,7 +22,7 @@ export const useSelectRoomClean = devId => {
 
   return {
     requestSelectRoomClean: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: RoomCleanSetEnum.query
@@ -36,7 +36,7 @@ export const useSelectRoomClean = devId => {
     },
     setRoomClean: rooms => {
       var _rooms$0$cleanTimes, _rooms$;
-      if (useStructuredMode) {
+      if (useMqtt) {
         const ids = [];
         const suctions = [];
         const cisterns = [];

package/lib/mqtt/useSpotClean.js

@@ -14,7 +14,7 @@ import { pointsToString } from '../utils';
  */
 export const useSpotClean = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -38,7 +38,7 @@ export const useSpotClean = devId => {
         spots,
         origin
       } = message;
-      if (useStructuredMode) {
+      if (useMqtt) {
         if (!isArray(spots) || isArray(spots) && spots.length === 0) {
           return Promise.reject(new Error('message is required'));
         }

package/lib/mqtt/useVirtualArea.js

@@ -12,7 +12,7 @@ import { pointsToString } from '../utils';
 
 export const useVirtualArea = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -34,7 +34,7 @@ export const useVirtualArea = devId => {
 
   return {
     requestVirtualArea: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: VirtualAreaEnum.query
@@ -51,7 +51,7 @@ export const useVirtualArea = devId => {
         data,
         origin
       } = _ref;
-      if (useStructuredMode) {
+      if (useMqtt) {
         const names = [];
         const modes = [];
         const polygons = [];

package/lib/mqtt/useVirtualWall.js

@@ -10,7 +10,7 @@ import { encodeVirtualWall0x12, requestVirtualWall0x13 } from '@ray-js/robot-pro
 import { pointsToString } from '../utils';
 export const useVirtualWall = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -28,7 +28,7 @@ export const useVirtualWall = devId => {
 
   return {
     requestVirtualWall: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: VirtualWallEnum.query
@@ -45,7 +45,7 @@ export const useVirtualWall = devId => {
         data,
         origin
       } = _ref;
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: VirtualWallEnum.set,

package/lib/mqtt/useVoice.js

@@ -18,7 +18,7 @@ import { encodeVoice0x34 } from '@ray-js/robot-protocol';
  */
 export const useVoice = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     devices
   } = useContext(SingletonContext);
   /**
@@ -58,7 +58,7 @@ export const useVoice = devId => {
       return normalResolve(VoiceLanguageEnum.query, taskId);
     },
     setVoice: message => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const sendData = _objectSpread(_objectSpread({}, message), {}, {
           urlLen: message.url.length
         });

package/lib/mqtt/useZoneClean.js

@@ -16,7 +16,7 @@ import { pointsToString } from '../utils';
  */
 export const useZoneClean = devId => {
   const {
-    useStructuredMode,
+    useMqtt,
     commandVersion,
     devices
   } = useContext(SingletonContext);
@@ -27,7 +27,7 @@ export const useZoneClean = devId => {
 
   return {
     requestZoneClean: () => {
-      if (useStructuredMode) {
+      if (useMqtt) {
         const params = createSetCommonParams({
           deviceId: devId,
           reqType: ZoneCleanEnum.query
@@ -44,7 +44,7 @@ export const useZoneClean = devId => {
         zones,
         origin
       } = message;
-      if (useStructuredMode) {
+      if (useMqtt) {
         if (!isArray(zones) || isArray(zones) && zones.length === 0) {
           return Promise.reject(new Error('message is required'));
         }

package/package.json

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