@ray-js/ray-ipc-utils 1.1.9 → 1.1.11

package/lib/kit/ipc/index.d.ts

@@ -159,3 +159,12 @@ export declare const goToIpcSettingMini: <T>(deviceId: string, options?: {
 export declare const goToIpcServiceHallMini: <T>(options?: {
     position?: 'right' | 'bottom';
 }) => Promise<IRes<T>>;
+/**
+ * 跳转 回放聚合页
+ * @param {string} deviceId - 设备ID
+ * @param {string} sdCardState - SD卡状态是否正常
+ * @param {Object} options - 可选配置项
+ */
+export declare const goToIpcPlayBackHubNativePage: <T>(deviceId: string, sdCardState?: boolean, theme?: 'dark' | 'light', extraParams?: {
+    [key: string]: any;
+} | undefined) => Promise<IRes<T>>;

package/lib/kit/ipc/index.js

@@ -3,6 +3,7 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.map.js";
 import _find from 'lodash/find';
 import { getSystemInfoSync } from '@ray-js/ray';
+import { getServiceIsOpen } from '../../service';
 // IPC Kit相关
 /**
  *
@@ -881,4 +882,33 @@ export const goToIpcServiceHallMini = async function () {
       msg: String(err)
     };
   }
+};
+
+/**
+ * 跳转 回放聚合页
+ * @param {string} deviceId - 设备ID
+ * @param {string} sdCardState - SD卡状态是否正常
+ * @param {Object} options - 可选配置项
+ */
+
+export const goToIpcPlayBackHubNativePage = async function (deviceId, sdCardState) {
+  let theme = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+  let extraParams = arguments.length > 3 ? arguments[3] : undefined;
+  try {
+    let result = null;
+    const serviceData = await getServiceIsOpen(deviceId, 'security_cloud_service');
+    if (serviceData.code === 0 && serviceData.data) {
+      result = await goToIpcPageNativeRoute('camera_cloud_panel', deviceId, theme, extraParams);
+    } else if (serviceData.code === 0 && !serviceData.data && sdCardState) {
+      result = await goToIpcPageNativeRoute('camera_playback_panel', deviceId, theme, extraParams);
+    } else {
+      result = await goToIpcPageNativeRoute('camera_cloud_panel', deviceId, theme, extraParams);
+    }
+    return result;
+  } catch (err) {
+    return {
+      code: -1,
+      msg: String(err)
+    };
+  }
 };

package/lib/service/index.js

@@ -339,15 +339,6 @@ export const updateCollectionPointsInfo = async (deviceId, id, name) => {
 export const delCollectionPointsInfo = async (deviceId, pointData) => {
   // 1. 先获取巡航状态，如果正在巡航，提示停止巡航
   const cruiseSwitchInfo = await getDpStateValue(deviceId, 'cruise_switch');
-  if ((cruiseSwitchInfo === null || cruiseSwitchInfo === void 0 ? void 0 : cruiseSwitchInfo.code) === -1) {
-    ty.showToast({
-      title: cruiseSwitchInfo.msg
-    });
-    return {
-      code: -1,
-      msg: cruiseSwitchInfo.msg
-    };
-  }
   if (cruiseSwitchInfo.data) {
     ty.showToast({
       title: Strings.getLang('ipc_utils_cruise_ing_tip')
@@ -359,13 +350,13 @@ export const delCollectionPointsInfo = async (deviceId, pointData) => {
   }
   // 2. 下发DP删除收藏点 dpCode: memory_point_set
   const memoryPointSetDpId = await getDpIdByCode(deviceId, 'memory_point_set');
-  if ((cruiseSwitchInfo === null || cruiseSwitchInfo === void 0 ? void 0 : cruiseSwitchInfo.code) === -1) {
+  if (cruiseSwitchInfo.data) {
     ty.showToast({
-      title: cruiseSwitchInfo.msg
+      title: Strings.getLang('ipc_utils_cruise_ing_tip')
     });
     return {
       code: -1,
-      msg: cruiseSwitchInfo.msg
+      msg: Strings.getLang('ipc_utils_cruise_ing_tip')
     };
   }
   const publishResult = publishDps(deviceId, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-utils",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "IPC 工具库",
   "main": "lib/index",
   "files": [