@ray-js/ipc-player-integration 0.0.39 → 0.0.40-beta.1

package/lib/ui/bottomRightContent.js

@@ -32,7 +32,7 @@ const BottomRightContent = _ref => {
     className: clsx('ipc-player-bottom-right-content-wrap'),
     style: _objectSpread({
       paddingLeft: screenType === 'vertical' ? '10px' : '0',
-      height: screenType === 'vertical' ? shouldHide ? '49px' : '48px' : shouldHide ? '84px' : '83px'
+      height: screenType === 'vertical' ? shouldHide ? '49px' : '48px' : shouldHide ? '59px' : '58px'
     }, widthStyle)
   }, /*#__PURE__*/React.createElement(View, {
     style: {

package/lib/ui/ui.js

@@ -11,7 +11,7 @@ import IPCPlayer from '@ray-js/ray-ipc-player';
 import { ipcTTTOperatorLog } from '@ray-js/ray-ipc-utils';
 import { PlayState, PlayerStreamStatus, MultiCameraScreenMode } from '../interface';
 import { useCtx } from '../ctx/ctx.composition';
-import { useStore, updateAtom } from '../ctx/store';
+import { useStore, updateAtom, getDefaultStore } from '../ctx/store';
 import { UIEventContext } from './context';
 import { showAllComponent, hideAllComponent, playerTap, startTimeToHideAllComponent, pauseTimeToHideAllComponent, decodeClarityDic, changeIgnoreHideStopPreview, moveablePtzControlId, tileActionsId, tileTipId, landscapeTipId, multiPtzId, ptzMoveableTipId, showFlowLowTipId, zoomLevelChange, setScaleMultipleEvent, trialCountdownEnd, refreshSmartImageQualityEvent } from './constant';
 import BottomLeftContent from './bottomLeftContent';
@@ -421,6 +421,19 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
 
   /* ---------------------------------多目相关副作用统一处理结束----------------------------------------- */
 
+  const disablePlayerTap = useRef(false);
+  const handDisablePlayerTap = useMemoizedFn(value => {
+    disablePlayerTap.current = !!value;
+  });
+
+  // 须在竖屏全屏 effect 之前注册，否则多目首帧 emit('disablePlayerTap') 时 listener 尚未挂载
+  useEffect(() => {
+    eventRef.current.on('disablePlayerTap', handDisablePlayerTap);
+    return () => {
+      eventRef.current.off('disablePlayerTap', handDisablePlayerTap);
+    };
+  }, [handDisablePlayerTap]);
+
   // 竖屏全屏副作用处理
   useEffect(() => {
     if (isVerticalFullLayout && screenType === 'vertical') {
@@ -768,15 +781,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     });
     instance.changeStreamStatus(code);
   });
-  const disablePlayerTap = useRef(false);
-  // 标记正在执行隐藏，防止 playerTap 子组件监听触发 showAllComponent 干扰隐藏
   const isHidingByTapRef = useRef(false);
   const hasInitializedLandscapeMultiRef = useRef(false);
   const multiTapTimerRef = useRef(null);
   const prevSelectedIndexRef = useRef(selectedLenInfo.index);
-  const handDisablePlayerTap = value => {
-    disablePlayerTap.current = !!value;
-  };
   /**
    * 展示所有组件，一段时间后自动关闭
    */
@@ -812,8 +820,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     // 重新开始计时
     // @ts-ignore
     timer.current = setTimeout(() => {
-      // 竖屏全屏模式下控件常驻，不触发隐藏
-      if (isVerticalFullLayout && screenType === 'vertical') return;
+      // 定时器触发时从 store 读最新状态，避免启动时闭包拿到过期的 isVerticalFullLayout
+      const store = getDefaultStore();
+      if (store.get(instance.isVerticalFullLayout) && store.get(instance.screenType) === 'vertical') return;
       triggerEvent(hideAllComponent);
     }, HIDE_COMPONENT_TIME);
   });
@@ -845,7 +854,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     eventRef.current.on(pauseTimeToHideAllComponent, listenPause);
     eventRef.current.on(showAllComponent, listenShowEvent);
     eventRef.current.on(hideAllComponent, listenHideEvent);
-    eventRef.current.on('disablePlayerTap', handDisablePlayerTap);
     eventRef.current.on('refreshBottomLeft', refreshBottomLeft);
     eventRef.current.on(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
     eventRef.current.on(setScaleMultipleEvent, onSetScaleMultiple);
@@ -856,7 +864,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
       eventRef.current.off(pauseTimeToHideAllComponent, listenPause);
       eventRef.current.off(showAllComponent, listenShowEvent);
       eventRef.current.off(hideAllComponent, listenHideEvent);
-      eventRef.current.off('disablePlayerTap', handDisablePlayerTap);
       eventRef.current.off('refreshBottomLeft', refreshBottomLeft);
       eventRef.current.off(changeIgnoreHideStopPreview, onChangeIgnoreHideStopPreview);
       eventRef.current.off(setScaleMultipleEvent, onSetScaleMultiple);

package/package.json

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