@ray-js/ray-ipc-player 2.0.20-beta-7 → 2.0.20-beta-9

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="react" />
+import { IProps } from './typings';
 declare const Player: (props: IProps) => JSX.Element;
 export default Player;

package/lib/index.js

@@ -7,7 +7,7 @@ import { useImmer } from 'use-immer';
 import _isEmpty from 'lodash/isEmpty';
 import { IpcPlayer, View, CoverView } from '@ray-js/components';
 import { useMount, useUnmount } from 'ahooks';
-import { setPageOrientation, usePageEvent, getNetworkType, offNetworkStatusChange, onNetworkStatusChange, publishDps, showToast } from '@ray-js/ray';
+import { setPageOrientation, usePageEvent, getNetworkType, offNetworkStatusChange, onNetworkStatusChange, publishDps, showToast, getSystemInfoSync } from '@ray-js/ray';
 import clsx from 'clsx';
 import Strings from './i18n';
 import Styles from './index.module.less';
@@ -112,7 +112,15 @@ const Player = props => {
     const {
       type
     } = sizeData;
-    setScreenType(type);
+    const {
+      platform,
+      deviceType
+    } = getSystemInfoSync();
+    if (platform === 'ios' && deviceType === 'pad') {
+      setScreenType('portrait');
+    } else {
+      setScreenType(type);
+    }
   });
   useMount(() => {
     onNetworkStatusChange(res => {
@@ -565,6 +573,7 @@ const Player = props => {
    * 跳转反馈小程序
    */
 
+  console.log(borderRadius, 'borderRadius=====');
   return /*#__PURE__*/React.createElement(View, {
     className: Styles.ipc_player,
     onClick: () => {
@@ -669,6 +678,9 @@ const Player = props => {
     className: clsx(Styles.errOperatorContainer)
   }, getErrorContentByType(videoErrCode, 'retry') && /*#__PURE__*/React.createElement(View, {
     className: clsx(Styles.operatorBtn, Styles.operatorRetry),
+    style: {
+      backgroundColor: "".concat(brandColor)
+    },
     onClick: retry
   }, getErrorContentByType(videoErrCode, 'retryText')), getErrorContentByType(videoErrCode, 'help') && /*#__PURE__*/React.createElement(View, {
     className: clsx(Styles.operatorBtn, Styles.operatorHelp),

package/lib/index.module.less

@@ -224,7 +224,7 @@
       margin: 0
     }
     .operatorRetry {
-      background-color: red;
+      background-color: #FF592A;
     }
     .operatorHelp {
       background-color: #252525;

package/lib/typings/index.d.ts

@@ -0,0 +1,123 @@
+declare module '*.module.less' {
+  const classes: {
+    readonly [key: string]: string;
+  };
+  export default classes;
+  declare module '*.less';
+}
+export type IProps = {
+  /**
+   * @description.en devId
+   * @description.zh 设备id
+   * @default ""
+   */
+  devId: string;
+  /**
+   * @description.en onlineStatus
+   * @description.zh 设备是否在线
+   * @default true
+   */
+  onlineStatus: boolean;
+  /**
+   * @description.en privateState
+   * @description.zh 隐私模式
+   * @default false
+   */
+  privateState?: boolean;
+  /**
+   * @description.en defaultMute
+   * @description.zh 默认静音
+   * @default true
+   */
+  defaultMute?: boolean;
+  /**
+   * @description.en clarity
+   * @description.zh 清晰度 normal：标清，hd：高清
+   * @default "normal"
+   */
+  clarity?: 'normal' | 'hd';
+  /**
+   * @description.en updateLayout
+   * @description.zh 外层父节点样式变化，播放器监听不到，需要主动触发播放器视图更新，每次需要设置不同的字符串值
+   * @default ""
+   */
+  updateLayout?: any;
+  /**
+   * @description.en onChangeStreamStatus
+   * @description.zh 通知视频流状态发生变化
+   * @default (data) => void
+   */
+  onChangeStreamStatus?: (data) => void;
+  /**
+   * @description.en onCtx
+   * @description.zh 获取ipcPlayer实例ctx以及重试方法retry
+   * @default (playerRef) => void
+   */
+  onCtx?: (playerRef) => void;
+  /**
+   * @description.en onInitPreview
+   * @description.zh 初始化预览成功通知
+   * @default (devId) => void
+   */
+  onInitPreview?: (data) => void;
+  /**
+   * @description.en onPlayerTap
+   * @description.zh 播放器区域点击事件
+   * @default (devId) => void
+   */
+  onPlayerTap?: (data) => void;
+  /**
+   * @description.en scalable
+   * @description.zh 是否可缩放
+   * @default true
+   */
+  scalable?: boolean;
+  /**
+   * @description.en scaleMultiple
+   * @description.zh 缩放比例
+   * @default 0
+   */
+  scaleMultiple?: number;
+  /**
+   * @description.en rotateZ
+   * @description.zh 摄像头旋转角度
+   * @default 0
+   */
+  rotateZ?: number;
+  /**
+   * @description.en ptzControllable
+   * @description.zh 是否开启视频区云平台控制
+   * @default true
+   */
+  ptzControllable?: boolean;
+  /**
+   * @description.en playerStyle
+   * @description.zh 播放器样式
+   * @default {}
+   */
+  playerStyle?: {
+    bgColor?: string; // 背景底色
+    borderRadius?: number | string; // 边框圆角
+    borderStyle?: 'solid' | 'dashed'; // 边框样式
+    borderColor?: string; // 边框颜色
+    borderWidth?: string | number; // 边框宽度
+  };
+  /**
+   * @description.en loadText
+   * @description.zh 加载过程中的文案，可结合onChangeStreamStatus事件做文案配置
+   * @default "正在获取视频流..."
+   */
+  loadText?: string;
+  /**
+   * @description.en objectFit：contain|fillCrop
+   * @description.zh 填充模式设置：contain: 图像长边填满屏幕，短边区域会被填充⿊⾊, fillCrop: 图像铺满屏幕
+   * @default "contain"
+   */
+  objectFit?: string;
+  /**
+   * @description.en extend
+   * @description.zh 扩展属性
+   * @default {}
+   */
+  extend?: Record<string, any>;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.0.20-beta-7",
+  "version": "2.0.20-beta-9",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-miniapp",