@ray-js/ipc-player-integration 0.0.52-beta.0 → 0.0.52-beta.1

package/lib/ctx/ctx.composition.js

@@ -6,6 +6,7 @@ import { IntercomMode, MuteMode, ClarityType } from '@ray-js/ray-ipc-utils/lib/i
 import { createUseCtx } from './ctx';
 import { FullSmallIntercom, VerticalSmallIntercom, BatteryFull, Battery, Screenshot, TempHumidity, Signal4G, RecordVideo, FullScreen, VideoBitKBP, Muted, Floodlight, Siren, TryExperience, Resolution, Ptz, MultiPtz, TileTip, PtzMoveableTip, LandscapeTip, TileActions, MoveablePtzControl, SwitchLayout, ToggleVerticalFull, RealTimeMagnification, ZoomTurntableEntry } from '../widgets';
 import { authorizeStatus } from '../utils/authorize';
+import { PlayState } from '../interface';
 import { landscapeTipId, moveablePtzControlId, multiPtzId, ptzMoveableTipId, tileActionsId, tileTipId } from '../ui/constant';
 import { multiPrefix } from '../widgets/multiCamera/constants';
 const createPlayContext = ty.createIpcPlayerContext;
@@ -87,20 +88,29 @@ export const defaultBottomRightContent = [{
   content: FullScreen
 }];
 const absoluteContent = [];
+const renderWhenPlaying = _ref => {
+  let {
+    playState
+  } = _ref;
+  return playState === PlayState.PLAYING;
+};
 export const multiCameraAbsoluteContent = [{
   id: tileTipId,
   content: TileTip,
   absoluteContentClassName: `${multiPrefix}-tile-tip-wrap`,
+  renderWhen: renderWhenPlaying,
   hidden: true
 }, {
   id: ptzMoveableTipId,
   content: PtzMoveableTip,
   absoluteContentClassName: `${multiPrefix}-tile-tip-wrap`,
+  renderWhen: renderWhenPlaying,
   hidden: true
 }, {
   id: landscapeTipId,
   content: LandscapeTip,
   absoluteContentClassName: `${multiPrefix}-tile-tip-wrap`,
+  renderWhen: renderWhenPlaying,
   hidden: true
 }, {
   id: tileActionsId,
@@ -112,12 +122,12 @@ export const multiCameraAbsoluteContent = [{
   absoluteNoCoverView: true,
   hidden: true
 }];
-const toast = _ref => {
+const toast = _ref2 => {
   let {
       title,
       duration
-    } = _ref,
-    config = _objectWithoutProperties(_ref, _excluded);
+    } = _ref2,
+    config = _objectWithoutProperties(_ref2, _excluded);
   ty.showToast(_objectSpread({
     title,
     duration,

package/lib/interface.d.ts

@@ -121,8 +121,12 @@ export type ComponentConfig<T = ReturnType<UseCtx> & Record<string, any>> = {
     absoluteContentClassName?: string;
     absoluteContentStyle?: React.CSSProperties;
     absoluteNoCoverView?: boolean;
+    renderWhen?: (state: ComponentRenderState) => boolean;
     hidden?: boolean;
 };
+export type ComponentRenderState = {
+    playState: PlayState;
+};
 export type ComponentConfigProps = {
     IPCPlayerContext: IpcContext;
 } & ReturnType<UseCtx>;

package/lib/ui/absoluteContent.d.ts

@@ -0,0 +1,2 @@
+import type { ComponentConfig, ComponentRenderState } from '../interface';
+export declare function shouldRenderContent<T>(item: ComponentConfig<T>, state: ComponentRenderState): boolean;

package/lib/ui/absoluteContent.js

@@ -0,0 +1,3 @@
+export function shouldRenderContent(item, state) {
+  return !item.hidden && (!item.renderWhen || item.renderWhen(state));
+}

package/lib/ui/ui.js

@@ -26,6 +26,7 @@ import { updatePlayerWidgetProps } from '../features';
 import { getNgRawData, getSmartImageQualityState, isLowPhone } from '../utils/ttt';
 import { getCaptureResultSummary } from '../utils/captureResult';
 import { lensCount } from '../widgets/zoomTurntable/lensSkill';
+import { shouldRenderContent } from './absoluteContent';
 function getCtxInstance(instance, devId) {
   if (instance) return instance;
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -1212,13 +1213,16 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
   }, renderBottomRightContent))), (() => {
     if (!absoluteContent || !(absoluteContent !== null && absoluteContent !== void 0 && absoluteContent.length)) return null;
     return absoluteContent.map(item => {
-      if (item.hidden) return null;
+      if (!shouldRenderContent(item, {
+        playState
+      })) return null;
+      const contentProps = _objectSpread(_objectSpread(_objectSpread({
+        key: item.id
+      }, item.initProps), instance), {}, {
+        IPCPlayerContext: instance.IPCPlayerInstance
+      });
       if (item.absoluteNoCoverView) {
-        return /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread(_objectSpread({
-          key: item.id
-        }, item.initProps), instance), {}, {
-          IPCPlayerContext: instance.IPCPlayerInstance
-        }));
+        return /*#__PURE__*/React.createElement(item.content, contentProps);
       }
       return /*#__PURE__*/React.createElement(CoverView, {
         key: item.id,
@@ -1226,10 +1230,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
           position: 'absolute'
         }, item.absolutePosition),
         className: item.absoluteContentClassName
-      }, /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread(_objectSpread({
-        key: item.id
-      }, item.initProps), instance), {}, {
-        IPCPlayerContext: instance.IPCPlayerInstance,
+      }, /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread({}, contentProps), {}, {
         // 添加通用变量单独组件类名
         className: clsx('absolute-item-container')
       })));

package/lib/widgets/zoomTurntable/lensSkill.js

@@ -126,7 +126,10 @@ export const isSwitchChannelSupported = () => {
   const supported = typeof ((_ty = ty) === null || _ty === void 0 || (_ty = _ty.ipc) === null || _ty === void 0 ? void 0 : _ty.switchChannel) === 'function';
   if (!supported && !switchChannelMissingLogged) {
     switchChannelMissingLogged = true;
-    console.warn('[zoomTurntable] 宿主不支持 ty.ipc.switchChannel，焦距转盘入口不展示');
+    // 只能用 log：本判定会在 render 期被调用，而 IDE 宿主下 render 期的 console.warn
+    // 会打坏 Ray 运行时，整个面板崩在 areHookInputsEqual / TDZ —— 且症状伪装成
+    // 「hook 顺序错位」（报 change in the order of Hooks），极难归因，勿改回 warn
+    console.log('[zoomTurntable] 宿主不支持 ty.ipc.switchChannel，焦距转盘入口不展示');
     dumpChannelApis();
   }
   return supported;

package/package.json

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