@ray-js/ipc-player-integration 0.0.49-beta.2 → 0.0.49-beta.4

package/lib/ui/bottomLeftContent.js

@@ -1,11 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.find.js";
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { CoverView, ScrollView, View } from '@ray-js/ray';
 import clsx from 'clsx';
 import { useStore } from '../ctx/store';
 import { useComponentHideState } from './hooks';
+import { UIEventContext } from './context';
 import { TrialBadge, useTrialBadge } from '../widgets/trialBadge';
 import { pauseTimeToHideAllComponent, startTimeToHideAllComponent } from './constant';
 
@@ -59,6 +60,11 @@ const BottomLeftContent = _ref => {
     return (_gRawData = tryExp === null || tryExp === void 0 || (_tryExp$initProps5 = tryExp.initProps) === null || _tryExp$initProps5 === void 0 ? void 0 : _tryExp$initProps5.gRawData) !== null && _gRawData !== void 0 ? _gRawData : false;
   }, [bottomLeftContent]);
   const [shouldHide] = useComponentHideState();
+  // 透明隐藏只跟随真实隐藏态：refreshElement 重测脉冲仍走 shouldHide 驱动 ±1px 高度，
+  // 但不应把工具栏短暂隐掉，否则缩起/展开等触发重测时会肉眼可见地闪一下
+  const {
+    componentHideState
+  } = useContext(UIEventContext);
   const {
     showTrialBadge,
     handleTrialSubscribe,
@@ -231,8 +237,8 @@ const BottomLeftContent = _ref => {
       display: 'flex',
       flexDirection: 'column',
       justifyContent: 'flex-start',
-      opacity: shouldHide ? 0 : 1,
-      pointerEvents: shouldHide ? 'none' : 'auto'
+      opacity: componentHideState ? 0 : 1,
+      pointerEvents: componentHideState ? 'none' : 'auto'
     }
   }, showBadge && /*#__PURE__*/React.createElement(View, {
     style: {

package/lib/ui/ui.js

@@ -434,6 +434,18 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     };
   }, [handDisablePlayerTap]);
 
+  // 缩起/展开后四角 CoverView 的原生热区不随布局高度变化重测，停留在旧位置吞掉点击（首次缩起必现）；
+  // 复用 refreshElement 通道翻转各 wrap 的 ±1px 重排跟位。120ms：iOS 原生异步测量 50ms 内可能不落盘。
+  const [regionRefresh, setRegionRefresh] = useState(false);
+  useEffect(() => {
+    // 仅竖屏下发：缩起/展开只存在于竖屏；旋转进横屏也会翻转 isVerticalFullLayout，
+    // 脉冲会打断横屏 widget（ptz/对讲等）0.3s 出入场动画。从 store 同步读，避开 React 提交顺序竞态
+    if (getDefaultStore().get(instance.screenType) !== 'vertical') return undefined;
+    setRegionRefresh(true);
+    const nudgeTimer = setTimeout(() => setRegionRefresh(false), 120);
+    return () => clearTimeout(nudgeTimer);
+  }, [isVerticalFullLayout]);
+
   // 竖屏全屏副作用处理
   useEffect(() => {
     if (isVerticalFullLayout && screenType === 'vertical') {
@@ -577,25 +589,18 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       } = sizeData;
 
       // 折叠屏展开/收起、pad 多窗口拖拽等场景，需要重新计算并同步
-      const small = computeIsSmallScreen();
-      setIsSmallScreen(small);
-
-      //  针对pad 和折叠屏展开的情况暂不支持横屏，且在ios pad模式下 会触发onResize事件, 待解决
-      if (small) {
-        setScreenType('vertical');
-      } else {
-        setScreenType(type === 'landscape' ? 'full' : 'vertical');
-        if (type === 'landscape') {
-          // 记录切换横屏前的竖屏全屏状态
-          prevVerticalFullLayoutRef.current = isVerticalFullLayout;
-          // 横屏时重置竖屏全屏状态
-          updateAtom(instance.isVerticalFullLayout, false);
-        } else if (!instance.multiCameraCtx.isSupport) {
-          // 单目设备从横屏切回竖屏时，恢复之前的竖屏全屏状态
-          updateAtom(instance.isVerticalFullLayout, prevVerticalFullLayoutRef.current);
-        }
-        triggerEvent(showAllComponent);
+      setIsSmallScreen(computeIsSmallScreen());
+      setScreenType(type === 'landscape' ? 'full' : 'vertical');
+      if (type === 'landscape') {
+        // 记录切换横屏前的竖屏全屏状态
+        prevVerticalFullLayoutRef.current = isVerticalFullLayout;
+        // 横屏时重置竖屏全屏状态
+        updateAtom(instance.isVerticalFullLayout, false);
+      } else if (!instance.multiCameraCtx.isSupport) {
+        // 单目设备从横屏切回竖屏时，恢复之前的竖屏全屏状态
+        updateAtom(instance.isVerticalFullLayout, prevVerticalFullLayoutRef.current);
       }
+      triggerEvent(showAllComponent);
       // 横屏（fill/standard）与竖屏均统一调整为 1 倍缩放，保证画面完整展示
       setScaleMultiple(1);
     } catch (err) {
@@ -916,7 +921,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     value: {
       event: eventRef.current,
       componentHideState,
-      refreshElement
+      refreshElement: refreshElement || regionRefresh
     }
   }, /*#__PURE__*/React.createElement(View, {
     className: clsx('ipc-player-content', isSmallScreen && 'ipc-player-content-small-screen', className),

package/package.json

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