@ray-js/ray-ipc-utils 1.1.0 → 1.1.2-beta-1

package/lib/interface.js

@@ -1,13 +1,19 @@
 export let ClarityType = /*#__PURE__*/function (ClarityType) {
   ClarityType["SS"] = "SS";
+  // 省流量
   ClarityType["SD"] = "SD";
+  // 标清
   ClarityType["HD"] = "HD";
+  // 高清
   ClarityType["UD"] = "UD";
+  // 超清
   ClarityType["SSP"] = "SSP";
+  // 超超清
   ClarityType["AUTO"] = "AUTO";
-  ClarityType["AUDIO"] = "AUDIO";
+  // 自动
+  ClarityType["AUDIO"] = "AUDIO"; // 音频模式
   return ClarityType;
-}({}); // 音频模式
+}({});
 export let IntercomMode = /*#__PURE__*/function (IntercomMode) {
   IntercomMode["OneWay"] = "OneWay";
   IntercomMode["TwoWay"] = "TwoWay";

package/lib/kit/ipc/index.js

@@ -1,6 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+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';
 // IPC Kit相关
 /**
  *
@@ -546,22 +548,36 @@ export const getCurrentSupportedTalkMode = function (deviceId) {
   let extendParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return new Promise(resolve => {
     try {
-      ty.ipc.getCurrentSupportedTalkMode({
-        deviceId,
-        extendParam: extendParam,
-        success: res => {
-          resolve({
-            code: 0,
-            data: res
-          });
-        },
-        fail: err => {
-          resolve({
-            code: -1,
-            msg: err
-          });
-        }
-      });
+      const systemInfo = getSystemInfoSync();
+      const {
+        platform
+      } = systemInfo;
+      if (platform === 'harmony') {
+        // 针对harmonyOS平台，暂默认返回支持双向对讲模式
+        resolve({
+          code: 0,
+          data: {
+            talkbackMode: 2
+          }
+        });
+      } else {
+        ty.ipc.getCurrentSupportedTalkMode({
+          deviceId,
+          extendParam: extendParam,
+          success: res => {
+            resolve({
+              code: 0,
+              data: res
+            });
+          },
+          fail: err => {
+            resolve({
+              code: -1,
+              msg: err
+            });
+          }
+        });
+      }
     } catch (err) {
       resolve({
         code: -1,

package/lib/service/index.d.ts

@@ -1,5 +1,11 @@
 import { ServeTpe } from '../interface';
 import { IRes } from '@/kit/interface';
+/**
+ * 获取IPC设备配置信息
+ * @param deviceId 设备ID
+ *
+ */
+export declare const getIpcConfigInfo: <T>(deviceId: string) => Promise<IRes<T>>;
 /**
  * 获取IPC设备配置及缓存信息、
  * 包含: 视频清晰度、对讲方式、拾音器、视频缩放最大倍数

package/lib/service/index.js

@@ -4,33 +4,13 @@ import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/esnext.iterator.some.js";
 /* eslint-disable camelcase */
 import _trim from 'lodash/trim';
+import { getIpcRtcConfig, getIpcPointList, updateIpcPointInfo, getVasUrlInfo } from '@ray-js/ray';
 import Strings from '../i18n';
 import { JsonUtil, getInitUtmTid } from '../utils';
 import { getDevInfo, getNativeStorage, setNativeStorage, publishDps, getDpStateValue, getDpIdByCode, jumpToWebView, goToMiniProgramByShortLink, getCurrentSupportedTalkMode, ipcTTTOperatorLog } from '../kit';
 import { ClarityType, IntercomMode, MuteMode, ServeTpe } from '../interface';
 const errStyle = 'background: red; color: #fff;';
 
-// 获取 IPC 配置信息
-const get_ipc_config_info_api = {
-  url: 'm.ipc.v4.rtc.config.get',
-  version: '1.0'
-};
-// 获取 IPC 收藏点信息
-const get_ipc_collect_info_api = {
-  url: 'tuya.m.ipc.memory.point.list',
-  version: '2.0'
-};
-// 更新 IPC 单个收藏点信息
-const update_ipc_collect_info_api = {
-  url: 'tuya.m.ipc.memory.point.rename',
-  version: '1.0'
-};
-// 获取 IPC 增值服务平台配置地址
-const get_ipc_cvas_url_api = {
-  url: 'm.ecm.cvas.basic.url.config.get',
-  version: '1.0'
-};
-
 /**
  * @description: 对讲模式
  */
@@ -84,19 +64,36 @@ const api = function (a, postData) {
   });
 };
 
