@ray-js/ray-ipc-utils 1.1.0-beta-3 → 1.1.0-beta-4

package/lib/index.d.ts

@@ -1,42 +1,37 @@
 declare const IpcUtils: {
-    getCameraConfigInfo: (deviceId: string) => Promise<import("./interface").IpcConfigInfo>;
-    getCollectionPointsInfo: (deviceId: string) => Promise<any>;
-    updateCollectionPointsInfo: (deviceId: string, id: number, name: string) => Promise<any>;
-    delCollectionPointsInfo: (deviceId: string, pointData: [{
+    getCameraConfigInfo: <T>(deviceId: string) => Promise<IRes<T>>;
+    getCollectionPointsInfo: <T_1>(deviceId: string) => Promise<IRes<T_1>>;
+    updateCollectionPointsInfo: <T_2>(deviceId: string, id: number, name: string) => Promise<IRes<T_2>>;
+    delCollectionPointsInfo: <T_3>(deviceId: string, pointData: [{
         devId: string;
         mpId: number;
-    }]) => Promise<import("./kit/interface").IRes>;
-    addCollectionPointsInfo: (deviceId: string, name: string) => Promise<any>;
-    getServiceUrl: (deviceId: string, serveType: import("./interface").ServeTpe, paramData?: Record<string, any>, action?: boolean, utm_rtid?: string) => Promise<{
-        code: number;
-        msg?: string | undefined;
-        url?: string | undefined;
-        type?: number | undefined;
-    }>;
+    }]) => Promise<IRes<T_3>>;
+    addCollectionPointsInfo: <T_4>(deviceId: string, name: string) => Promise<IRes<T_4>>;
+    getServiceUrl: <T_5>(deviceId: string, serveType: import("./interface").ServeTpe, paramData?: Record<string, any>, action?: boolean, utm_rtid?: string) => Promise<IRes<T_5>>;
     JsonUtil: any;
     getInitUtmTid: () => string;
-    getDevInfo: <T>(deviceId: string) => Promise<import("./kit/interface").IRes>;
-    getNativeStorage: <T_1>(key: string) => Promise<import("./kit/interface").IRes>;
-    setNativeStorage: <T_2>(key: string, data: T_2) => Promise<import("./kit/interface").IRes>;
-    removeNativeStorage: <T_3>(key: string) => Promise<import("./kit/interface").IRes>;
-    publishDps: <T_4>(deviceId: string, dps: T_4) => Promise<import("./kit/interface").IRes>;
-    getDpStateValue: (deviceId: string, dpCode: string) => Promise<import("./kit/interface").IRes>;
-    getDpIdByCode: (deviceId: string, dpCode: string) => Promise<import("./kit/interface").IRes>;
-    goToMiniProgramByShortLink: <T_5>(url: string, position?: string) => Promise<import("./kit/interface").IRes>;
-    getVideoBitrateKbps: <T_6>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes>;
+    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>>;
+    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: (deviceId: string, dpCode: string) => Promise<import("./kit/interface").IRes<T>>;
+    getDpIdByCode: (deviceId: string, dpCode: string) => Promise<import("./kit/interface").IRes<T>>;
+    goToMiniProgramByShortLink: <T_11>(url: string, position?: string) => Promise<import("./kit/interface").IRes<T_11>>;
+    getVideoBitrateKbps: <T_12>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes<T_12>>;
     networkStatusDidChangedEvent: (callback: any) => void;
-    getMobileOrientation: <T_7>() => Promise<import("./kit/interface").IRes>;
-    jumpToWebView: <T_8>(url: string) => Promise<import("./kit/interface").IRes>;
-    setScreenOrientation: <T_9>(pageOrientation: string) => Promise<import("./kit/interface").IRes>;
-    isSupportFloatWindow: <T_10>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes>;
-    openFloatWindow: <T_11>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes>;
-    isSupportedTalk: <T_12>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes>;
-    getCurrentSupportedTalkMode: <T_13>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes>;
+    getMobileOrientation: <T_13>() => Promise<import("./kit/interface").IRes<T_13>>;
+    jumpToWebView: <T_14>(url: string) => Promise<import("./kit/interface").IRes<T_14>>;
+    setScreenOrientation: <T_15>(pageOrientation: string) => Promise<import("./kit/interface").IRes<T_15>>;
+    isSupportFloatWindow: <T_16>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes<T_16>>;
+    openFloatWindow: <T_17>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes<T_17>>;
+    isSupportedTalk: <T_18>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes<T_18>>;
+    getCurrentSupportedTalkMode: <T_19>(deviceId: string, extendParam?: {}) => Promise<import("./kit/interface").IRes<T_19>>;
     goToIpcPageNativeRoute: (url: string, deviceId: string, theme?: "dark" | "light", extraParams?: {
         [key: string]: any;
-    } | undefined, isGeneral?: false | undefined) => Promise<import("./kit/interface").IRes>;
-    goToGeneralHelpMini: () => Promise<import("./kit/interface").IRes>;
-    goToIpcHelpMini: (errCode: number, deviceId: string, helpNum: number, helpFeedBack: boolean, brandColor?: string) => Promise<import("./kit/interface").IRes>;
+    } | undefined, isGeneral?: false | undefined) => Promise<import("./kit/interface").IRes<T>>;
+    goToGeneralHelpMini: () => Promise<import("./kit/interface").IRes<T>>;
+    goToIpcHelpMini: (errCode: number, deviceId: string, helpNum: number, helpFeedBack: boolean, brandColor?: string) => Promise<import("./kit/interface").IRes<T>>;
     getIsSupprtedCloudStorageSync: (deviceId: string) => Promise<{
         code: number;
         data: boolean;
@@ -46,8 +41,8 @@ declare const IpcUtils: {
         data: boolean;
         msg: string | boolean | import("./kit/interface").IApiError | undefined;
     }>;
-    requestWifiSignal: <T_14>(deviceId: string, dps?: {}) => Promise<import("./kit/interface").IRes>;
-    wakeUpDevice: <T_15>(deviceId: string, dps?: {}) => Promise<import("./kit/interface").IRes>;
+    requestWifiSignal: <T_20>(deviceId: string, dps?: {}) => Promise<any>;
+    wakeUpDevice: <T_21>(deviceId: string, dps?: {}) => Promise<any>;
     useTrafficViewTip: () => boolean;
 };
 export default IpcUtils;

