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

package/lib/api/sweeperP2p.js

@@ -3,7 +3,7 @@ import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 /* eslint-disable no-shadow */
 import Base64 from 'base64-js';
-import { join, map, padStart } from 'lodash-es';
+import { join, map, padStart, once } from 'lodash-es';
 import { trace } from '../trace';
 import { logger } from '../utils';
 import P2pApi from './p2pApi';

package/lib/index.js

@@ -29,7 +29,7 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
       // 判断进入后台之后，维持定时器，如果进入后台超过2分钟, 则断开P2P
       timer.current = setTimeout(() => {
         logger('info', {
-          msg: 'background timer has been exe'
+          msg: `background timer has been exe,isAppOnBackground: ${isAppOnBackground.current}`
         }, onLogger);
         if (isAppOnBackground.current) {
           unmount();
@@ -45,8 +45,13 @@ const useP2PDataStream = (devId, onReceiveMapData, onReceivePathData, opt) => {
     }, onLogger);
     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, {
+      var _ty$p2p$isP2PActiveSy, _ty$p2p, _ty$p2p$isP2PActiveSy2, _ty$p2p2;
+      logger('info', {
+        msg: `hooks onAppShow and after 500ms : ${isInit.current} isP2PActiveSync: ${(_ty$p2p$isP2PActiveSy = (_ty$p2p = ty.p2p).isP2PActiveSync) === null || _ty$p2p$isP2PActiveSy === void 0 ? void 0 : _ty$p2p$isP2PActiveSy.call(_ty$p2p, {
+          deviceId: devId
+        })}`
+      }, onLogger);
+      if (!isInit.current || !((_ty$p2p$isP2PActiveSy2 = (_ty$p2p2 = ty.p2p).isP2PActiveSync) !== null && _ty$p2p$isP2PActiveSy2 !== void 0 && _ty$p2p$isP2PActiveSy2.call(_ty$p2p2, {
         deviceId: devId
       }))) {
         connectP2p();

package/lib/mqtt/usePartDivision.js

@@ -32,17 +32,21 @@ export const usePartDivision = devId => {
   return {
     setPartDivision: (points, roomId, origin) => {
       if (useMqtt) {
-        const pointStr = pointsToString(points, origin);
-        const params = createSetCommonParams({
-          deviceId: devId,
-          reqType: PartDivisionEnum.set,
-          message: {
-            lines: [pointStr],
-            ids: [roomId]
-          }
-        });
-        ty.device.sendMqttMessage(params);
-        return normalResolve(PartDivisionEnum.query, params.message.taskId);
+        try {
+          const pointStr = pointsToString(points, origin);
+          const params = createSetCommonParams({
+            deviceId: devId,
+            reqType: PartDivisionEnum.set,
+            message: {
+              lines: [pointStr],
+              ids: [roomId]
+            }
+          });
+          ty.device.sendMqttMessage(params);
+          return normalResolve(PartDivisionEnum.query, params.message.taskId);
+        } catch (e) {
+          throw new Error('房间分隔失败');
+        }
       }
       const command = encodePartitionDivision0x1c({
         version: commandVersion,

package/lib/utils/index.js

@@ -7,15 +7,20 @@ const pointToString = point => {
 };
 export const pointsToString = (points, origin) => {
   let newPoints = [];
-  const ox = origin.x;
-  const oy = origin.y;
-  newPoints = map(points, i => {
-    return {
-      x: floor(i.x - ox, 0),
-      y: floor(-(i.y - oy), 0)
-    };
-  });
-  return join(map(newPoints, pointToString), ',');
+  try {
+    const ox = origin.x;
+    const oy = origin.y;
+    newPoints = map(points, i => {
+      return {
+        x: floor(i.x - ox, 0),
+        y: floor(-(i.y - oy), 0)
+      };
+    });
+    return join(map(newPoints, pointToString), ',');
+  } catch (e) {
+    console.error('pointsToString error', e);
+    throw new Error('pointsToString error');
+  }
 };
 export const isJSONString = str => {
   if (typeof str !== 'string') {

package/package.json

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