@ray-js/ray-ipc-utils 1.1.0-beta-12 → 1.1.0-beta-14

package/lib/i18n/index.d.ts

@@ -0,0 +1,30 @@
+import { kit } from '@ray-js/panel-sdk';
+declare const Strings: kit.I18N<{
+    en: {
+        ipc_utils_get_ipc_config_info_api_err: string;
+        ipc_utils_collect_name_empty: string;
+        ipc_utils_collect_name_limit_tip: string;
+        ipc_utils_collect_number_max_tip: string;
+        ipc_utils_cruise_ing_tip: string;
+    };
+    zh: {
+        ipc_utils_get_ipc_config_info_api_err: string;
+        ipc_utils_collect_name_empty: string;
+        ipc_utils_collect_name_limit_tip: string;
+        ipc_utils_collect_number_max_tip: string;
+        ipc_utils_cruise_ing_tip: string;
+    };
+}, {
+    ipc_utils_get_ipc_config_info_api_err: string;
+    ipc_utils_collect_name_empty: string;
+    ipc_utils_collect_name_limit_tip: string;
+    ipc_utils_collect_number_max_tip: string;
+    ipc_utils_cruise_ing_tip: string;
+} | {
+    ipc_utils_get_ipc_config_info_api_err: string;
+    ipc_utils_collect_name_empty: string;
+    ipc_utils_collect_name_limit_tip: string;
+    ipc_utils_collect_number_max_tip: string;
+    ipc_utils_cruise_ing_tip: string;
+}>;
+export default Strings;

package/lib/i18n/index.js

@@ -0,0 +1,7 @@
+import { kit } from '@ray-js/panel-sdk';
+import strings from './strings';
+const {
+  I18N
+} = kit;
+const Strings = new I18N(strings);
+export default Strings;

package/lib/i18n/strings.d.ts

@@ -0,0 +1,17 @@
+declare const _default: {
+    en: {
+        ipc_utils_get_ipc_config_info_api_err: string;
+        ipc_utils_collect_name_empty: string;
+        ipc_utils_collect_name_limit_tip: string;
+        ipc_utils_collect_number_max_tip: string;
+        ipc_utils_cruise_ing_tip: string;
+    };
+    zh: {
+        ipc_utils_get_ipc_config_info_api_err: string;
+        ipc_utils_collect_name_empty: string;
+        ipc_utils_collect_name_limit_tip: string;
+        ipc_utils_collect_number_max_tip: string;
+        ipc_utils_cruise_ing_tip: string;
+    };
+};
+export default _default;

package/lib/i18n/strings.js

@@ -0,0 +1,16 @@
+export default {
+  en: {
+    ipc_utils_get_ipc_config_info_api_err: 'Error in retrieving config information',
+    ipc_utils_collect_name_empty: 'Please enter a collection point name',
+    ipc_utils_collect_name_limit_tip: 'Collection point name cannot exceed 10 characters',
+    ipc_utils_collect_number_max_tip: 'You can add up to 6 collection points only',
+    ipc_utils_cruise_ing_tip: 'Cruising in progress, please stop first'
+  },
+  zh: {
+    ipc_utils_get_ipc_config_info_api_err: '配置信息获取出错',
+    ipc_utils_collect_name_empty: '请输入收藏点名称',
+    ipc_utils_collect_name_limit_tip: '收藏点名称不能超过10个字符',
+    ipc_utils_collect_number_max_tip: '最多只能添加6个收藏点',
+    ipc_utils_cruise_ing_tip: '正在巡航，请先停止巡航'
+  }
+};

package/lib/service/index.js

@@ -4,14 +4,15 @@ 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 Strings from '../i18n';
 import { JsonUtil, getInitUtmTid } from '../utils';
-import { getDevInfo, getNativeStorage, setNativeStorage, publishDps, getDpStateValue, getDpIdByCode, jumpToWebView, goToMiniProgramByShortLink, getCurrentSupportedTalkMode } from '../kit';
+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: 'tuya.m.rtc.config.get',
+  url: 'm.ipc.v4.rtc.config.get',
   version: '1.0'
 };
 // 获取 IPC 收藏点信息
@@ -111,7 +112,8 @@ export const getCameraConfigInfo = async deviceId => {
     }
     const {
       isVirtualDevice
-    } = devInfo.data;
+    } = devInfo === null || devInfo === void 0 ? void 0 : devInfo.data;
+    ipcTTTOperatorLog(`Utils: config info isVirtualDevice status: ${isVirtualDevice}`);
     // 配置默认值
     const defaultResolution = ClarityType.HD;
     const supportedResolutions = [ClarityType.HD, ClarityType.SD];
