@ray-js/ipc-player-integration 0.0.53-beta.3 → 0.0.53-beta.5

package/lib/ctx/ctx.js

@@ -12,6 +12,7 @@ import { changeIgnoreHideStopPreview } from '../ui/constant';
 import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 import { getEventInstance } from './event';
 import { isMultiCameraTileSupported, useMultiCameraCtx } from './multiCameraCtx';
+import { isClarityChangedSupported } from '../utils/ttt';
 const SAVE_TO_ALBUM = 1;
 export const createUseCtx = _ref => {
   let {
@@ -111,12 +112,21 @@ export const createUseCtx = _ref => {
     }
 
     /**
-     * 自动清晰度作为独立档位并入清晰度列表：
+     * 只有宿主支持自动清晰度事件，且接口返回的清晰度档位数量不少于 2 个时，才展示 AUTO：
      * 竖屏宿主弹框（由 resolutionList 构建 actionData）与横屏 FullResolutionControl 共用。
      */
+    const canShowAutoClarity = function () {
+      let list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      return isClarityChangedSupported() && list.length >= 2;
+    };
     const withAutoClarity = function () {
       let list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      return list.includes(ClarityType.AUTO) ? list : [...list, ClarityType.AUTO];
+      const withoutAuto = list.filter(clarity => clarity !== ClarityType.AUTO);
+      return canShowAutoClarity(list) ? [...withoutAuto, ClarityType.AUTO] : withoutAuto;
+    };
+    const normalizeResolution = (resolution, list) => {
+      if (resolution !== ClarityType.AUTO || canShowAutoClarity(list)) return resolution;
+      return list.find(clarity => clarity !== ClarityType.AUTO) || ClarityType.HD;
     };
     useEffect(() => {
       // 初始化获取缓存值
@@ -127,7 +137,7 @@ export const createUseCtx = _ref => {
           var _res$maxZoomSettings;
           const res = await getMemoryState(devId);
           setResolutionList(withAutoClarity(res.resolutionList));
-          _setResolution(res.resolution, true);
+          _setResolution(normalizeResolution(res.resolution, res.resolutionList), true);
           _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
           setIntercomSupported(res.isIntercomSupported);
@@ -144,7 +154,7 @@ export const createUseCtx = _ref => {
           var _res$maxZoomSettings2;
           setResolutionList(withAutoClarity(res.resolutionList));
           // 传true表示值即可,会取播放器的值
-          _setResolution(res.resolution, true);
+          _setResolution(normalizeResolution(res.resolution, res.resolutionList), true);
           _setMute(res.mute, true);
           setIntercomMode(res.intercomMode);
           setIntercomSupported(res.isIntercomSupported);

package/lib/widgets/resolution/resolution.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { View, Text } from '@ray-js/ray';
 import clsx from 'clsx';
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useRef } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
 import Strings from '../../i18n';
@@ -31,6 +31,7 @@ export const Resolution = props => {
   const {
     event
   } = useContext(UIEventContext);
+  const autoClarityRef = useRef(null);
 
   // 广播自动清晰度状态给 VideoBitKBP 等监听方；
   // 自动模式下监听当前实际清晰度，仅用于码率区域展示。
@@ -42,15 +43,18 @@ export const Resolution = props => {
       });
     };
     if (resolution !== ClarityType.AUTO) {
+      autoClarityRef.current = null;
       emitClarity(false, null);
       return undefined;
     }
-    emitClarity(true, null);
+    // 横竖屏切换会重新布局码率区域，重放最近一次实际清晰度，避免前缀丢失。
+    emitClarity(true, autoClarityRef.current);
     if (!devId) return undefined;
     return subscribeClarityChanged(devId, res => {
+      autoClarityRef.current = res.clarity;
       emitClarity(true, res.clarity);
     });
-  }, [devId, event, resolution]);
+  }, [devId, event, resolution, screenType]);
   const onResolution = useMemoizedFn(() => {
     event.emit(widgetClick, {
       widgetId: widgetLabs.RESOLUTION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.53-beta.3",
+  "version": "0.0.53-beta.5",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [