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

package/lib/api/sweeperP2p.d.ts

@@ -181,7 +181,7 @@ export declare class SweeperP2p extends P2pApi {
     /**
      * 停止文件下载
      */
-    stopObserverSweeperDataByP2P: () => Promise<false | undefined>;
+    stopObserverSweeperDataByP2P: () => false | undefined;
 }
 declare const sweeperP2pInstance: SweeperP2p;
 export default sweeperP2pInstance;

package/lib/api/sweeperP2p.js

@@ -630,8 +630,17 @@ export class SweeperP2p extends P2pApi {
    * 停止文件下载
    */
   // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, consistent-return
-  stopObserverSweeperDataByP2P = async () => {
+  stopObserverSweeperDataByP2P = () => {
     try {
+      logger('info', {
+        msg: `isConnected: ${this.isConnected}, devId: ${this.devId}`
+      }, this.onLogger);
+      if (this.isConnected) {
+        logger('info', {
+          msg: `try disconnect device, devId: ${this.devId}`
+        }, this.onLogger);
+        this.disconnectDevice();
+      }
       this.removeP2pDownloadEvent();
       // 没有必要cancelDownloadTask，只需要调用断连
       // this.cancelDownloadTask();
@@ -639,10 +648,6 @@ export class SweeperP2p extends P2pApi {
       // 先销毁断开监听
       typeof this.offSessionStatusChange === 'function' && this.offSessionStatusChange();
       // 销毁初始化时,先进行断连操作
-
-      if (this.isConnected) {
-        this.disconnectDevice();
-      }
     } catch (e) {
       logger('error', {
         msg: 'stopObserverSweeperDataByP2P occur error ==>',

package/lib/index.js

@@ -96,10 +96,9 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   }, []);
   usePageEvent('onUnload', () => {
     unmount();
-    SweeperP2pInstance.deInitP2PSDK();
     ty.offAppHide(handleAppHide);
     ty.offAppShow(handleAppShow);
-    ty.exitMiniProgram();
+    SweeperP2pInstance.deInitP2PSDK();
   });
 
   /**
@@ -139,16 +138,16 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
   /**
    * p2p断开
    */
-  const unmount = async () => {
+  const unmount = () => {
     logger('info', {
       msg: 'hooks has been started unmount'
     }, onLogger);
     isInit.current = false;
+    SweeperP2pInstance.stopObserverSweeperDataByP2P();
     if (offSessionStatusChange.current) {
       offSessionStatusChange.current();
       offSessionStatusChange.current = null;
     }
-    SweeperP2pInstance.stopObserverSweeperDataByP2P();
   };
   return {
     appendDownloadStreamDuringTask: SweeperP2pInstance.appendDownloadStreamDuringTask

package/lib/utils/index.js

@@ -1,5 +1,3 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-const _excluded = ["msg"];
 import mitt from 'mitt';
 import { floor, join, map } from 'lodash-es';
 import log4js from '@ray-js/log4js';
@@ -50,10 +48,9 @@ export const parseJSON = str => {
 };
 export const logger = (type, params, onLogger) => {
   const {
-      msg
-    } = params,
-    others = _objectWithoutProperties(params, _excluded);
-  log4js[type](msg, others);
+    msg
+  } = params;
+  log4js[type](msg);
   if (onLogger) {
     onLogger(type, msg);
   }

package/package.json

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