@ray-js/robot-data-stream 0.0.13-beta-5 → 0.0.13-beta-6

package/lib/api/sweeperP2p.d.ts

@@ -42,6 +42,12 @@ declare const FILE_NAME_MAP: {
     readonly 'aiHD_XXXX_YYYY.bin.stream': {
         readonly type: 5;
     };
+    readonly 'wifi_map.bin': {
+        readonly type: 7;
+    };
+    readonly 'wifi_map.bin.stream': {
+        readonly type: 7;
+    };
 };
 export declare class SweeperP2p extends P2pApi {
     file: {
@@ -69,6 +75,7 @@ export declare class SweeperP2p extends P2pApi {
     onReceivePathData: (data: string) => void;
     onReceiveAIPicData: (data: string) => void;
     onReceiveAIPicHDData: (data: string) => void;
+    onReceiveWifiMapData: (data: string) => void;
     offFileDownloadComplete: () => void;
     offP2pStreamPacketReceive: () => void;
     offDownLoadProgressUpdate: () => void;
@@ -125,7 +132,7 @@ export declare class SweeperP2p extends P2pApi {
      * @param downloadType
      * 0: 下载断开 1: 持续下载
      */
-    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined, onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined) => Promise<void>;
+    startObserverSweeperDataByP2P: (downloadType: number, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => void) | undefined, onReceiveWifiMapData?: ((data: string) => void) | undefined, onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined) => Promise<void>;
     /**
      * 在下载过程中继续添加下载文件
      * @param files

package/lib/api/sweeperP2p.js

@@ -43,6 +43,12 @@ const FILE_NAME_MAP = {
   },
   'aiHD_XXXX_YYYY.bin.stream': {
     type: 5
+  },
+  'wifi_map.bin': {
+    type: 7
+  },
+  'wifi_map.bin.stream': {
+    type: 7
   }
 };
 
@@ -191,6 +197,9 @@ export class SweeperP2p extends P2pApi {
     if (filename.indexOf('aiHD') !== -1) {
       return 5;
     }
+    if (filename.indexOf('wifi_map') !== -1) {
+      return 7;
+    }
     return 2;
   };
 
@@ -216,7 +225,7 @@ export class SweeperP2p extends P2pApi {
         if (!this.isConnecting) {
           this.reconnectP2p(() => {
             // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-            this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
+            this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData, this.onReceiveWifiMapData);
           }, '');
         } else {
           logger('warn', {
@@ -232,7 +241,7 @@ export class SweeperP2p extends P2pApi {
    * @param downloadType
    * 0: 下载断开 1: 持续下载
    */
-  startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onDefineStructuredMode) => {
+  startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onReceiveWifiMapData, onDefineStructuredMode) => {
     var _this$file$items;
     if (![0, 1].some(item => item === downloadType)) {
       logger('warn', {
@@ -242,6 +251,7 @@ export class SweeperP2p extends P2pApi {
     }
     this.onReceiveMapData = onReceiveMapData;
     this.onReceivePathData = onReceivePathData;
+    this.onReceiveWifiMapData = onReceiveWifiMapData;
     this.onDefineStructuredMode = onDefineStructuredMode;
     this.onReceiveAIPicData = onReceiveAIPicData || (() => {
       // do nothing
@@ -290,7 +300,7 @@ export class SweeperP2p extends P2pApi {
                 this.isConnecting = false;
                 this.connectDevice(() => {
                   // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
+                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData, this.onReceiveWifiMapData);
                 });
               });
             });
@@ -324,7 +334,7 @@ export class SweeperP2p extends P2pApi {
                 this.isConnecting = false;
                 this.connectDevice(() => {
                   // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
+                  this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData, this.onReceiveWifiMapData);
                 });
               });
             });
@@ -530,6 +540,9 @@ export class SweeperP2p extends P2pApi {
           if (type === 5) {
             this.onReceiveAIPicHDData(hexValue);
           }
+          if (type === 7) {
+            this.onReceiveWifiMapData(hexValue);
+          }
         }
       }
     }