+/**
+ * @description: 通用 IPC 标准能力接口基础封装
+ */
+
+const wrapIpcApiCall = async (apiFunc, params) => {
+  try {
+    const res = await apiFunc(params);
+    return {
+      code: 0,
+      data: res
+    };
+  } catch (err) {
+    const e = typeof err === 'string' ? JsonUtil.parseJSON(err) : err;
+    return {
+      code: -1,
+      msg: (e === null || e === void 0 ? void 0 : e.message) || (e === null || e === void 0 ? void 0 : e.errorMsg) || String(e)
+    };
+  }
+};
+
 /**
  * 获取IPC设备配置信息
  * @param deviceId 设备ID
  *
  */
-const getIpcConfigInfo = deviceId => {
-  const {
-    url,
-    version
-  } = get_ipc_config_info_api;
-  return api(url, {
+
+export const getIpcConfigInfo = async deviceId => {
+  return wrapIpcApiCall(getIpcRtcConfig, {
     devId: deviceId
-  }, version);
+  });
 };
 
 /**
@@ -175,15 +172,16 @@ export const getCameraConfigInfo = async deviceId => {
           // 获取支持的对讲方式
           const supportedIntercomModes = rtcApiResult === null || rtcApiResult === void 0 || (_rtcApiResult$audioAt3 = rtcApiResult.audioAttributes) === null || _rtcApiResult$audioAt3 === void 0 ? void 0 : _rtcApiResult$audioAt3.callMode;
           if (isIntercomSupported && supportedIntercomModes.length > 0) {
-            var _appIntercomCached$da;
             intercomInfo.defaultIntercomMode = intercomCallMode[supportedIntercomModes[0]];
             intercomInfo.supportedIntercomModes = supportedIntercomModes.map(mode => intercomCallMode[mode]);
             // 获取APP当前存储的对讲模式, 因目前设置页对讲设置使用的还是原生页面，需要读取APP缓存保持一致
             const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
             if (appIntercomCached.code !== 0) {
-              throw appIntercomCached.msg;
+              intercomInfo.cachedIntercomMode = intercomCallMode[supportedIntercomModes[0]];
+            } else {
+              var _appIntercomCached$da;
+              intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da = appIntercomCached.data) === null || _appIntercomCached$da === void 0 ? void 0 : _appIntercomCached$da.talkbackMode];
             }
-            intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da = appIntercomCached.data) === null || _appIntercomCached$da === void 0 ? void 0 : _appIntercomCached$da.talkbackMode];
           }
 
           // 3. 视频分辨率模块
@@ -219,15 +217,17 @@ export const getCameraConfigInfo = async deviceId => {
         }
       }
     } else {
-      var _intercomStorage$data2, _appIntercomCached$da2, _resolutionStorage$da2, _microphoneStorage$da2, _maxZoomSettingsStora2;
+      var _intercomStorage$data2, _resolutionStorage$da2, _microphoneStorage$da2, _maxZoomSettingsStora2;
       // 对于对讲缓存的方式每次需从APP获取更新
       const intercomStorageData = intercomStorage === null || intercomStorage === void 0 || (_intercomStorage$data2 = intercomStorage.data) === null || _intercomStorage$data2 === void 0 ? void 0 : _intercomStorage$data2.data;
       intercomInfo = intercomStorageData;
       const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
       if (appIntercomCached.code !== 0) {
-        throw appIntercomCached.msg;
+        intercomInfo.cachedIntercomMode = intercomCallMode[supportedIntercomModes[0]];
+      } else {
+        var _appIntercomCached$da2;
+        intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da2 = appIntercomCached.data) === null || _appIntercomCached$da2 === void 0 ? void 0 : _appIntercomCached$da2.talkbackMode];
       }
-      intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da2 = appIntercomCached.data) === null || _appIntercomCached$da2 === void 0 ? void 0 : _appIntercomCached$da2.talkbackMode];
       if (intercomStorageData.cachedIntercomMode !== intercomInfo.cachedIntercomMode) {
         setNativeStorage(`${deviceId}_intercom`, intercomInfo);
       }
@@ -249,10 +249,6 @@ export const getCameraConfigInfo = async deviceId => {
   } catch (err) {
     console.log(err, 'err');
     ipcTTTOperatorLog(`UTILS: getCameraConfigInfo_error_info: ${JSON.stringify(err)}`);
-    // ty.showToast({
-    //   title: Strings.getLang('ipc_utils_get_ipc_config_info_api_err'),
-    //   icon: 'error',
-    // });
     return Promise.resolve({
       code: -1,
       msg: err.errorMsg ? err.errorMsg : String(err)
@@ -265,14 +261,10 @@ export const getCameraConfigInfo = async deviceId => {
  * @param {string} deviceId 设备id
  */
 
-export const getCollectionPointsInfo = deviceId => {
-  const {
-    url,
-    version
-  } = get_ipc_collect_info_api;
-  return api(url, {
+export const getCollectionPointsInfo = async deviceId => {
+  return wrapIpcApiCall(getIpcPointList, {
     devId: deviceId
-  }, version);
+  });
 };
 
 /**
@@ -282,11 +274,7 @@ export const getCollectionPointsInfo = deviceId => {
  * @param {string} name 收藏点名称
  */
 
-export const updateCollectionPointsInfo = (deviceId, id, name) => {
-  const {
-    url,
-    version
-  } = update_ipc_collect_info_api;
+export const updateCollectionPointsInfo = async (deviceId, id, name) => {
   if (_trim(name) === '') {
     ty.showToast({
       icon: 'error',
@@ -307,11 +295,11 @@ export const updateCollectionPointsInfo = (deviceId, id, name) => {
       msg: Strings.getLang('ipc_utils_collect_name_limit_tip')
     });
   }
-  return api(url, {
+  return wrapIpcApiCall(updateIpcPointInfo, {
     devId: deviceId,
     id,
     name
-  }, version);
+  });
 };
 
 /**
@@ -499,7 +487,7 @@ export const getServiceUrl = async function (deviceId, serveType) {
       isSupportMini: true,
       homeId,
       param: frontParams,
-      categoryCode: serveType || ServeTpe.securityCloudService,
+      categoryCode: serveType || ServeTpe.securityCloudService || '',
       deviceId,
       utmRtid: utm_rtid
     };
@@ -508,11 +496,7 @@ export const getServiceUrl = async function (deviceId, serveType) {
       params.categoryCode = '';
       params.path = 'pages/aiInspection/reportDetails/index';
     }
-    const {
-      url,
-      version
-    } = get_ipc_cvas_url_api;
-    const result = await api(url, params, version);
+    const result = await wrapIpcApiCall(getVasUrlInfo, params);
     if ((result === null || result === void 0 ? void 0 : result.code) === -1) {
       return result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-utils",
-  "version": "1.1.0",
+  "version": "1.1.2-beta-1",
   "description": "IPC 工具库",
   "main": "lib/index",
   "files": [
@@ -32,22 +32,23 @@
     "test": "yarn jest"
   },
   "peerDependencies": {
-    "@ray-js/ray": "^1.4.9"
+    "@ray-js/ray": "^1.7.13"
   },
   "dependencies": {
-    "clsx": "^1.2.1",
-    "@ray-js/panel-sdk": "^1.13.1"
+    "@ray-js/panel-sdk": "^1.13.1",
+    "clsx": "^1.2.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
-    "@ray-js/cli": "^1.4.9",
-    "@ray-js/ray": "^1.4.9",
+    "@ray-js/cli": "^1.7.13",
+    "@ray-js/ray": "^1.7.13",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/jest": "^29.5.14",
     "core-js": "^3.19.1",
     "eslint-config-tuya-panel": "^0.4.2",
     "husky": "^1.2.0",
+    "less-loader": "^12.3.0",
     "lint-staged": "^10.2.11",
     "standard-version": "9.3.2"
   },