@ray-js/ray-ipc-utils 1.1.8 → 1.1.10

package/lib/service/index.js

@@ -178,13 +178,14 @@ export const getCameraConfigInfo = async function (deviceId) {
             intercomInfo.supportedIntercomModes = supportedIntercomModes.map(mode => intercomCallMode[mode]);
             // 获取APP当前存储的对讲模式, 因目前设置页对讲设置使用的还是原生页面，需要读取APP缓存保持一致
 
+            console.log(type, '=========');
             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];
+                intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da = appIntercomCached.data) === null || _appIntercomCached$da === void 0 ? void 0 : _appIntercomCached$da.talkbackMode] || defaultIntercomMode;
               }
             } else {
               // 针对mini程序，直接使用接口返回的第一项数据
@@ -229,10 +230,12 @@ export const getCameraConfigInfo = async function (deviceId) {
         setNativeStorage(`${deviceId}_microphone`, microphoneSettings);
         if (type === 'native') {
           const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
+          console.log(appIntercomCached, 'appIntercomCached');
           // 如果接口返回成功，则取接口返回值
           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];
+            console.log(appIntercomCached, 'appIntercomCached====');
+            intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da2 = appIntercomCached.data) === null || _appIntercomCached$da2 === void 0 ? void 0 : _appIntercomCached$da2.talkbackMode] || defaultIntercomMode;
           }
         }
         setNativeStorage(`${deviceId}_intercom`, intercomInfo);
@@ -245,13 +248,14 @@ export const getCameraConfigInfo = async function (deviceId) {
       // 对于对讲缓存的方式每次需从APP获取更新
       const intercomStorageData = intercomStorage === null || intercomStorage === void 0 || (_intercomStorage$data2 = intercomStorage.data) === null || _intercomStorage$data2 === void 0 ? void 0 : _intercomStorage$data2.data;
       intercomInfo = intercomStorageData;
+      console.log(type, 'type=====');
       if (type === 'native') {
         const appIntercomCached = await getCurrentSupportedTalkMode(deviceId);
         if (appIntercomCached.code !== 0) {
-          intercomInfo.cachedIntercomMode = intercomCallMode[supportedIntercomModes[0]];
+          intercomInfo.cachedIntercomMode = intercomCallMode[supportedIntercomModes[0]] || defaultIntercomMode;
         } 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];
+          intercomInfo.cachedIntercomMode = intercomCallMode[appIntercomCached === null || appIntercomCached === void 0 || (_appIntercomCached$da3 = appIntercomCached.data) === null || _appIntercomCached$da3 === void 0 ? void 0 : _appIntercomCached$da3.talkbackMode] || defaultIntercomMode;
         }
         if (intercomStorageData.cachedIntercomMode !== intercomInfo.cachedIntercomMode) {
           setNativeStorage(`${deviceId}_intercom`, intercomInfo);
@@ -335,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')
@@ -355,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.8",
+  "version": "1.1.10",
   "description": "IPC 工具库",
   "main": "lib/index",
   "files": [