@@ -571,6 +584,9 @@ export class SweeperP2p extends P2pApi {
             if (type === 5) {
               this.onReceiveAIPicHDData(hexValue);
             }
+            if (type === 7) {
+              this.onReceiveWifiMapData(hexValue);
+            }
             this.cacheData[type] = hexValue;
           }
         },

package/lib/index.d.ts

@@ -5,6 +5,7 @@ declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string)
     logTag?: string | undefined;
     onReceiveAIPicData?: ((data: string) => void) | undefined;
     onReceiveAIPicHDData?: ((data: string) => void) | undefined;
+    onReceiveWifiMapData?: ((data: string) => void) | undefined;
     onLogger?: TOnLogger | undefined;
     onDefineStructuredMode?: ((isStructured: boolean) => void) | undefined;
 } | undefined) => {

package/lib/index.js

@@ -14,6 +14,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     logTag,
     onReceiveAIPicData,
     onReceiveAIPicHDData,
+    onReceiveWifiMapData,
     onLogger,
     onDefineStructuredMode
   } = opt || {};
@@ -127,7 +128,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
         eventName: 'connectDeviceSuccess'
       });
       isInit.current = true;
-      SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onDefineStructuredMode);
+      SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onReceiveWifiMapData, onDefineStructuredMode);
       offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
     }, () => {
       trace.pointFn({
@@ -140,7 +141,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
           devId,
           eventName: 'reconnectP2p'
         });
-        SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+        SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData, onReceiveWifiMapData);
         // 这里失败重连需要注册断开重连的事件
         offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
       }, '');

package/lib/mqtt/index.d.ts

@@ -3,6 +3,7 @@ import { useDevInfo } from './useDevInfo';
 import { usePartDivision } from './usePartDivision';
 import { usePartMerge } from './usePartMerge';
 import { usePassword } from './usePassword';
+import { useWifiMap } from './useWifiMap';
 import { useQuiteHours } from './useQuiteHours';
 import { useVirtualArea } from './useVirtualArea';
 import { useSpotClean } from './useSpotClean';
@@ -14,4 +15,4 @@ import { useHistoryMap } from './useHistoryMap';
 import { useVoice } from './useVoice';
 import { useRoomProperty } from './useRoomProperty';
 import { useResetMap } from './useResetMap';
-export { useVoice, MqttProvider, useDevInfo, usePartMerge, usePartDivision, usePassword, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, };
+export { useVoice, MqttProvider, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap, };

package/lib/mqtt/index.js

@@ -3,6 +3,7 @@ import { useDevInfo } from './useDevInfo';
 import { usePartDivision } from './usePartDivision';
 import { usePartMerge } from './usePartMerge';
 import { usePassword } from './usePassword';
+import { useWifiMap } from './useWifiMap';
 import { useQuiteHours } from './useQuiteHours';
 import { useVirtualArea } from './useVirtualArea';
 import { useSpotClean } from './useSpotClean';
@@ -14,4 +15,4 @@ import { useHistoryMap } from './useHistoryMap';
 import { useVoice } from './useVoice';
 import { useRoomProperty } from './useRoomProperty';
 import { useResetMap } from './useResetMap';
-export { useVoice, MqttProvider, useDevInfo, usePartMerge, usePartDivision, usePassword, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap };
+export { useVoice, MqttProvider, useDevInfo, usePartMerge, usePartDivision, usePassword, useWifiMap, useQuiteHours, useVirtualArea, useSpotClean, useZoneClean, useSelectRoomClean, useVirtualWall, useSchedule, useHistoryMap, useRoomProperty, useResetMap };

package/lib/mqtt/type/index.d.ts

@@ -13,6 +13,11 @@ export declare enum PasswordEnum {
     check = "passwordCheck",
     checkRst = "passwordCheckRst"
 }
