@ray-js/robot-data-stream 0.0.10-beta-4 → 0.0.10-beta-6

package/lib/api/sweeperP2p.d.ts

@@ -52,7 +52,6 @@ export declare class SweeperP2p extends P2pApi {
     streamFilePath: string;
     dataFilePath: string;
     downloadType: number;
-    useStructuredMode: boolean;
     readingMap: boolean;
     readingClean: boolean;
     readingAI: boolean;
@@ -124,7 +123,7 @@ export declare class SweeperP2p extends P2pApi {
      * @param downloadType
      * 0: 下载断开 1: 持续下载
      */
-    startObserverSweeperDataByP2P: (downloadType: number, useStructuredMode: boolean, devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, onReceiveAIPicData?: ((data: string) => void) | undefined, onReceiveAIPicHDData?: ((data: string) => 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) => Promise<void>;
     /**
      * 在下载过程中继续添加下载文件
      * @param files

package/lib/api/sweeperP2p.js

@@ -50,7 +50,6 @@ export class SweeperP2p extends P2pApi {
     super();
     this.file = undefined;
     this.downloadType = 1;
-    this.useStructuredMode = false;
     this.fileIndex = -1; // -1 表示所有文件下载完成
     this.albumName = 'ipc_sweeper_robot';
     this.cacheDir = ty.env.USER_DATA_PATH;
@@ -191,10 +190,11 @@ export class SweeperP2p extends P2pApi {
       } = data;
       if (status < 0) {
         log4js.info('receive disconnect notice ==>', status);
+        this.isConnected = false;
         if (!this.isConnecting) {
           this.reconnectP2p(() => {
             // 重连之后重新开启文件下载, 这里的成功不需要注册断开事件
-            this.startObserverSweeperDataByP2P(this.downloadType, this.useStructuredMode, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
+            this.startObserverSweeperDataByP2P(this.downloadType, this.devId, this.onReceiveMapData, this.onReceivePathData, this.onReceiveAIPicData, this.onReceiveAIPicHDData);
           });
         } else {
           log4js.warn('receive disconnect notice, but connectDevice is connecting');
@@ -208,7 +208,7 @@ export class SweeperP2p extends P2pApi {
    * @param downloadType
    * 0: 下载断开 1: 持续下载
    */
-  startObserverSweeperDataByP2P = async (downloadType, useStructuredMode, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData) => {
+  startObserverSweeperDataByP2P = async (downloadType, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData) => {
     var _this$file$items;
     if (![0, 1].some(item => item === downloadType)) {
       log4js.warn('download type must be 0 or 1');
@@ -223,7 +223,6 @@ export class SweeperP2p extends P2pApi {
       // do nothing
     });
     log4js.info('startObserverSweeperDataByP2P ==>');
-    this.useStructuredMode = useStructuredMode;
     this.downloadType = downloadType;
     this.setDataFilePath(devId);
     this.setStreamFilePath(devId);
@@ -291,6 +290,7 @@ export class SweeperP2p extends P2pApi {
    * 注册下载有关的监听
    */
   registerP2pDownloadEvent = () => {
+    log4js.info('registerP2pDownloadEvent ==>');
     if (shouldDownloadStream) {
       // p2p数据流监听
       this.offP2pStreamPacketReceive = this.onP2pStreamPacketReceive(this.p2pStreamPacketReceiveCallback);
@@ -311,8 +311,7 @@ export class SweeperP2p extends P2pApi {
    * 移除下载有关的监听
    */
   removeP2pDownloadEvent = () => {
-    this.offFileDownloadComplete && this.offFileDownloadComplete();
-    this.offP2pStreamPacketReceive && this.offP2pStreamPacketReceive();
+    log4js.info('removeP2pDownloadEvent ==>');
     if (shouldDownloadStream) {
       [...this.packetSerialNumberCacheMap.keys()].forEach(key => {
         this.packetSerialNumberCacheMap.set(key, -1);
@@ -326,6 +325,8 @@ export class SweeperP2p extends P2pApi {
     } else {
       this.cacheData = {};
     }
+    this.offFileDownloadComplete && this.offFileDownloadComplete();
+    this.offP2pStreamPacketReceive && this.offP2pStreamPacketReceive();
 
     // this.offDownLoadProgressUpdate && this.offDownLoadProgressUpdate();
     // this.offTotalDownLoadProgressUpdate && this.offTotalDownLoadProgressUpdate();
@@ -363,6 +364,7 @@ export class SweeperP2p extends P2pApi {
     let {
       fileName
     } = data;
+    log4js.info(`p2pStreamPacketReceiveCallback: ${fileName},  ${fileSerialNumber}, ${packetType}`);
 
     // 因为XXXX_YYYYY会被替换为坐标值，所以这里需要替换一下
 
@@ -555,10 +557,6 @@ export class SweeperP2p extends P2pApi {
         }
       }
     });
-    // 如果是使用结构化的数据，则直接把map. 相关的文件过滤掉
-    if (this.useStructuredMode) {
-      return exitFiles.filter(item => item.indexOf('map.') === -1);
-    }
     return exitFiles;
   };
 
@@ -569,7 +567,8 @@ export class SweeperP2p extends P2pApi {
   stopObserverSweeperDataByP2P = async () => {
     try {
       this.removeP2pDownloadEvent();
-      this.cancelDownloadTask();
+      // 没有必要cancelDownloadTask，只需要调用断连
+      // this.cancelDownloadTask();
 
       // 先销毁断开监听
       typeof this.offSessionStatusChange === 'function' && this.offSessionStatusChange();

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 declare const useP2PDataStream: (devId: string, onReceiveMapData: (data: string) => void, onReceivePathData: (data: string) => void, opt?: {
     logTag?: string | undefined;
-    useStructuredMode?: boolean | undefined;
     onReceiveAIPicData?: ((data: string) => void) | undefined;
     onReceiveAIPicHDData?: ((data: string) => void) | undefined;
 } | undefined) => {

package/lib/index.js

@@ -8,7 +8,6 @@ import { getSystemInfoSync, usePageEvent } from '@ray-js/ray';
 const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   const {
     logTag,
-    useStructuredMode = false,
     onReceiveAIPicData,
     onReceiveAIPicHDData
   } = opt || {};
@@ -54,12 +53,12 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     SweeperP2pInstance.isConnecting = true;
     SweeperP2pInstance.connectDevice(() => {
       isInit.current = true;
-      SweeperP2pInstance.startObserverSweeperDataByP2P(1, useStructuredMode, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+      SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
       offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
     }, () => {
       SweeperP2pInstance.reconnectP2p(() => {
         isInit.current = true;
-        SweeperP2pInstance.startObserverSweeperDataByP2P(1, useStructuredMode, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
+        SweeperP2pInstance.startObserverSweeperDataByP2P(1, devId, onReceiveMapData, onReceivePathData, onReceiveAIPicData, onReceiveAIPicHDData);
         // 这里失败重连需要注册断开重连的事件
         offSessionStatusChange.current = SweeperP2pInstance.onSessionStatusChange(SweeperP2pInstance.sessionStatusCallback);
       });

package/package.json

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