@ray-js/ipc-player-integration 0.0.1-beta-6 → 0.0.1-beta-7

package/lib/hooks/useTemperature/index.js

@@ -10,7 +10,6 @@ export const useTemperature = devId => {
     dpCodes: [TEMP_UNIT_SELECT, SENSOR_TEMPERATURE, TEMP_REPORT_F]
   });
   useEffect(() => {
-    console.log('res===1', dpState);
     //  1=华氏度  0=摄氏度
     if (dpState[TEMP_UNIT_SELECT] !== undefined) {
       setTempUnit(dpState[TEMP_UNIT_SELECT] + '');

package/lib/hooks/useVideoBitKbps/index.js

@@ -1,20 +1,22 @@
-import { getVideoBitrateKbps } from '../../utils/ipcApi';
 import { useEffect, useState } from 'react';
+import IpcUtils from '@ray-js/ray-ipc-utils';
 export const useVideoBitKbps = devId => {
   const [bitKbps, setBitKbps] = useState('');
   useEffect(() => {
     // const timer = setInterval(() => {
     init();
-    // }, 5000);
+    // }, 1000);
     // return () => {
     //   clearInterval(timer);
     //   timer === null;
     // };
   }, []);
   const init = async () => {
-    const res = await getVideoBitrateKbps(devId);
-    console.log('res===bitKbps', res);
-    setBitKbps(res.kpbs + 'KB/S');
+    const res = await IpcUtils.getVideoBitrateKbps(devId);
+    console.log('res===getVideoBitrateKbps', res);
+    if (res.code !== -1) {
+      setBitKbps(res.data.kbps + 'KB/S');
+    }
   };
   return bitKbps;
 };

package/lib/plugins/videoBitKbps/videoBitKbps.js

@@ -1,102 +1,12 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { View } from '@ray-js/ray';
 import { useVideoBitKbps } from '../../hooks';
 import './videoBitKbps.less';
-import { getCurrentSupportedTalkMode, getMobileOrientation, getVideoBitrateKbps, requestWifiSignal, isSupportedTalk, isSupportFloatWindow, openFloatWindow, setScreenOrientation, wakeUpDevice } from '../../utils/ipcApi';
 export const VideoBitKbps = props => {
   const {
-    devId,
-    IPCPlayerContext
+    devId
   } = props;
   const bitKbps = useVideoBitKbps(devId);
-  useEffect(() => {
-    // TODO: test
-    // test();
-  }, []);
-  useEffect(() => {
-    // TODO: test
-    testOther();
-  }, []);
-  const testOther = async () => {
-    console.log('res===ttt');
-    try {
-      await requestWifiSignal(devId);
-    } catch (error) {
-      console.log('res===catch', error);
-    }
-    await getVideoBitrateKbps(devId); // 过
-    await wakeUpDevice(devId); // 过
-    await getMobileOrientation(); // 过
-    await setScreenOrientation('portrait'); // xxx
-    await isSupportFloatWindow(devId);
-    await isSupportedTalk(devId);
-    await getCurrentSupportedTalkMode(devId);
-    await openFloatWindow(devId); // 无
-  };
-
-  // const test = () => {
-  //   console.log('res===ppp test');
-  //   //  缩放倍数
-  //   IPCPlayerContext.setScaleMultiple({
-  //     scaleMultiple: 1,
-  //     success: res => {
-  //       console.log('res===ppp setScaleMultiple success', res);
-  //     },
-  //     fail: error => {
-  //       console.log('res===ppp setScaleMultiple fail', error);
-  //     },
-  //   });
-
-  //   IPCPlayerContext.setTrackingStatus({
-  //     // status: false,  // 非必传
-  //     success: res => {
-  //       console.log('res===ppp setTrackingStatus success', res);
-  //     },
-  //     fail: error => {
-  //       console.log('res===ppp setTrackingStatus fail', error);
-  //     },
-  //   });
-
-  //   IPCPlayerContext.setScalable({
-  //     scaleble: 1,
-  //     success: res => {
-  //       console.log('res===ppp setScalable success', res);
-  //     },
-  //     fail: error => {
-  //       console.log('res===ppp setScalable fail', error);
-  //     },
-  //   });
-
-  //   IPCPlayerContext.isPTZControllable({
-  //     success: res => {
-  //       console.log('res===ppp isPTZControllable success', res);
-  //     },
-  //     fail: error => {
-  //       console.log('res===ppp isPTZControllable fail', error);
-  //     },
-  //   });
-
-  //   IPCPlayerContext.setRotateZ({
-  //     rotateZ: 0,
-  //     success: res => {
-  //       console.log('res===ppp setRotateZ success', res);
-  //     },
-  //     fail: error => {
-  //       console.log('res===ppp setRotateZ fail', error);
-  //     },
-  //   });
-
-  //   // IPCPlayerContext.setMaxScaleMultiple({
-  //   //   maxScaleMultiple: 90, // 0-360
-  //   //   success: (res) => {
-  //   //     console.log('res===ppp maxScaleMultiple success', res);
-  //   //   },
-  //   //   fail: (error) => {
-  //   //     console.log('res===ppp maxScaleMultiple fail', error);
-  //   //   }
-  //   // })
-  // };
-
   return /*#__PURE__*/React.createElement(View, {
     className: "ipc-player-plugin-videoBitKbps"
   }, bitKbps);

package/lib/ui/ui.js

@@ -85,7 +85,8 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
    * 视频流加载状态封装
    */
 
-  const handPlayerTap = useCallback(() => {
+  const handPlayerTap = useCallback(data => {
+    console.log('res===on onVideoTap', data);
     const store = getDefaultStore();
     const _screenType = store.get(instance.screenType);
     eventRef.current.emit(playerTap);
@@ -188,7 +189,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     },
     clarity: "hd",
     privateState: false,
-    onPlayerTap: handPlayerTap
+    onPlayerTap: handPlayerTap // 对应原来的onVideoTap
   }), playerReady && /*#__PURE__*/React.createElement(TopContent, {
     ctx: instance
   }, renderTopContent), playerReady && /*#__PURE__*/React.createElement(BottomContent, {

package/lib/ui/ui.less

@@ -1,6 +1,7 @@
 .ipc-player-content {
   position: relative;
   overflow: hidden;
+
   .ipc-player-top-content-warp {
     position: absolute;
     width: 100%;
@@ -8,6 +9,7 @@
     top: 0;
     z-index: 100;
   }
+
   .ipc-player-bottom-content-warp {
     position: absolute;
     z-index: 100;
@@ -15,6 +17,7 @@
     left: 0;
     bottom: 0;
   }
+
   .ipc-player-content-item {
     --height: 48px;
     --gap: 10px;
@@ -26,12 +29,15 @@
     padding: 0 calc(16px * var(--ipc-player-size-scale, 1));
     transform: translate(0, 0);
     transition: transform ease-in 0.3s;
+
     &.ipc-player-top-content {
       justify-content: flex-end;
+
       &.ipc-player-top-content-hide {
         transform: translate(0, -110%);
       }
     }
+
     &.ipc-player-bottom-content {
       &.ipc-player-bottom-content-hide {
         transform: translate(0, 110%)
@@ -46,5 +52,5 @@
 }
 
 .ipc-player-element-hidden {
-  visibility: hidden !important;
+  // visibility: hidden !important;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.1-beta-6",
+  "version": "0.0.1-beta-7",
   "description": "IPC 播放器功能集成",
   "main": "lib/index",
   "files": [
@@ -35,7 +35,8 @@
     "@ray-js/ray": "^1.4.9"
   },
   "dependencies": {
-    "@ray-js/ray-ipc-player": "2.0.17-beta-beta-1",
+    "@ray-js/ray-ipc-player": "2.0.18-beta-beta-1",
+    "@ray-js/ray-ipc-utils": "1.1.0-beta-7",
     "clsx": "^1.2.1",
     "jotai": "^2.10.2"
   },

package/lib/utils/ipcApi/index.d.ts

@@ -1,78 +0,0 @@
-export interface IApiError {
-    errorMsg: string;
-    errorCode: string;
-    innerError: {
-        errorMsg: string;
-        errorCode: string;
-    };
-}
-/**
- * 获取信号强度
- * @param devId
- * @param dps 扩展参数
- * @returns
- */
-export declare const requestWifiSignal: <T>(devId: string, dps?: {}) => Promise<IApiError | T>;
-/**
- * 获取视频码率
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export declare const getVideoBitrateKbps: <T>(devId: string, extendParam?: {}) => Promise<IApiError | T>;
-export declare const addCameraDeviceObserver: <T>(devId: string, extendParam?: {}) => Promise<IApiError | T>;
-export declare const networkStatusDidChangedEvent: (callback: any) => void;
-/**
- * IPC-低功耗唤醒:低功耗唤醒,唤醒门铃设备
- * 需引入DeviceKit，且在>=3.1.0-ipcwake.1版本才可使用
- * @param devId
- * @returns
- */
-export declare const wakeUpDevice: <T>(devId: string, dps?: {}) => Promise<IApiError | T>;
-/**
- * 画中画：是否支持画中画：只有安卓在用
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export declare const getMobileOrientation: <T>() => Promise<IApiError | T>;
-/**
- * 屏幕旋转设置，auto(暂不支持) / portrait / landscape。pad 模式下不支持屏幕旋转
- * 需引入MiniKit，且在>=2.4.1版本才可使用
- * @param pageOrientation
- * @returns
- */
-export declare const setScreenOrientation: <T>(pageOrientation: string) => Promise<IApiError | T>;
-/**
- * 画中画：是否支持画中画：只有安卓在用
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export declare const isSupportFloatWindow: <T>(devId: string, extendParam?: {}) => Promise<IApiError | T>;
-/**
- * 画中画：开启画中画
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export declare const openFloatWindow: <T>(devId: string, extendParam?: {}) => Promise<IApiError | T>;
-/**
- * IPC-APP 缓存支持的对讲方式:是否支持对讲
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export declare const isSupportedTalk: <T>(devId: string, extendParam?: {}) => Promise<IApiError | T>;
-/**
- * 设备支持的对讲模式
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns 设备支持的对讲模式。回掉方法的参数为数值型，0 未知；1：单向对讲；2：双向对讲。
- */
-export declare const getCurrentSupportedTalkMode: <T>(devId: string, extendParam?: {}) => Promise<IApiError | T>;

package/lib/utils/ipcApi/index.js

@@ -1,251 +0,0 @@
-/**
- * 获取信号强度
- * @param devId
- * @param dps 扩展参数
- * @returns
- */
-export const requestWifiSignal = function (devId) {
-  let dps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.device.requestWifiSignal({
-      deviceId: devId,
-      dps: dps,
-      success: res => {
-        console.log('res===ttt  requestWifiSignal success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  requestWifiSignal error', error);
-    throw error;
-  });
-};
-
-/**
- * 获取视频码率
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export const getVideoBitrateKbps = function (devId) {
-  let extendParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.ipc.getVideoBitrateKbps({
-      devId,
-      extendParam: extendParam,
-      success: res => {
-        console.log('res===ttt  getVideoBitrateKbps success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  getVideoBitrateKbps error', error);
-    throw error;
-  });
-};
-
-//  addCameraDeviceObserver
-export const addCameraDeviceObserver = function (devId) {
-  let extendParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.ipc.addCameraDeviceObserver({
-      devId,
-      extendParam: extendParam,
-      success: res => {
-        console.log('res===ttt  addCameraDeviceObserver success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  addCameraDeviceObserver error', error);
-    throw error;
-  });
-};
-//  networkStatusDidChangedEvent,
-//  事件：监听网络状态事件
-//  通用
-//  ty.onNetworkStatusChange
-export const networkStatusDidChangedEvent = callback => {
-  ty.onNetworkStatusChange(callback);
-};
-
-//  cameraNotifyWeakNetworkEvent
-//  事件：画面网速监听状态值事件
-//  TUNIIPCCameraManager
-
-//  sessionDidDisconnectedEvent
-
-//  cameraPreviewFailureEvent
-
-/**
- * IPC-低功耗唤醒:低功耗唤醒,唤醒门铃设备
- * 需引入DeviceKit，且在>=3.1.0-ipcwake.1版本才可使用
- * @param devId
- * @returns
- */
-export const wakeUpDevice = function (devId) {
-  let dps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.device.wakeUpDevice({
-      deviceId: devId,
-      dps: dps,
-      success: res => {
-        console.log('res===ttt  wakeUpDevice success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  wakeUpDevice error', error);
-    throw error;
-  });
-};
-
-/**
- * 画中画：是否支持画中画：只有安卓在用
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export const getMobileOrientation = () => {
-  return new Promise((resolve, reject) => {
-    ty.getSystemInfo({
-      success: res => {
-        console.log('res===ttt  getMobileOrientation success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  getMobileOrientation error', error);
-    throw error;
-  });
-};
-
-/**
- * 屏幕旋转设置，auto(暂不支持) / portrait / landscape。pad 模式下不支持屏幕旋转
- * 需引入MiniKit，且在>=2.4.1版本才可使用
- * @param pageOrientation
- * @returns
- */
-export const setScreenOrientation = pageOrientation => {
-  return new Promise((resolve, reject) => {
-    ty.setPageOrientation({
-      pageOrientation: pageOrientation,
-      success: res => {
-        console.log('res===ttt  setScreenOrientation success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  setScreenOrientation error', error);
-    throw error;
-  });
-};
-
-/**
- * 画中画：是否支持画中画：只有安卓在用
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export const isSupportFloatWindow = function (devId) {
-  let extendParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.ipc.isSupportFloatWindow({
-      deviceId: devId,
-      extendParam: extendParam,
-      success: res => {
-        console.log('res===ttt  isSupportFloatWindow success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  isSupportFloatWindow error', error);
-    throw error;
-  });
-};
-
-/**
- * 画中画：开启画中画
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export const openFloatWindow = function (devId) {
-  let extendParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.ipc.openFloatWindow({
-      deviceId: devId,
-      extendParam: extendParam,
-      success: res => {
-        console.log('res===ttt  openFloatWindow success');
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  openFloatWindow error', error);
-    throw error;
-  });
-};
-
-/**
- * IPC-APP 缓存支持的对讲方式:是否支持对讲
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns
- */
-export const isSupportedTalk = function (devId) {
-  let extendParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.ipc.isSupportedTalk({
-      deviceId: devId,
-      extendParam: extendParam,
-      success: res => {
-        console.log('res===ttt  isSupportedTalk success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  isSupportedTalk error', error);
-    throw error;
-  });
-};
-
-/**
- * 设备支持的对讲模式
- * 需引入IPCKit，且在>=1.0.0-TTT432.1版本才可使用
- * @param devId
- * @param extendParam 扩展参数
- * @returns 设备支持的对讲模式。回掉方法的参数为数值型，0 未知；1：单向对讲；2：双向对讲。
- */
-export const getCurrentSupportedTalkMode = function (devId) {
-  let extendParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return new Promise((resolve, reject) => {
-    ty.ipc.getCurrentSupportedTalkMode({
-      deviceId: devId,
-      extendParam: extendParam,
-      success: res => {
-        console.log('res===ttt  getCurrentSupportedTalkMode success', res);
-        resolve(res);
-      },
-      fail: error => reject(error)
-    });
-  }).catch(error => {
-    console.log('res===ttt  getCurrentSupportedTalkMode error', error);
-    throw error;
-  });
-};
-
-// 挂在了page生命周期的onResize下面