+export declare enum WifiMapEnum {
+    query = "WifiMapQry",
+    set = "WifiMapSet",
+    rst = "WifiMapRst"
+}
 export type RoomPreference = {
     suctions?: string[];
     cisterns?: string[];

package/lib/mqtt/type/index.js

@@ -8,4 +8,10 @@ export let PasswordEnum = /*#__PURE__*/function (PasswordEnum) {
   PasswordEnum["check"] = "passwordCheck";
   PasswordEnum["checkRst"] = "passwordCheckRst";
   return PasswordEnum;
+}({});
+export let WifiMapEnum = /*#__PURE__*/function (WifiMapEnum) {
+  WifiMapEnum["query"] = "WifiMapQry";
+  WifiMapEnum["set"] = "WifiMapSet";
+  WifiMapEnum["rst"] = "WifiMapRst";
+  return WifiMapEnum;
 }({});

package/lib/mqtt/type/requestType.d.ts

@@ -21,6 +21,11 @@ export declare enum PasswordEnum {
     check = "passwordCheck",
     checkRst = "passwordCheckRst"
 }
+export declare enum WifiMapEnum {
+    query = "WifiMapQry",
+    set = "WifiMapSet",
+    rst = "WifiMapRst"
+}
 export declare enum RoomPropertyEnum {
     set = "roomPropertySet",
     query = "roomPropertyQry"

package/lib/mqtt/type/requestType.js

@@ -32,6 +32,12 @@ export let PasswordEnum = /*#__PURE__*/function (PasswordEnum) {
   PasswordEnum["checkRst"] = "passwordCheckRst";
   return PasswordEnum;
 }({});
+export let WifiMapEnum = /*#__PURE__*/function (WifiMapEnum) {
+  WifiMapEnum["query"] = "WifiMapQry";
+  WifiMapEnum["set"] = "WifiMapSet";
+  WifiMapEnum["rst"] = "WifiMapRst";
+  return WifiMapEnum;
+}({});
 export let RoomPropertyEnum = /*#__PURE__*/function (RoomPropertyEnum) {
   RoomPropertyEnum["set"] = "roomPropertySet";
   RoomPropertyEnum["query"] = "roomPropertyQry";

package/lib/mqtt/useSpotClean.js

@@ -1,3 +1,4 @@
+import "core-js/modules/esnext.iterator.map.js";
 // 定点清扫
 
 import { isArray } from 'lodash-es';
@@ -73,7 +74,7 @@ export const useSpotClean = devId => {
           reqType: SpotCleanEnum.set,
           message: {
             num,
-            polygons: [pointsToString(spots, origin)],
+            polygons: spots.map(spot => pointsToString([spot], origin)),
             suctions,
             cisterns,
             cleanCounts,

package/lib/mqtt/useWifiMap.d.ts

@@ -0,0 +1,8 @@
+import { PromiseWithRejection } from './promise';
+type TRequestWifiMap = () => PromiseWithRejection | Promise<void>;
+type TSetWifiMap = () => PromiseWithRejection;
+export declare const useWifiMap: (devId: string) => {
+    requestWifiMap: TRequestWifiMap;
+    setWifiMap: TSetWifiMap;
+};
+export {};

package/lib/mqtt/useWifiMap.js

@@ -0,0 +1,37 @@
+import { createSetCommonParams } from './createCommonOptions';
+import { normalResolve } from './promise';
+import { WifiMapEnum } from './type';
+import { useContext } from 'react';
+import { SingletonContext } from './mqttProvider';
+export const useWifiMap = devId => {
+  const {
+    useMqtt
+  } = useContext(SingletonContext);
+
+  // 请求密码状态
+
+  // 设置密码
+
+  return {
+    requestWifiMap: () => {
+      if (!useMqtt) return Promise.reject(new Error('useMqtt is not used'));
+      const params = createSetCommonParams({
+        deviceId: devId,
+        reqType: WifiMapEnum.query
+      });
+      ty.device.sendMqttMessage(params);
+      return normalResolve(WifiMapEnum.query, params.message.taskId);
+    },
+    setWifiMap: () => {
+      const params = createSetCommonParams({
+        deviceId: devId,
+        reqType: WifiMapEnum.set,
+        message: {
+          taskId: String(Date.now())
+        }
+      });
+      ty.device.sendMqttMessage(params);
+      return normalResolve(WifiMapEnum.rst, params.message.taskId);
+    }
+  };
+};

package/package.json

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