package/lib/kit/interface.d.ts

@@ -6,8 +6,8 @@ export interface IApiError {
         errorCode: string | number;
     };
 }
-export interface IRes {
+export interface IRes<T> {
     code?: number;
-    data?: any;
+    data?: T;
     msg?: IApiError | string | boolean;
 }

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

@@ -4,99 +4,99 @@ import { IRes } from '../interface';
  * @param deviceId 设备id
  * @returns 获取设备信息
  */
-export declare const getDevInfo: <T>(deviceId: string) => Promise<IRes>;
+export declare const getDevInfo: <T>(deviceId: string) => Promise<IRes<T>>;
 /**
  * 获取本地缓存
  * @param key 保存的key属性
  *
  */
-export declare const getNativeStorage: <T>(key: string) => Promise<IRes>;
+export declare const getNativeStorage: <T>(key: string) => Promise<IRes<T>>;
 /**
  * 存储数据到本地缓存
  * @param key 保存的key属性
  *
  */
-export declare const setNativeStorage: <T>(key: string, data: T) => Promise<IRes>;
+export declare const setNativeStorage: <T>(key: string, data: T) => Promise<IRes<T>>;
 /**
  * 清除本地缓存
  * @param key 保存的key属性
  *
  */
-export declare const removeNativeStorage: <T>(key: string) => Promise<IRes>;
+export declare const removeNativeStorage: <T>(key: string) => Promise<IRes<T>>;
 /**
  * DP点下发, 包含针对低功耗设备情况下的DP点下发
  * @param key 保存的key属性
  *
  */
-export declare const publishDps: <T>(deviceId: string, dps: T) => Promise<IRes>;
+export declare const publishDps: <T>(deviceId: string, dps: any) => Promise<IRes<T>>;
 /**
  * 根据DPCode获取最新的DP点的值
  * @param key 保存的key属性
  *
  */
-export declare const getDpStateValue: (deviceId: string, dpCode: string) => Promise<IRes>;
+export declare const getDpStateValue: (deviceId: string, dpCode: string) => Promise<IRes<T>>;
 /**
  * 根据DPCode获取DpId
  * @param key 保存的key属性
  *
  */
-export declare const getDpIdByCode: (deviceId: string, dpCode: string) => Promise<IRes>;
+export declare const getDpIdByCode: (deviceId: string, dpCode: string) => Promise<IRes<T>>;
 /**
  * 通过短链形式跳转小程序
  * @param url 小程序链接
  * @param position 弹出位置 bottom｜right
  *
  */
-export declare const goToMiniProgramByShortLink: <T>(url: string, position?: string) => Promise<IRes>;
+export declare const goToMiniProgramByShortLink: <T>(url: string, position?: string) => Promise<IRes<T>>;
 /**
  * 获取视频码率
  * @param deviceId
  * @param extendParam 扩展参数
  * @returns
  */
-export declare const getVideoBitrateKbps: <T>(deviceId: string, extendParam?: {}) => Promise<IRes>;
+export declare const getVideoBitrateKbps: <T>(deviceId: string, extendParam?: {}) => Promise<IRes<T>>;
 export declare const networkStatusDidChangedEvent: (callback: any) => void;
 /**
  * 获取手机当前横竖屏状态
  * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
  * @returns
  */
-export declare const getMobileOrientation: <T>() => Promise<IRes>;
+export declare const getMobileOrientation: <T>() => Promise<IRes<T>>;
 /**
  * 跳转到webView
  * @param key 保存的key属性
  *
  */
-export declare const jumpToWebView: <T>(url: string) => Promise<IRes>;
-export declare const setScreenOrientation: <T>(pageOrientation: string) => Promise<IRes>;
+export declare const jumpToWebView: <T>(url: string) => Promise<IRes<T>>;
+export declare const setScreenOrientation: <T>(pageOrientation: string) => Promise<IRes<T>>;
 /**
  * 画中画：是否支持画中画：只有安卓在用
  * @param deviceId
  * @param extendParam 扩展参数
  * @returns
  */
-export declare const isSupportFloatWindow: <T>(deviceId: string, extendParam?: {}) => Promise<IRes>;
+export declare const isSupportFloatWindow: <T>(deviceId: string, extendParam?: {}) => Promise<IRes<T>>;
 /**
  * 画中画：开启画中画
  * @param deviceId
  * @param extendParam 扩展参数
  * @returns
  */
-export declare const openFloatWindow: <T>(deviceId: string, extendParam?: {}) => Promise<IRes>;
+export declare const openFloatWindow: <T>(deviceId: string, extendParam?: {}) => Promise<IRes<T>>;
 /**
  * IPC-APP 缓存支持的对讲方式:是否支持对讲
  * @param deviceId
  * @param extendParam 扩展参数
  * @returns
  */
-export declare const isSupportedTalk: <T>(deviceId: string, extendParam?: {}) => Promise<IRes>;
+export declare const isSupportedTalk: <T>(deviceId: string, extendParam?: {}) => Promise<IRes<T>>;
 /**
  * 设备支持的对讲模式
  * @param deviceId
  * @param extendParam 扩展参数
  * @returns 设备支持的对讲模式。回掉方法的参数为数值型，0 未知；1：单向对讲；2：双向对讲。
  */
-export declare const getCurrentSupportedTalkMode: <T>(deviceId: string, extendParam?: {}) => Promise<IRes>;
+export declare const getCurrentSupportedTalkMode: <T>(deviceId: string, extendParam?: {}) => Promise<IRes<T>>;
 /**
  * 跳转 APP 原生页面
  * @param {string} url 页面路由
@@ -108,11 +108,11 @@ export declare const getCurrentSupportedTalkMode: <T>(deviceId: string, extendPa
  */
 export declare const goToIpcPageNativeRoute: (url: string, deviceId: string, theme?: 'dark' | 'light', extraParams?: {
     [key: string]: any;
-} | undefined, isGeneral?: false) => Promise<IRes>;
+} | undefined, isGeneral?: false) => Promise<IRes<T>>;
 /**
  * 跳转 通用帮助反馈小程序
  */
