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

package/lib/kit/ipc/index.js

@@ -80,12 +80,14 @@ export const setNativeStorage = (key, data) => {
         key,
         data,
         success: res => {
+          console.log(res, '______');
           resolve({
             code: 0,
             data: res
           });
         },
         fail: err => {
+          console.log(err, '___________');
           resolve({
             code: -1,
             msg: err

package/lib/service/index.js

@@ -147,6 +147,7 @@ export const getCameraConfigInfo = async deviceId => {
     })) {
       // 非虚拟机设备，请求接口
       if (!isVirtualDevice) {
+        var _microphoneStorage$da, _intercomStorage$data, _resolutionStorage$da, _maxZoomSettingsStora;
         const rtcInfo = await getIpcConfigInfo(deviceId);
         if (rtcInfo.code === 0) {
           var _rtcApiResult$audioAt, _rtcApiResult$audioAt2, _rtcApiResult$audioAt3;
@@ -184,41 +185,46 @@ 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. 设置拾音器缓存
-        if (!microphoneStorage.data) {
+        const microphoneStorageData = microphoneStorage === null || microphoneStorage === void 0 || (_microphoneStorage$da = microphoneStorage.data) === null || _microphoneStorage$da === void 0 ? void 0 : _microphoneStorage$da.data;
+        if (!microphoneStorageData) {
           setNativeStorage(`${deviceId}_microphone`, microphoneSettings);
         }
         // 2. 设置对讲缓存
-        if (!intercomStorage.data) {
+        const intercomStorageData = intercomStorage === null || intercomStorage === void 0 || (_intercomStorage$data = intercomStorage.data) === null || _intercomStorage$data === void 0 ? void 0 : _intercomStorage$data.data;
+        if (!intercomStorageData) {
           setNativeStorage(`${deviceId}_intercom`, intercomInfo);
         }
 
         // 3. 设置视频清晰度缓存
-        if (!resolutionStorage.data) {
+        const resolutionStorageData = resolutionStorage === null || resolutionStorage === void 0 || (_resolutionStorage$da = resolutionStorage.data) === null || _resolutionStorage$da === void 0 ? void 0 : _resolutionStorage$da.data;
+        if (!resolutionStorageData) {
           setNativeStorage(`${deviceId}_resolution`, videoResolution);
         }
 
         // 4. 设置最大倍数缓存
-        if (!maxZoomSettingsStorage.data) {
+        const maxZoomSettingsStorageData = maxZoomSettingsStorage === null || maxZoomSettingsStorage === void 0 || (_maxZoomSettingsStora = maxZoomSettingsStorage.data) === null || _maxZoomSettingsStora === void 0 ? void 0 : _maxZoomSettingsStora.data;
+        if (!maxZoomSettingsStorageData) {
           setNativeStorage(`${deviceId}_maxZoomSettings`, maxZoomSettings);
         }
       }
     } else {
-      var _appIntercomCached$da2, _intercomStorage$data;
+      var _intercomStorage$data2, _appIntercomCached$da2, _resolutionStorage$da2, _microphoneStorage$da2, _maxZoomSettingsStora2;
       // 对于对讲缓存的方式每次需从APP获取更新
-      intercomInfo = intercomStorage.data;
+      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[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da2 = appIntercomCached.data) === null || _appIntercomCached$da2 === void 0 ? void 0 : _appIntercomCached$da2.talkbackMode];
-      if ((intercomStorage === null || intercomStorage === void 0 || (_intercomStorage$data = intercomStorage.data) === null || _intercomStorage$data === void 0 ? void 0 : _intercomStorage$data.cachedIntercomMode) !== intercomInfo.cachedIntercomMode) {
+      if (intercomStorageData.cachedIntercomMode !== intercomInfo.cachedIntercomMode) {
         setNativeStorage(`${deviceId}_intercom`, intercomInfo);
       }
-      videoResolution = resolutionStorage.data;
-      microphoneSettings = microphoneStorage.data;
-      maxZoomSettings = maxZoomSettingsStorage.data;
+      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;
     }
     const ipcConfig = {
       videoResolution,

package/package.json

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