@ray-js/ray-ipc-player 2.0.21-beta-1 → 2.0.21-beta-3

package/lib/index.js

@@ -51,7 +51,8 @@ const Player = props => {
     isShare = false,
     onPlayerContainerTap,
     reConnect = false,
-    awakeStatus = undefined
+    awakeStatus = undefined,
+    ignoreHideStopPreview = false
   } = props;
   const {
     borderRadius,
@@ -170,30 +171,19 @@ const Player = props => {
         }
       }
     });
-    onDpDataChange(res => {
-      if (res.deviceId === devId) {
-        const dpsInfo = res.dps;
-        const arr = Object.keys(dpsInfo);
-        if (arr.length === 1) {
-          const dpId = +arr[0];
-          const dpValue = dpsInfo[arr[0]];
-          // 这里的 149 为固定 dpId, 无需进行根据 code 获取
-          if (dpId === 149 && !dpValue) {
-            // 进入到面板中,低功耗产品上报休眠, 进行标记
-            setWirelessFlag(true);
-          }
-        }
-      }
-    });
+    onDpDataChange(handleDpDataChange);
   }, []);
-  usePageEvent('onHide', async () => {
+  usePageEvent('onHide', useMemoizedFn(async () => {
     setPlayState(d => {
       d.loadingState = true;
     });
+    if (ignoreHideStopPreview) {
+      return;
+    }
     // 先停流
     stopPreview();
     // await getCurMute();
-  });
+  }));
   useMount(() => {
     onNetworkStatusChange(res => {
       setPhoneNetworkConnect(res.isConnected);
@@ -204,6 +194,22 @@ const Player = props => {
       console.log(res);
     });
   });
+  const handleDpDataChange = useMemoizedFn(res => {
+    if (res.deviceId === devId) {
+      const dpsInfo = res.dps;
+      const arr = Object.keys(dpsInfo);
+      if (arr.length === 1) {
+        const dpId = +arr[0];
+        const dpValue = dpsInfo[arr[0]];
+        console.log(privateState, 'privateState');
+        // 这里的 149 为固定 dpId, 无需进行根据 code 获取
+        if (dpId === 149 && !dpValue && !privateState) {
+          // 进入到面板中,低功耗产品上报休眠, 进行标记
+          setWirelessFlag(true);
+        }
+      }
+    }
+  });
   const handleMqttMessage = useMemoizedFn(event => {
     var _event$messageData;
     if ((event === null || event === void 0 ? void 0 : event.protocol) === 1 && event !== null && event !== void 0 && (_event$messageData = event.messageData) !== null && _event$messageData !== void 0 && _event$messageData.online) {
@@ -318,6 +324,9 @@ const Player = props => {
       } else if (playState.initLy && !privateState) {
         ipcTTTOperatorLog("VID: privateState_status_change: ".concat(privateState));
         retry();
+      } else if (playState.initLy && privateState) {
+        // 如果隐私模式为true, 主动推一波流变化的状态码，适配ios不触发connectChange的情况
+        onChangeStreamStatus && onChangeStreamStatus(-1001);
       }
     }
   }, [phoneNetworkConnect, onlineStatus, playState.initLy, privateState]);
@@ -713,7 +722,7 @@ const Player = props => {
         errCode,
         errorCode
       } = data === null || data === void 0 ? void 0 : data.detail;
-      const codeValue = errCode || errorCode;
+      const codeValue = errCode !== undefined ? errCode : errorCode;
       if (deviceId) {
         if (deviceId === devId) {
           setVideoErrCode(codeValue);

package/lib/typings/index.d.ts

@@ -18,6 +18,24 @@ export type IProps = {
    * @default true
    */
   onlineStatus: boolean;
+  /**
+   * @description.en brandColor
+   * @description.zh 品牌色
+   * @default true
+   */
+  brandColor: string;
+  /**
+   * @description.en renderErrIcon
+   * @description.zh 自定义渲染错误图标
+   * @default true
+   */
+  renderErrIcon?: () => React.ReactNode;
+  /**
+   * @description.en isShare
+   * @description.zh 是否为分享设备
+   * @default true
+   */
+  isShare: string;
   /**
    * @description.en privateState
    * @description.zh 隐私模式
@@ -32,10 +50,16 @@ export type IProps = {
   defaultMute?: boolean;
   /**
    * @description.en clarity
-   * @description.zh 清晰度 normal：标清，hd：高清
+   * @description.zh 清晰度 normal：标清，hd：高清 ss: 省流 ud: 超清 ssp: 超高清 auto: 自动 audio: 音频
+   * @default "normal"
+   */
+  clarity?: 'normal' | 'hd' | 'ss' | 'ud' | 'ssp' | 'auto' | 'audio';
+  /**
+   * @description.en ipcPlayerContext
+   * @description.zh 播放器上下文
    * @default "normal"
    */
-  clarity?: 'normal' | 'hd';
+  ipcPlayerContext?: any;
   /**
    * @description.en updateLayout
    * @description.zh 外层父节点样式变化，播放器监听不到，需要主动触发播放器视图更新，每次需要设置不同的字符串值
@@ -48,6 +72,30 @@ export type IProps = {
    * @default (data) => void
    */
   onChangeStreamStatus?: (data) => void;
+  /**
+   * @description.en onPlayerContainerTap
+   * @description.zh 点击视频播放器区域
+   * @default (data) => void
+   */
+  onPlayerContainerTap?: (data) => void;
+  /**
+   * @description.en onZoomChange
+   * @description.zh 视频播放器比例变化
+   * @default (data) => void
+   */
+  onZoomChange?: (data) => void;
+  /**
+   * @description.en onCameraPreviewFailure
+   * @description.zh 视频错误码回调
+   * @default (data) => void
+   */
+  onCameraPreviewFailure?: (data) => void;
+  /**
+   * @description.en onCameraNotifyWeakNetwork
+   * @description.zh 弱网检测回调
+   * @default (data) => void
+   */
+  onCameraNotifyWeakNetwork?: (data) => void;
   /**
    * @description.en onCtx
    * @description.zh 获取ipcPlayer实例ctx以及重试方法retry
@@ -132,4 +180,10 @@ export type IProps = {
    * @default {}
    */
   awakeStatus?: boolean | undefined;
+  /**
+   * @description.en needReconnect
+   * @description.zh 是否需要唤醒
+   * @default {}
+   */
+  ignoreHideStopPreview: boolean;
 };

package/package.json

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