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

package/lib/index.d.ts

@@ -12,14 +12,15 @@ declare const IpcUtils: {
     getInitUtmTid: () => string;
     getDevInfo: <T_6>(deviceId: string) => Promise<import("./kit/interface").IRes<T_6>>;
     getNativeStorage: <T_7>(key: string) => Promise<import("./kit/interface").IRes<T_7>>;
-    setNativeStorage: <T_8>(key: string, data: T_8) => Promise<import("./kit/interface").IRes<T_8>>;
+    setNativeStorage: <T_8>(key: string, data: string) => Promise<import("./kit/interface").IRes<T_8>>;
     removeNativeStorage: <T_9>(key: string) => Promise<import("./kit/interface").IRes<T_9>>;
     publishDps: <T_10>(deviceId: string, dps: any) => Promise<import("./kit/interface").IRes<T_10>>;
     getDpStateValue: <T_11>(deviceId: string, dpCode: string) => Promise<import("./kit/interface").IRes<T_11>>;
     getDpIdByCode: <T_12>(deviceId: string, dpCode: string) => Promise<import("./kit/interface").IRes<T_12>>;
     goToMiniProgramByShortLink: <T_13>(url: string, position?: string) => Promise<import("./kit/interface").IRes<T_13>>;
     getVideoBitrateKbps: <T_14>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes<T_14>>;
-    networkStatusDidChangedEvent: (callback: any) => void;
+    networkStatusDidChangedEvent: (callback: (res: any) => void) => void;
+    offNetworkStatusDidChangedEvent: (callback: (res: any) => void) => void;
     getMobileOrientation: <T_15>() => Promise<import("./kit/interface").IRes<T_15>>;
     jumpToWebView: <T_16>(url: string) => Promise<import("./kit/interface").IRes<T_16>>;
     setScreenOrientation: <T_17>(pageOrientation: string) => Promise<import("./kit/interface").IRes<T_17>>;
@@ -41,8 +42,9 @@ declare const IpcUtils: {
         data: boolean;
         msg: string | boolean | import("./kit/interface").IApiError | undefined;
     }>;
-    requestWifiSignal: <T_25>(deviceId: string, dps?: {}) => Promise<import("./kit/interface").IRes<T_25>>;
-    wakeUpDevice: <T_26>(deviceId: string, dps?: {}) => Promise<import("./kit/interface").IRes<T_26>>;
+    ipcTTTOperatorLog: <T_25>(ipcLogString: string) => Promise<import("./kit/interface").IRes<T_25>>;
+    requestWifiSignal: <T_26>(deviceId: string, dps?: {}) => Promise<import("./kit/interface").IRes<T_26>>;
+    wakeUpDevice: <T_27>(deviceId: string, dps?: {}) => Promise<import("./kit/interface").IRes<T_27>>;
     useTrafficViewTip: () => boolean;
 };
 export default IpcUtils;

package/lib/kit/ipc/index.d.ts

@@ -16,7 +16,7 @@ export declare const getNativeStorage: <T>(key: string) => Promise<IRes<T>>;
  * @param key 保存的key属性
  *
  */
-export declare const setNativeStorage: <T>(key: string, data: T) => Promise<IRes<T>>;
+export declare const setNativeStorage: <T>(key: string, data: string) => Promise<IRes<T>>;
 /**
  * 清除本地缓存
  * @param key 保存的key属性
@@ -55,7 +55,8 @@ export declare const goToMiniProgramByShortLink: <T>(url: string, position?: str
  * @returns
  */
 export declare const getVideoBitrateKbps: <T>(deviceId: string, extendParam?: {}) => Promise<IRes<T>>;
-export declare const networkStatusDidChangedEvent: (callback: any) => void;
+export declare const networkStatusDidChangedEvent: (callback: (res: any) => void) => void;
+export declare const offNetworkStatusDidChangedEvent: (callback: (res: any) => void) => void;
 /**
  * 获取手机当前横竖屏状态
  * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
@@ -123,7 +124,7 @@ export declare const goToGeneralHelpMini: <T>() => Promise<IRes<T>>;
  */
 export declare const goToIpcHelpMini: <T>(errCode: number, deviceId: string, helpNum: number, helpFeedBack: boolean, brandColor?: string) => Promise<IRes<T>>;
 /**
- *
+ * 获取是否支持云存储
  * @param deviceId 设备id
  * @returns true/false
  */
