@ray-js/ray-ipc-utils 1.1.3 → 1.1.5

package/lib/service/index.d.ts

@@ -11,7 +11,7 @@ export declare const getIpcConfigInfo: <T>(deviceId: string) => Promise<IRes<T>>
  * 包含: 视频清晰度、对讲方式、拾音器、视频缩放最大倍数
  * @param {string} deviceId 设备id
  */
-export declare const getCameraConfigInfo: <T>(deviceId: string) => Promise<IRes<T>>;
+export declare const getCameraConfigInfo: <T>(deviceId: string, type?: 'mini' | 'native') => Promise<IRes<T>>;
 /**
  * 获取IPC设备配置收藏点信息列表
  * @param {string} deviceId 设备id

package/lib/service/index.js

@@ -102,7 +102,8 @@ export const getIpcConfigInfo = async deviceId => {
  * @param {string} deviceId 设备id
  */
 // eslint-disable-next-line consistent-return
-export const getCameraConfigInfo = async deviceId => {
+export const getCameraConfigInfo = async function (deviceId) {
+  let type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'native';
   try {
     const devInfo = await getDevInfo(deviceId);
     if (devInfo.code !== 0) {
@@ -139,13 +140,15 @@ export const getCameraConfigInfo = async deviceId => {
 
     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;
     // 任意缓存为空，则请求接口
-    if (nativeStorageInfo.some(item => {
+
+    console.log(nativeStorageInfo, 'nativeStorageInfo');
+    const noCache = nativeStorageInfo.some(item => {
       var _item$data;
       return !(item !== null && item !== void 0 && (_item$data = item.data) !== null && _item$data !== void 0 && _item$data.data);
-    })) {
+    });
+    if (noCache) {
       // 非虚拟机设备，请求接口
       if (!isVirtualDevice) {
         var _microphoneStorage$da, _intercomStorage$data, _resolutionStorage$da, _maxZoomSettingsStora;
@@ -175,12 +178,18 @@ export const getCameraConfigInfo = async deviceId => {
             intercomInfo.defaultIntercomMode = intercomCallMode[supportedIntercomModes[0]];
             intercomInfo.supportedIntercomModes = supportedIntercomModes.map(mode => intercomCallMode[mode]);
             // 获取APP当前存储的对讲模式, 因目前设置页对讲设置使用的还是原生页面，需要读取APP缓存保持一致
-            const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
-            if (appIntercomCached.code !== 0) {
-              intercomInfo.cachedIntercomMode = intercomCallMode[supportedIntercomModes[0]];
+
+            if (type === 'native') {
+              const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
+              if (appIntercomCached.code !== 0) {
+                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];
+              }
             } 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];
+              // 针对mini程序，直接使用接口返回的第一项数据
+              intercomInfo.cachedIntercomMode = intercomCallMode[supportedIntercomModes[0]];
             }
           }
 
@@ -192,6 +201,7 @@ export const getCameraConfigInfo = async deviceId => {
           // 4. 最大倍数模块
           maxZoomSettings = (rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes) !== 0 ? rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes : 6;
         }
+
         // 由于utils为统一返回，多加了一层data，所以需要取data.data
         // 1. 设置拾音器缓存
         const microphoneStorageData = microphoneStorage === null || microphoneStorage === void 0 || (_microphoneStorage$da = microphoneStorage.data) === null || _microphoneStorage$da === void 0 ? void 0 : _microphoneStorage$da.data;
@@ -215,27 +225,43 @@ export const getCameraConfigInfo = async deviceId => {
         if (!maxZoomSettingsStorageData) {
           setNativeStorage(`${deviceId}_maxZoomSettings`, maxZoomSettings);
         }
+      } else {
+        // 针对虚拟设备未有数据时设置缓存
+        setNativeStorage(`${deviceId}_microphone`, microphoneSettings);
+        if (type === 'native') {
+          const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
+          // 如果接口返回成功，则取接口返回值
+          if (appIntercomCached.code === 0) {
+            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];
+          }
+        }
+        setNativeStorage(`${deviceId}_intercom`, intercomInfo);
+        setNativeStorage(`${deviceId}_resolution`, videoResolution);
+        setNativeStorage(`${deviceId}_maxZoomSettings`, maxZoomSettings);
       }
     } else {
       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) {
-        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];
-      }
-      if (intercomStorageData.cachedIntercomMode !== intercomInfo.cachedIntercomMode) {
-        setNativeStorage(`${deviceId}_intercom`, intercomInfo);
+      if (type === 'native') {
+        const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
+        if (appIntercomCached.code !== 0) {
+          intercomInfo.cachedIntercomMode = intercomCallMode[supportedIntercomModes[0]];
+        } else {
+          var _appIntercomCached$da3;
+          intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da3 = appIntercomCached.data) === null || _appIntercomCached$da3 === void 0 ? void 0 : _appIntercomCached$da3.talkbackMode];
+        }
+        if (intercomStorageData.cachedIntercomMode !== intercomInfo.cachedIntercomMode) {
+          setNativeStorage(`${deviceId}_intercom`, intercomInfo);
+        }
       }
       videoResolution = resolutionStorage === null || resolutionStorage === void 0 || (_resolutionStorage$da2 = resolutionStorage.data) === null || _resolutionStorage$da2 === void 0 ? void 0 : _resolutionStorage$da2.data;
       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,
@@ -378,16 +404,6 @@ export const addCollectionPointsInfo = async (deviceId, name) => {
     };
   }
   const cruiseSwitchInfo = await getDpStateValue(deviceId, 'cruise_switch');
-  if ((cruiseSwitchInfo === null || cruiseSwitchInfo === void 0 ? void 0 : cruiseSwitchInfo.code) === -1) {
-    ty.showToast({
-      icon: 'error',
-      title: cruiseSwitchInfo.msg
-    });
-    return {
-      code: -1,
-      msg: cruiseSwitchInfo.msg
-    };
-  }
   if (cruiseSwitchInfo.data) {
     ty.showToast({
       icon: 'error',
@@ -398,7 +414,7 @@ export const addCollectionPointsInfo = async (deviceId, name) => {
       msg: Strings.getLang('ipc_utils_cruise_ing_tip')
     };
   }
-  // 2. 下发DP删除收藏点 dpCode: memory_point_set
+  // 2. 获取收藏点 dpCode: memory_point_set
   const memoryPointSetDpId = await getDpIdByCode(deviceId, 'memory_point_set');
   if ((cruiseSwitchInfo === null || cruiseSwitchInfo === void 0 ? void 0 : cruiseSwitchInfo.code) === -1) {
     ty.showToast({

package/package.json

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