@ray-js/ray-ipc-player 2.0.15 → 2.0.18-beta-beta-1

package/lib/index.js

@@ -26,6 +26,10 @@ var Player = function (props) {
       devId = _props$devId === void 0 ? '' : _props$devId,
       onChangeStreamStatus = props.onChangeStreamStatus,
       onPlayerTap = props.onPlayerTap,
+      onZoomChange = props.onZoomChange,
+      onSessionDidDisconnected = props.onSessionDidDisconnected,
+      onCameraPreviewFailure = props.onCameraPreviewFailure,
+      onCameraNotifyWeakNetwork = props.onCameraNotifyWeakNetwork,
       onInitPreview = props.onInitPreview,
       _props$defaultMute = props.defaultMute,
       defaultMute = _props$defaultMute === void 0 ? true : _props$defaultMute,
@@ -43,6 +47,7 @@ var Player = function (props) {
       ptzControllable = _props$ptzControllabl === void 0 ? true : _props$ptzControllabl,
       _props$clarity = props.clarity,
       clarity = _props$clarity === void 0 ? 'normal' : _props$clarity,
+      ipcPlayerContext = props.ipcPlayerContext,
       onCtx = props.onCtx,
       _props$playerStyle = props.playerStyle,
       playerStyle = _props$playerStyle === void 0 ? {
@@ -83,6 +88,13 @@ var Player = function (props) {
 
   var ipcCtx = useRef(null); // ipc实例
 
+  if (!ipcCtx.current) {
+    var _ty;
+
+    // @ts-ignore
+    ipcCtx.current = ipcPlayerContext || ((_ty = ty) === null || _ty === void 0 ? void 0 : _ty.createIpcPlayerContext(devId));
+  }
+
   var retryCount = useRef(0); // 重试次数
 
   var muteRef = useRef(defaultMute); // 静音
@@ -125,7 +137,7 @@ var Player = function (props) {
     }, _callee2);
   })));
   useEffect(function () {
-    onlineStatus && createIpcCtx(devId);
+    onlineStatus && createIpcCtx();
     return function () {
       disconnect();
       ipcCtx.current = null;
@@ -201,12 +213,7 @@ var Player = function (props) {
     !privateState && _retry();
   }, [playState.connectState, privateState]); // 创建ipc实例
 
-  var createIpcCtx = function (id) {
-    var _ty;
-
-    // @ts-ignore
-    ipcCtx.current = (_ty = ty) === null || _ty === void 0 ? void 0 : _ty.createIpcPlayerContext(id); // console.log('创建实例:', devId);
-
+  var createIpcCtx = function () {
     onCtx && onCtx({
       ctx: ipcCtx.current,
       retry: retry
@@ -464,6 +471,11 @@ var Player = function (props) {
   , _extends({
     className: "".concat(Styles.player, " ").concat(playState.updateLy),
     onVideotap: handlePlayerClick,
+    onVideoTap: handlePlayerClick,
+    onZoomChange: onZoomChange,
+    onSessionDidDisconnected: onSessionDidDisconnected,
+    onCameraPreviewFailure: onCameraPreviewFailure,
+    onCameraNotifyWeakNetwork: onCameraNotifyWeakNetwork,
     onInitdone: function initdone() {
       // console.log('视图层准备就绪:', devId);
       setPlayState(function (d) {

package/lib/typings/index.d.ts

@@ -13,10 +13,10 @@ export type IProps = {
    */
   devId: string;
   /**
-  * @description.en onlineStatus
-  * @description.zh 设备是否在线
-  * @default true
-  */
+   * @description.en onlineStatus
+   * @description.zh 设备是否在线
+   * @default true
+   */
   onlineStatus: boolean;
   /**
    * @description.en privateState
@@ -31,10 +31,10 @@ export type IProps = {
    */
   defaultMute?: boolean;
   /**
-  * @description.en clarity
-  * @description.zh 清晰度 normal：标清，hd：高清
-  * @default "normal"
-  */
+   * @description.en clarity
+   * @description.zh 清晰度 normal：标清，hd：高清
+   * @default "normal"
+   */
   clarity?: 'normal' | 'hd';
   /**
    * @description.en updateLayout
@@ -42,6 +42,12 @@ export type IProps = {
    * @default ""
    */
   updateLayout?: any;
+  /**
+   * @description.en IPC Player instance. If not passed, an instance will be generated inside the component.
+   * @description.zh IPC Player实例，如果不传组件内部会生成实例
+   * @default ""
+   */
+  ipcPlayerContext?: IpcContext;
   /**
    * @description.en onChangeStreamStatus
    * @description.zh 通知视频流状态发生变化
@@ -49,10 +55,10 @@ export type IProps = {
    */
   onChangeStreamStatus?: (data) => void;
   /**
-  * @description.en onCtx
-  * @description.zh 获取ipcPlayer实例ctx以及重试方法retry
-  * @default (playerRef) => void
-  */
+   * @description.en onCtx
+   * @description.zh 获取ipcPlayer实例ctx以及重试方法retry
+   * @default (playerRef) => void
+   */
   onCtx?: (playerRef) => void;
   /**
    * @description.en onInitPreview
@@ -66,6 +72,26 @@ export type IProps = {
    * @default (devId) => void
    */
   onPlayerTap?: (data) => void;
+  /**
+   * @description.en onZoomchange
+   * @description.zh 视频缩放比例及当前倍数变化，detail = { zoomLevel }, zoomLevel 为缩放比例
+   */
+  onZoomChange?: (data) => void;
+  /**
+   * @description.en onSessionDidDisconnected
+   * @description.zh 事件：session断开事件
+   */
+  onSessionDidDisconnected?: (data) => void;
+  /**
+   * @description.en onCameraPreviewFailure
+   * @description.zh 事件：预览失败，错误码监听事件
+   */
+  onCameraPreviewFailure?: (data) => void;
+  /**
+   * @description.en onCameraNotifyWeakNetwork
+   * @description.zh 事件：画面网速监听状态值事件
+   */
+  onCameraNotifyWeakNetwork?: (data) => void;
   /**
    * @description.en scalable
    * @description.zh 是否可缩放
@@ -73,10 +99,10 @@ export type IProps = {
    */
   scalable?: boolean;
   /**
-  * @description.en scaleMultiple
-  * @description.zh 缩放比例
-  * @default 0
-  */
+   * @description.en scaleMultiple
+   * @description.zh 缩放比例
+   * @default 0
+   */
   scaleMultiple?: number;
   /**
    * @description.en rotateZ
@@ -113,7 +139,7 @@ export type IProps = {
    * @description.zh 填充模式设置：contain: 图像长边填满屏幕，短边区域会被填充⿊⾊, fillCrop: 图像铺满屏幕
    * @default "contain"
    */
-   objectFit?: string;
+  objectFit?: string;
   /**
    * @description.en extend
    * @description.zh 扩展属性

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.0.15",
+  "version": "2.0.18-beta-beta-1",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-miniapp",
@@ -26,16 +26,16 @@
   "license": "MIT",
   "dependencies": {
     "@ray-js/panel-sdk": "latest",
+    "classnames": "^2.3.1",
     "immer": "^9.0.15",
-    "use-immer": "^0.5.1",
-    "classnames": "^2.3.1"
+    "use-immer": "^0.5.1"
   },
   "devDependencies": {
-    "@ray-js/ray": "latest",
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
     "@ray-js/babel-preset-standard": "latest",
     "@ray-js/cli": "latest",
+    "@ray-js/ray": "1.5.44-beta.0",
     "@ray-js/rn-transformer-helper": "latest",
     "@ray-js/types": "latest",
     "@types/node": "^17.0.43",
@@ -45,6 +45,12 @@
     "lint-staged": "^10.2.11",
     "standard-version": "9.3.2"
   },
+  "resolutions": {
+    "follow-redirects": "1.15.6",
+    "shell-quote": "1.7.3",
+    "@babel/traverse": "7.23.2",
+    "decode-uri-component": "0.2.1"
+  },
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS --config commitlint.config.js"