@@ -136,3 +137,9 @@ export declare const getIsSupportedCloudStorageSync: (deviceId: string) => Promi
     data: boolean;
     msg: string | boolean | import("../interface").IApiError | undefined;
 }>;
+/**
+ * 预埋业务日志
+ * @param ipcLogString 日志字符串
+ * @returns true/false
+ */
+export declare const ipcTTTOperatorLog: <T>(ipcLogString: string) => Promise<IRes<T>>;

package/lib/kit/ipc/index.js

@@ -82,7 +82,7 @@ export const setNativeStorage = (key, data) => {
         success: res => {
           resolve({
             code: 0,
-            data: res || true
+            data: res
           });
         },
         fail: err => {
@@ -115,7 +115,7 @@ export const removeNativeStorage = key => {
         success: res => {
           resolve({
             code: 0,
-            data: res || true
+            data: res
           });
         },
         fail: err => {
@@ -327,6 +327,9 @@ export const getVideoBitrateKbps = function (deviceId) {
 export const networkStatusDidChangedEvent = callback => {
   ty.onNetworkStatusChange(callback);
 };
+export const offNetworkStatusDidChangedEvent = callback => {
+  ty.offNetworkStatusChange(callback);
+};
 
 /**
  * 获取手机当前横竖屏状态
@@ -736,7 +739,7 @@ export const goToIpcHelpMini = async function (errCode, deviceId, helpNum, helpF
 };
 
 /**
- *
+ * 获取是否支持云存储
  * @param deviceId 设备id
  * @returns true/false
  */
@@ -766,4 +769,38 @@ export const getIsSupportedCloudStorageSync = async deviceId => {
     data: false,
     msg: msg
   };
+};
+
+/**
+ * 预埋业务日志
+ * @param ipcLogString 日志字符串
+ * @returns true/false
+ */
+export const ipcTTTOperatorLog = ipcLogString => {
+  return new Promise(resolve => {
+    try {
+      ty.ipc.ipcTTTOperatorLog({
+        ipcLogString,
+        success: res => {
+          console.log(res, 'res');
+          resolve({
+            code: 0,
+            data: res
+          });
+        },
+        fail: error => {
+          console.log(error, 'error');
+          resolve({
+            code: -1,
+            msg: error
+          });
+        }
+      });
+    } catch (err) {
+      resolve({
+        code: -1,
+        msg: String(err)
+      });
+    }
+  });
 };

package/lib/service/index.js

@@ -147,59 +147,62 @@ export const getCameraConfigInfo = async deviceId => {
     })) {
       // 非虚拟机设备，请求接口
       if (!isVirtualDevice) {
-        var _rtcApiResult$audioAt, _rtcApiResult$audioAt2, _rtcApiResult$audioAt3;
-        const rtcApiResult = await getIpcConfigInfo(deviceId);
+        const rtcInfo = await getIpcConfigInfo(deviceId);
+        if (rtcInfo.code === 0) {
+          var _rtcApiResult$audioAt, _rtcApiResult$audioAt2, _rtcApiResult$audioAt3;
+          const rtcApiResult = rtcInfo.data;
+          // 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);
+          // 拾音器默认声音都为关闭, 若接口返回不支持，则将缓存值设置为关闭
+          microphoneSettings.isMicrophoneSupported = isMicrophoneSupported;
+          const muteStatus = isMicrophoneSupported ? microphoneSettings.cachedMuteMode : defaultMuteMode;
+          microphoneSettings.cachedMuteMode = muteStatus; // 设置默认值
 
-        // 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);
-        // 拾音器默认声音都为关闭, 若接口返回不支持，则将缓存值设置为关闭
-        microphoneSettings.isMicrophoneSupported = isMicrophoneSupported;
-        const muteStatus = isMicrophoneSupported ? microphoneSettings.cachedMuteMode : defaultMuteMode;
-        microphoneSettings.cachedMuteMode = muteStatus;
-
-        // 2. 对讲功能模块
-        const isIntercomSupported = rtcApiResult === null || rtcApiResult === void 0 || (_rtcApiResult$audioAt2 = rtcApiResult.audioAttributes) === null || _rtcApiResult$audioAt2 === void 0 || (_rtcApiResult$audioAt2 = _rtcApiResult$audioAt2.hardwareCapability) === null || _rtcApiResult$audioAt2 === void 0 ? void 0 : _rtcApiResult$audioAt2.includes(2);
-        intercomInfo.isIntercomSupported = isIntercomSupported;
-        // 获取支持的对讲方式
-        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;
+          // 2. 对讲功能模块
+          const isIntercomSupported = rtcApiResult === null || rtcApiResult === void 0 || (_rtcApiResult$audioAt2 = rtcApiResult.audioAttributes) === null || _rtcApiResult$audioAt2 === void 0 || (_rtcApiResult$audioAt2 = _rtcApiResult$audioAt2.hardwareCapability) === null || _rtcApiResult$audioAt2 === void 0 ? void 0 : _rtcApiResult$audioAt2.includes(2);
+          intercomInfo.isIntercomSupported = isIntercomSupported;
+          // 获取支持的对讲方式
+          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[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. 视频分辨率模块
-        videoResolution.defaultResolution = videoResolutionMode[rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.vedioClarity];
-        const supportedVideoClarity = rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.vedioClaritys;
-        videoResolution.availableResolutions = supportedVideoClarity.map(mode => videoResolutionMode[mode]);
+          // 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.availableResolutions = supportedVideoClarity.map(mode => videoResolutionMode[mode]);
 
-        // 4. 最大倍数模块
-        maxZoomSettings = (rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes) !== 0 ? rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes : 6;
-      }
+          // 4. 最大倍数模块
+          maxZoomSettings = (rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes) !== 0 ? rtcApiResult === null || rtcApiResult === void 0 ? void 0 : rtcApiResult.maxZoomInTimes : 6;
+        }
 
-      // 1. 设置拾音器缓存
-      if (!microphoneStorage.data) {
-        setNativeStorage(`${deviceId}_microphone`, microphoneSettings);
-      }
-      // 2. 设置对讲缓存
-      if (!intercomStorage.data) {
-        setNativeStorage(`${deviceId}_intercom`, intercomInfo);
-      }
+        // 1. 设置拾音器缓存
+        if (!microphoneStorage.data) {
+          setNativeStorage(`${deviceId}_microphone`, microphoneSettings);
+        }
+        // 2. 设置对讲缓存
+        if (!intercomStorage.data) {
+          setNativeStorage(`${deviceId}_intercom`, intercomInfo);
+        }
 
-      // 3. 设置视频清晰度缓存
-      if (!resolutionStorage.data) {
-        setNativeStorage(`${deviceId}_resolution`, videoResolution);
-      }
+        // 3. 设置视频清晰度缓存
+        if (!resolutionStorage.data) {
+          setNativeStorage(`${deviceId}_resolution`, videoResolution);
+        }
 
-      // 4. 设置最大倍数缓存
-      if (!maxZoomSettingsStorage.data) {
-        setNativeStorage(`${deviceId}_maxZoomSettings`, maxZoomSettings);
+        // 4. 设置最大倍数缓存
+        if (!maxZoomSettingsStorage.data) {
+          setNativeStorage(`${deviceId}_maxZoomSettings`, maxZoomSettings);
+        }
       }
     } else {
       var _appIntercomCached$da2, _intercomStorage$data;
@@ -228,13 +231,14 @@ export const getCameraConfigInfo = async deviceId => {
       data: ipcConfig
     });
   } catch (err) {
+    console.log(err, 'err');
     ty.showToast({
       title: I18n.t('get_ipc_config_info_api_err'),
       icon: 'error'
     });
     return Promise.resolve({
       code: -1,
-      msg: String(err)
+      msg: err.errorMsg ? err.errorMsg : String(err)
     });
   }
 };

package/package.json

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