-export declare const goToGeneralHelpMini: () => Promise<IRes>;
+export declare const goToGeneralHelpMini: () => Promise<IRes<T>>;
 /**
  * 跳转 Ipc帮助反馈小程序
  * @param {number} errCode 错误码
@@ -121,7 +121,7 @@ export declare const goToGeneralHelpMini: () => Promise<IRes>;
  * @param {boolean} helpFeedBack 是否是反馈
  * @param {string} brandColor 品牌色
  */
-export declare const goToIpcHelpMini: (errCode: number, deviceId: string, helpNum: number, helpFeedBack: boolean, brandColor?: string) => Promise<IRes>;
+export declare const goToIpcHelpMini: (errCode: number, deviceId: string, helpNum: number, helpFeedBack: boolean, brandColor?: string) => Promise<IRes<T>>;
 /**
  *
  * @param deviceId 设备id

package/lib/kit/ipc/index.js

@@ -563,7 +563,7 @@ export const getCurrentSupportedTalkMode = function (deviceId) {
 /**
  * 处理 IPC URL 跳转
  * @param {string} nativeUrl - 构建好的目标 URL。
- * @returns {Promise<IRes>} 返回操作结果。
+ * @returns {Promise<IRes<T>>} 返回操作结果。
  */
 const handleIpcUrl = nativeUrl => {
   return new Promise(resolve => {
@@ -595,7 +595,7 @@ const handleIpcUrl = nativeUrl => {
 /**
  * 处理通用 URL 跳转
  * @param {string} nativeUrl - 目标url。
- * @returns {Promise<IRes>} 返回操作结果。
+ * @returns {Promise<IRes<T>>} 返回操作结果。
  */
 const handleGeneralUrl = nativeUrl => {
   return new Promise(resolve => {

package/lib/service/index.d.ts

@@ -1,35 +1,36 @@
-import { IpcConfigInfo, ServeTpe } from '../interface';
+import { ServeTpe } from '../interface';
+import { IRes } from '@/kit/interface';
 /**
  * 获取IPC设备配置及缓存信息、
  * 包含: 视频清晰度、对讲方式、拾音器、视频缩放最大倍数
  * @param {string} deviceId 设备id
  */
-export declare const getCameraConfigInfo: (deviceId: string) => Promise<IpcConfigInfo>;
+export declare const getCameraConfigInfo: <T>(deviceId: string) => Promise<IRes<T>>;
 /**
  * 获取IPC设备配置收藏点信息列表
  * @param {string} deviceId 设备id
  */
-export declare const getCollectionPointsInfo: (deviceId: string) => Promise<any>;
+export declare const getCollectionPointsInfo: <T>(deviceId: string) => Promise<IRes<T>>;
 /**
  * 更新IPC设备单个收藏点信息
  * @param {string} deviceId 设备id
  * @param {number} id 收藏点id
  * @param {string} name 收藏点名称
  */
-export declare const updateCollectionPointsInfo: (deviceId: string, id: number, name: string) => Promise<any>;
+export declare const updateCollectionPointsInfo: <T>(deviceId: string, id: number, name: string) => Promise<IRes<T>>;
 /**
  * 删除IPC设备单个收藏点信息
  * @param {string} deviceId 设备id
  */
-export declare const delCollectionPointsInfo: (deviceId: string, pointData: [{
+export declare const delCollectionPointsInfo: <T>(deviceId: string, pointData: [{
     devId: string;
     mpId: number;
-}]) => Promise<import("../kit/interface").IRes>;
+}]) => Promise<IRes<T>>;
 /**
  * 添加IPC设备单个收藏点信息
  * @param {string} deviceId 设备id
  */
-export declare const addCollectionPointsInfo: (deviceId: string, name: string) => Promise<any>;
+export declare const addCollectionPointsInfo: <T>(deviceId: string, name: string) => Promise<IRes<T>>;
 /**
  * 获取增值服务大类链接及是否直接跳转
  * @param {string} deviceId 设备id
@@ -39,9 +40,4 @@ export declare const addCollectionPointsInfo: (deviceId: string, name: string) =
  * @param {string} utm_rtid 链路ID
  *
  */
-export declare const getServiceUrl: (deviceId: string, serveType: ServeTpe, paramData?: Record<string, any>, action?: boolean, utm_rtid?: string) => Promise<{
-    code: number;
-    msg?: string;
-    url?: string;
-    type?: number;
-}>;
+export declare const getServiceUrl: <T>(deviceId: string, serveType: ServeTpe, paramData?: Record<string, any>, action?: boolean, utm_rtid?: string) => Promise<IRes<T>>;

package/lib/service/index.js

@@ -66,7 +66,10 @@ const api = function (a, postData) {
     }), {}, {
       success: d => {
         const data = typeof d === 'string' ? JsonUtil.parseJSON(d) : d;
-        resolve(data);
+        resolve({
+          code: 0,
+          data: data
+        });
       },
       fail: err => {
         const e = typeof err === 'string' ? JsonUtil.parseJSON(err) : err;
@@ -220,16 +223,19 @@ export const getCameraConfigInfo = async deviceId => {
       microphoneSettings,
       maxZoomSettings
     };
-    return ipcConfig;
+    return Promise.resolve({
+      code: 0,
+      data: ipcConfig
+    });
   } catch (err) {
     ty.showToast({
       title: I18n.t('get_ipc_config_info_api_err'),
       icon: 'error'
     });
-    return {
+    return Promise.resolve({
       code: -1,
       msg: String(err)
-    };
+    });
   }
 };
 
@@ -265,20 +271,20 @@ export const updateCollectionPointsInfo = (deviceId, id, name) => {
       icon: 'error',
       title: '请输入收藏点名称'
     });
-    return {
+    return Promise.resolve({
       code: -1,
       msg: '请输入收藏点名称'
-    };
+    });
   }
   if (_trim(name).length > 10) {
     ty.showToast({
       icon: 'error',
       title: '收藏点名称不能超过10个字符'
     });
-    return {
+    return Promise.resolve({
       code: -1,
       msg: '收藏点名称不能超过10个字符'
-    };
+    });
   }
   return api(url, {
     devId: deviceId,
@@ -339,7 +345,10 @@ export const delCollectionPointsInfo = async (deviceId, pointData) => {
       title: publishResult.msg
     });
   }
-  return publishResult;
+  return Promise.resolve({
+    code: 0,
+    data: publishResult
+  });
 };
 
 /**
@@ -426,7 +435,10 @@ export const addCollectionPointsInfo = async (deviceId, name) => {
       title: publishResult.msg
     });
   }
-  return publishResult;
+  return {
+    code: 0,
+    data: publishResult.data
+  };
 };
 
 /**
@@ -485,13 +497,13 @@ export const getServiceUrl = async function (deviceId, serveType) {
     if (!action) {
       return result;
     }
-    if ((result === null || result === void 0 ? void 0 : result.type) === 2) {
+    if ((result === null || result === void 0 ? void 0 : result.data.type) === 2) {
       // 跳转小程序
-      const minResult = await goToMiniProgramByShortLink(result === null || result === void 0 ? void 0 : result.url);
+      const minResult = await goToMiniProgramByShortLink(result === null || result === void 0 ? void 0 : result.data.url);
       return minResult;
     }
     // 跳转H5
-    const webResult = await jumpToWebView(result === null || result === void 0 ? void 0 : result.url);
+    const webResult = await jumpToWebView(result === null || result === void 0 ? void 0 : result.data.url);
     return webResult;
   } catch (err) {
     return {

package/package.json

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