@ray-js/robot-data-stream 0.0.10-beta-5 → 0.0.10-beta-7

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;
@@ -195,7 +194,7 @@ export class SweeperP2p extends P2pApi {
         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');
@@ -209,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');
@@ -224,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);
@@ -559,10 +557,6 @@ export class SweeperP2p extends P2pApi {
         }
       }
     });
-    // 如果是使用结构化的数据，则直接把map. 相关的文件过滤掉
-    if (this.useStructuredMode) {
-      return exitFiles.filter(item => item.indexOf('map.') === -1);
-    }
     return exitFiles;
   };
 

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

@@ -1,14 +1,13 @@
 /* eslint-disable consistent-return */
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useCallback } from 'react';
 import mitt from 'mitt';
 import log4js from '@ray-js/log4js';
 import { SweeperP2pInstance } from './api';
 import sweeperP2pInstance from './api/sweeperP2p';
-import { getSystemInfoSync, usePageEvent } from '@ray-js/ray';
+import { getSystemInfoSync } from '@ray-js/ray';
 const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   const {
     logTag,
-    useStructuredMode = false,
     onReceiveAIPicData,
     onReceiveAIPicHDData
   } = opt || {};
@@ -17,6 +16,33 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   const isAppOnBackground = useRef(false);
   const timer = useRef(null);
   const isIDE = getSystemInfoSync().brand === 'devtools';
+  const handleAppHide = useCallback(() => {
+    log4js.info('hooks onAppHide');
+    isAppOnBackground.current = true;
+    if (isInit.current) {
+      // 判断进入后台之后，维持定时器，如果进入后台超过2分钟, 则断开P2P
+      timer.current = setTimeout(() => {
+        log4js.info('background timer has been exe');
+        if (isAppOnBackground.current) {
+          unmount();
+        }
+        clearTimeout(timer.current);
+        timer.current = null;
+      }, 10 * 1000);
+    }
+  }, []);
+  const handleAppShow = useCallback(() => {
+    log4js.info('hooks onAppShow');
+    timer.current && clearTimeout(timer.current);
+    setTimeout(() => {
+      var _ty$p2p$isP2PActiveSy, _ty$p2p;
+      if (!isInit.current || !((_ty$p2p$isP2PActiveSy = (_ty$p2p = ty.p2p).isP2PActiveSync) !== null && _ty$p2p$isP2PActiveSy !== void 0 && _ty$p2p$isP2PActiveSy.call(_ty$p2p, {
+        deviceId: devId
+      }))) {
+        connectP2p();
+      }
+    }, 500);
+  }, []);
   useEffect(() => {
     if (logTag) {
       log4js.setTag(logTag);
@@ -37,13 +63,17 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     SweeperP2pInstance.initP2pSdk(devId).then(() => {
       connectP2p();
     });
-    onEnterBackground();
-    onEnterForeground();
+    ty.onAppHide(handleAppHide);
+    ty.onAppShow(handleAppShow);
   }, []);
-  usePageEvent('onUnload', () => {
+  ty.onAppClose(() => {
+    // 退出被拦截了，可以在此处理一些逻辑，如果允许退出则调用
+    // ty.exitMiniProgram 进行，否则当前小程序无法退出
     unmount();
     SweeperP2pInstance.deInitP2PSDK();
-    timer && clearInterval(timer);
+    ty.offAppHide(handleAppHide);
+    ty.offAppShow(handleAppShow);
+    ty.exitMiniProgram();
   });
 
   /**
@@ -54,39 +84,18 @@ 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);
       });
     });
   };
 
-  /**
-   * 进入后台时断开P2P连接
-   */
-  const onEnterBackground = () => {
-    ty.onAppHide(() => {
-      log4js.info('hooks onAppHide');
-      isAppOnBackground.current = true;
-      if (isInit.current) {
-        // 判断进入后台之后，维持定时器，如果进入后台超过2分钟, 则断开P2P
-        timer.current = setTimeout(() => {
-          log4js.info('background timer has been exe');
-          if (isAppOnBackground.current) {
-            unmount();
-          }
-          clearTimeout(timer.current);
-          timer.current = null;
-        }, 10 * 1000);
-      }
-    });
-  };
-
   /**
    * p2p断开
    */
@@ -99,24 +108,6 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     }
     SweeperP2pInstance.stopObserverSweeperDataByP2P();
   };
-
-  /**
-   * 进入前台时开启P2P连接
-   */
-  const onEnterForeground = () => {
-    ty.onAppShow(() => {
-      log4js.info('hooks onAppShow');
-      timer.current && clearTimeout(timer.current);
-      setTimeout(() => {
-        var _ty$p2p$isP2PActiveSy, _ty$p2p;
-        if (!isInit.current || !((_ty$p2p$isP2PActiveSy = (_ty$p2p = ty.p2p).isP2PActiveSync) !== null && _ty$p2p$isP2PActiveSy !== void 0 && _ty$p2p$isP2PActiveSy.call(_ty$p2p, {
-          deviceId: devId
-        }))) {
-          connectP2p();
-        }
-      }, 500);
-    });
-  };
   return {
     appendDownloadStreamDuringTask: sweeperP2pInstance.appendDownloadStreamDuringTask
   };

package/package.json

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