@@ -138,6 +140,7 @@ export const getCameraConfigInfo = async deviceId => {
     // native 缓存Key值
 
     const nativeStorageInfo = await Promise.all([`${deviceId}_resolution`, `${deviceId}_intercom`, `${deviceId}_microphone`, `${deviceId}_maxZoomSettings`].map(key => getNativeStorage(key)));
+    ipcTTTOperatorLog(`Utils: nativeStorageInfo: ${nativeStorageInfo}`);
     console.log(nativeStorageInfo, 'nativeStorageInfo');
     const [resolutionStorage, intercomStorage, microphoneStorage, maxZoomSettingsStorage] = nativeStorageInfo;
     // 任意缓存为空，则请求接口
@@ -149,9 +152,15 @@ export const getCameraConfigInfo = async deviceId => {
       if (!isVirtualDevice) {
         var _microphoneStorage$da, _intercomStorage$data, _resolutionStorage$da, _maxZoomSettingsStora;
         const rtcInfo = await getIpcConfigInfo(deviceId);
+        ipcTTTOperatorLog(`Utils: rtcInfo: ${rtcInfo}`);
         if (rtcInfo.code === 0) {
           var _rtcApiResult$audioAt, _rtcApiResult$audioAt2, _rtcApiResult$audioAt3;
           const rtcApiResult = rtcInfo.data;
+          const {
+            p2pType
+          } = rtcApiResult;
+          const p2p4 = p2pType >= 8;
+          ipcTTTOperatorLog(`Utils: p2p4: ${p2p4}`);
           // 1. 拾音器模块
           const isMicrophoneSupported = rtcApiResult === null || rtcApiResult === void 0 || (_rtcApiResult$audioAt = rtcApiResult.audioAttributes) === null || _rtcApiResult$audioAt === void 0 || (_rtcApiResult$audioAt = _rtcApiResult$audioAt.hardwareCapability) === null || _rtcApiResult$audioAt === void 0 ? void 0 : _rtcApiResult$audioAt.includes(1);
           // 拾音器默认声音都为关闭, 若接口返回不支持，则将缓存值设置为关闭
@@ -177,9 +186,8 @@ export const getCameraConfigInfo = async deviceId => {
           }
 
           // 3. 视频分辨率模块
-          videoResolution.defaultResolution = videoResolutionMode[rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.vedioClarity];
-          console.log(rtcApiResult, 'rtcApiResult');
-          const supportedVideoClarity = rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.vedioClaritys;
+          videoResolution.defaultResolution = p2p4 ? videoResolutionMode[rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.videoClarity] : videoResolutionMode[rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.vedioClarity];
+          const supportedVideoClarity = p2p4 ? rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.videoClaritys : rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.vedioClaritys;
           videoResolution.availableResolutions = supportedVideoClarity.map(mode => videoResolutionMode[mode]);
 
           // 4. 最大倍数模块
@@ -226,6 +234,7 @@ export const getCameraConfigInfo = async deviceId => {
       microphoneSettings = microphoneStorage === null || microphoneStorage === void 0 || (_microphoneStorage$da2 = microphoneStorage.data) === null || _microphoneStorage$da2 === void 0 ? void 0 : _microphoneStorage$da2.data;
       maxZoomSettings = maxZoomSettingsStorage === null || maxZoomSettingsStorage === void 0 || (_maxZoomSettingsStora2 = maxZoomSettingsStorage.data) === null || _maxZoomSettingsStora2 === void 0 ? void 0 : _maxZoomSettingsStora2.data;
     }
+    console.log(videoResolution, intercomInfo, microphoneSettings, maxZoomSettings, '_____');
     const ipcConfig = {
       videoResolution,
       intercomInfo,
@@ -238,10 +247,11 @@ export const getCameraConfigInfo = async deviceId => {
     });
   } catch (err) {
     console.log(err, 'err');
-    ty.showToast({
-      title: I18n.t('get_ipc_config_info_api_err'),
-      icon: 'error'
-    });
+    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)
@@ -279,21 +289,21 @@ export const updateCollectionPointsInfo = (deviceId, id, name) => {
   if (_trim(name) === '') {
     ty.showToast({
       icon: 'error',
-      title: '请输入收藏点名称'
+      title: Strings.getLang('ipc_utils_collect_name_empty')
     });
     return Promise.resolve({
       code: -1,
-      msg: '请输入收藏点名称'
+      msg: Strings.getLang('ipc_utils_collect_name_empty')
     });
   }
   if (_trim(name).length > 10) {
     ty.showToast({
       icon: 'error',
-      title: '收藏点名称不能超过10个字符'
+      title: Strings.getLang('ipc_utils_collect_name_limit_tip')
     });
     return Promise.resolve({
       code: -1,
-      msg: '收藏点名称不能超过10个字符'
+      msg: Strings.getLang('ipc_utils_collect_name_limit_tip')
     });
   }
   return api(url, {
@@ -322,11 +332,11 @@ export const delCollectionPointsInfo = async (deviceId, pointData) => {
   }
   if (cruiseSwitchInfo.data) {
     ty.showToast({
-      title: '正在巡航，请先停止巡航'
+      title: Strings.getLang('ipc_utils_cruise_ing_tip')
     });
     return {
       code: -1,
-      msg: '正在巡航，请先停止巡航'
+      msg: Strings.getLang('ipc_utils_cruise_ing_tip')
     };
   }
   // 2. 下发DP删除收藏点 dpCode: memory_point_set
@@ -371,11 +381,11 @@ export const addCollectionPointsInfo = async (deviceId, name) => {
   if (pointsInfo.data.length >= 6) {
     ty.showToast({
       icon: 'error',
-      title: '最多只能添加6个收藏点'
+      title: Strings.getLang('ipc_utils_collect_number_max_tip')
     });
     return {
       code: -1,
-      msg: '最多只能添加6个收藏点'
+      msg: Strings.getLang('ipc_utils_collect_number_max_tip')
     };
   }
   const cruiseSwitchInfo = await getDpStateValue(deviceId, 'cruise_switch');
@@ -392,11 +402,11 @@ export const addCollectionPointsInfo = async (deviceId, name) => {
   if (cruiseSwitchInfo.data) {
     ty.showToast({
       icon: 'error',
-      title: '正在巡航，请先停止巡航'
+      title: Strings.getLang('ipc_utils_cruise_ing_tip')
     });
     return {
       code: -1,
-      msg: '正在巡航，请先停止巡航'
+      msg: Strings.getLang('ipc_utils_cruise_ing_tip')
     };
   }
   // 2. 下发DP删除收藏点 dpCode: memory_point_set
@@ -414,21 +424,21 @@ export const addCollectionPointsInfo = async (deviceId, name) => {
   if (_trim(name) === '') {
     ty.showToast({
       icon: 'error',
-      title: '请输入收藏点名称'
+      title: Strings.getLang('ipc_utils_collect_name_empty')
     });
     return {
       code: -1,
-      msg: '请输入收藏点名称'
+      msg: Strings.getLang('ipc_utils_collect_name_empty')
     };
   }
   if (_trim(name).length > 10) {
     ty.showToast({
       icon: 'error',
-      title: '收藏点名称不能超过10个字符'
+      title: Strings.getLang('ipc_utils_collect_name_limit_tip')
     });
     return {
       code: -1,
-      msg: '收藏点名称不能超过10个字符'
+      msg: Strings.getLang('ipc_utils_collect_name_limit_tip')
     };
   }
   const publishResult = await publishDps(deviceId, {
@@ -466,6 +476,7 @@ export const getServiceUrl = async function (deviceId, serveType) {
   let action = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   let utm_rtid = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : getInitUtmTid();
   try {
+    var _result$data, _result$data3;
     const {
       homeId
     } = await ty.home.getCurrentHomeInfo();
@@ -507,13 +518,14 @@ export const getServiceUrl = async function (deviceId, serveType) {
     if (!action) {
       return result;
     }
-    if ((result === null || result === void 0 ? void 0 : result.data.type) === 2) {
+    if ((result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.type) === 2) {
+      var _result$data2;
       // 跳转小程序
-      const minResult = await goToMiniProgramByShortLink(result === null || result === void 0 ? void 0 : result.data.url);
+      const minResult = await goToMiniProgramByShortLink(result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.url);
       return minResult;
     }
     // 跳转H5
-    const webResult = await jumpToWebView(result === null || result === void 0 ? void 0 : result.data.url);
+    const webResult = await jumpToWebView(result === null || result === void 0 || (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : _result$data3.url);
     return webResult;
   } catch (err) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-utils",
-  "version": "1.1.0-beta-12",
+  "version": "1.1.0-beta-14",
   "description": "IPC 工具库",
   "main": "lib/index",
   "files": [
@@ -35,13 +35,13 @@
     "@ray-js/ray": "^1.4.9"
   },
   "dependencies": {
-    "clsx": "^1.2.1"
+    "clsx": "^1.2.1",
+    "@ray-js/panel-sdk": "^1.13.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
     "@ray-js/cli": "^1.4.9",
-    "@ray-js/panel-sdk": "^1.13.0-storage.7",
     "@ray-js/ray": "^1.4.9",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/jest": "^29.5.14",