@ray-js/ipc-player-integration 0.0.57-beta.0 → 0.0.58-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (118) hide show
  1. package/README.md +0 -6
  2. package/lib/ctx/ctx.album.test.d.ts +1 -0
  3. package/lib/ctx/ctx.album.test.js +197 -0
  4. package/lib/ctx/ctx.composition.js +19 -4
  5. package/lib/ctx/ctx.js +106 -55
  6. package/lib/ctx/ports.output.d.ts +1 -0
  7. package/lib/ctx/resolution.d.ts +1 -1
  8. package/lib/ctx/resolution.js +9 -1
  9. package/lib/ctx/useAutoClarityConfig.d.ts +8 -0
  10. package/lib/ctx/useAutoClarityConfig.js +40 -0
  11. package/lib/i18n/index.d.ts +12 -0
  12. package/lib/i18n/strings.d.ts +6 -0
  13. package/lib/i18n/strings.js +6 -0
  14. package/lib/index.d.ts +0 -4
  15. package/lib/index.js +1 -3
  16. package/lib/interface.d.ts +16 -3
  17. package/lib/ui/absoluteContent.d.ts +2 -0
  18. package/lib/ui/absoluteContent.js +3 -0
  19. package/lib/ui/bottomLeftContent.js +17 -60
  20. package/lib/ui/bottomRightContent.js +3 -6
  21. package/lib/ui/ui.d.ts +0 -5
  22. package/lib/ui/ui.js +45 -60
  23. package/lib/utils/captureResult.d.ts +14 -0
  24. package/lib/utils/captureResult.js +70 -0
  25. package/lib/utils/captureResult.test.d.ts +1 -0
  26. package/lib/utils/captureResult.test.js +117 -0
  27. package/lib/utils/productAbility.d.ts +6 -0
  28. package/lib/utils/productAbility.js +20 -0
  29. package/lib/utils/ttt.js +2 -8
  30. package/lib/widgets/battery/battery.js +1 -2
  31. package/lib/widgets/battery/batteryFull.js +1 -2
  32. package/lib/widgets/captureResult/captureResult.d.ts +16 -0
  33. package/lib/widgets/captureResult/captureResult.js +85 -0
  34. package/lib/widgets/captureResult/captureResult.less +144 -0
  35. package/lib/widgets/captureResult/captureResult.test.d.ts +1 -0
  36. package/lib/widgets/captureResult/captureResult.test.js +80 -0
  37. package/lib/widgets/captureResult/index.d.ts +2 -0
  38. package/lib/widgets/captureResult/index.js +2 -0
  39. package/lib/widgets/floodlight/floodlight.js +1 -2
  40. package/lib/widgets/flowLowTip/flowLowTip.js +1 -2
  41. package/lib/widgets/fullScreen/fullScreen.js +1 -2
  42. package/lib/widgets/fullScreen/fullTravelRouteControl.d.ts +1 -1
  43. package/lib/widgets/fullScreen/fullTravelRouteControl.js +1 -1
  44. package/lib/widgets/fullScreen/verticalScreen.js +1 -2
  45. package/lib/widgets/index.d.ts +1 -0
  46. package/lib/widgets/index.js +2 -1
  47. package/lib/widgets/moveInteractiveControl/controlButton.js +1 -2
  48. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.js +3 -12
  49. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.less +4 -24
  50. package/lib/widgets/multiCamera/landscapeTip.js +1 -2
  51. package/lib/widgets/multiCamera/moveablePtzControl.js +1 -1
  52. package/lib/widgets/multiCamera/multiPtz.js +1 -2
  53. package/lib/widgets/multiCamera/ptzMoveableTip.js +1 -2
  54. package/lib/widgets/multiCamera/switchLayout.js +1 -2
  55. package/lib/widgets/multiCamera/tileMultiPtz.js +1 -2
  56. package/lib/widgets/multiCamera/tileSwitchLayout.js +1 -2
  57. package/lib/widgets/multiCamera/tileTip.js +1 -2
  58. package/lib/widgets/muted/muted.js +10 -5
  59. package/lib/widgets/muted/muted.less +5 -1
  60. package/lib/widgets/muted/muted.test.d.ts +1 -0
  61. package/lib/widgets/muted/muted.test.js +81 -0
  62. package/lib/widgets/ptz/ptz.js +1 -2
  63. package/lib/widgets/ptz/ptzControl.js +1 -1
  64. package/lib/widgets/ptzControlTip/ptzControlTip.js +3 -6
  65. package/lib/widgets/ptzControlTip/ptzControlTip.less +0 -6
  66. package/lib/widgets/realTimeMagnification/realTimeMagnification.js +1 -2
  67. package/lib/widgets/recordVideo/recordVideo.js +50 -36
  68. package/lib/widgets/recordVideo/recordVideo.less +17 -74
  69. package/lib/widgets/recordVideo/recordVideo.test.js +1 -0
  70. package/lib/widgets/resolution/fullResolutionControl.js +19 -29
  71. package/lib/widgets/resolution/resolution.js +2 -3
  72. package/lib/widgets/screenshot/screenshot.js +66 -45
  73. package/lib/widgets/screenshot/screenshot.less +1 -40
  74. package/lib/widgets/screenshot/screenshot.test.d.ts +1 -0
  75. package/lib/widgets/screenshot/screenshot.test.js +120 -0
  76. package/lib/widgets/signal4G/signal4G.js +1 -4
  77. package/lib/widgets/siren/siren.js +1 -2
  78. package/lib/widgets/tempHumidity/tempHumidity.js +1 -2
  79. package/lib/widgets/toggleVerticalFull/toggleVerticalFull.js +1 -2
  80. package/lib/widgets/trialBadge/index.js +3 -8
  81. package/lib/widgets/trialBadge/index.less +0 -24
  82. package/lib/widgets/tryExperience/tryExperience.js +1 -3
  83. package/lib/widgets/videoBitKBP/videoBitKBP.js +1 -2
  84. package/lib/widgets/voiceIntercom/voiceIntercom.js +24 -50
  85. package/lib/widgets/voiceIntercom/voiceIntercom.less +0 -16
  86. package/lib/widgets/zoomTurntable/turntable/index.d.ts +7 -5
  87. package/lib/widgets/zoomTurntable/turntable/index.js +1 -2
  88. package/lib/widgets/zoomTurntable/zoomTurntableEntry.js +1 -2
  89. package/lib/widgets/zoomTurntable/zoomTurntableTip.js +1 -2
  90. package/package.json +8 -15
  91. package/lib/renderer/capabilities.d.ts +0 -8
  92. package/lib/renderer/capabilities.js +0 -19
  93. package/lib/renderer/context.d.ts +0 -5
  94. package/lib/renderer/context.js +0 -6
  95. package/lib/renderer/directionControl.d.ts +0 -6
  96. package/lib/renderer/directionControl.js +0 -3
  97. package/lib/renderer/font.less +0 -5
  98. package/lib/renderer/glyphs.d.ts +0 -1
  99. package/lib/renderer/glyphs.js +0 -256
  100. package/lib/renderer/index.module.less +0 -48
  101. package/lib/renderer/ptzZoom.d.ts +0 -6
  102. package/lib/renderer/ptzZoom.js +0 -3
  103. package/lib/renderer/text.d.ts +0 -4
  104. package/lib/renderer/text.js +0 -32
  105. package/lib/renderer/text.module.less +0 -4
  106. package/lib/renderer/viewport.d.ts +0 -7
  107. package/lib/renderer/viewport.js +0 -24
  108. package/lib/res/lynx-signal/index.d.ts +0 -1
  109. package/lib/res/lynx-signal/index.js +0 -22
  110. package/lib/res/lynx-signal/signalFour0.png +0 -0
  111. package/lib/res/lynx-signal/signalFour1.png +0 -0
  112. package/lib/res/lynx-signal/signalFour2.png +0 -0
  113. package/lib/res/lynx-signal/signalFour3.png +0 -0
  114. package/lib/res/lynx-signal/signalFour4.png +0 -0
  115. package/lib/res/lynx-signal/signalThree0.png +0 -0
  116. package/lib/res/lynx-signal/signalThree1.png +0 -0
  117. package/lib/res/lynx-signal/signalThree2.png +0 -0
  118. package/lib/res/lynx-signal/signalThree3.png +0 -0
@@ -10,8 +10,11 @@ declare const Strings: kit.I18N<{
10
10
  ipc_player_resolution_AUDIO: string;
11
11
  ipc_player_current_resolution_is_equal: string;
12
12
  ipc_player_screenshot_success_tip: string;
13
+ ipc_player_screenshot_multi_success_tip: string;
13
14
  ipc_player_error_screenshot_error_tip: string;
14
15
  ipc_player_record_success_tip: string;
16
+ ipc_player_record_multi_success_tip: string;
17
+ ipc_player_multi_capture_success_count: string;
15
18
  ipc_player_shot_success_check: string;
16
19
  ipc_player_record_success_check: string;
17
20
  ipc_player_recording_now_tip: string;
@@ -52,8 +55,11 @@ declare const Strings: kit.I18N<{
52
55
  ipc_player_resolution_AUDIO: string;
53
56
  ipc_player_current_resolution_is_equal: string;
54
57
  ipc_player_screenshot_success_tip: string;
58
+ ipc_player_screenshot_multi_success_tip: string;
55
59
  ipc_player_error_screenshot_error_tip: string;
56
60
  ipc_player_record_success_tip: string;
61
+ ipc_player_record_multi_success_tip: string;
62
+ ipc_player_multi_capture_success_count: string;
57
63
  ipc_player_shot_success_check: string;
58
64
  ipc_player_record_success_check: string;
59
65
  ipc_player_recording_now_tip: string;
@@ -94,8 +100,11 @@ declare const Strings: kit.I18N<{
94
100
  ipc_player_resolution_AUDIO: string;
95
101
  ipc_player_current_resolution_is_equal: string;
96
102
  ipc_player_screenshot_success_tip: string;
103
+ ipc_player_screenshot_multi_success_tip: string;
97
104
  ipc_player_error_screenshot_error_tip: string;
98
105
  ipc_player_record_success_tip: string;
106
+ ipc_player_record_multi_success_tip: string;
107
+ ipc_player_multi_capture_success_count: string;
99
108
  ipc_player_shot_success_check: string;
100
109
  ipc_player_record_success_check: string;
101
110
  ipc_player_recording_now_tip: string;
@@ -135,8 +144,11 @@ declare const Strings: kit.I18N<{
135
144
  ipc_player_resolution_AUDIO: string;
136
145
  ipc_player_current_resolution_is_equal: string;
137
146
  ipc_player_screenshot_success_tip: string;
147
+ ipc_player_screenshot_multi_success_tip: string;
138
148
  ipc_player_error_screenshot_error_tip: string;
139
149
  ipc_player_record_success_tip: string;
150
+ ipc_player_record_multi_success_tip: string;
151
+ ipc_player_multi_capture_success_count: string;
140
152
  ipc_player_shot_success_check: string;
141
153
  ipc_player_record_success_check: string;
142
154
  ipc_player_recording_now_tip: string;
@@ -9,8 +9,11 @@ declare const _default: {
9
9
  ipc_player_resolution_AUDIO: string;
10
10
  ipc_player_current_resolution_is_equal: string;
11
11
  ipc_player_screenshot_success_tip: string;
12
+ ipc_player_screenshot_multi_success_tip: string;
12
13
  ipc_player_error_screenshot_error_tip: string;
13
14
  ipc_player_record_success_tip: string;
15
+ ipc_player_record_multi_success_tip: string;
16
+ ipc_player_multi_capture_success_count: string;
14
17
  ipc_player_shot_success_check: string;
15
18
  ipc_player_record_success_check: string;
16
19
  ipc_player_recording_now_tip: string;
@@ -51,8 +54,11 @@ declare const _default: {
51
54
  ipc_player_resolution_AUDIO: string;
52
55
  ipc_player_current_resolution_is_equal: string;
53
56
  ipc_player_screenshot_success_tip: string;
57
+ ipc_player_screenshot_multi_success_tip: string;
54
58
  ipc_player_error_screenshot_error_tip: string;
55
59
  ipc_player_record_success_tip: string;
60
+ ipc_player_record_multi_success_tip: string;
61
+ ipc_player_multi_capture_success_count: string;
56
62
  ipc_player_shot_success_check: string;
57
63
  ipc_player_record_success_check: string;
58
64
  ipc_player_recording_now_tip: string;
@@ -9,8 +9,11 @@ export default {
9
9
  ipc_player_resolution_AUDIO: 'Audio Mode',
10
10
  ipc_player_current_resolution_is_equal: 'Already at current clarity',
11
11
  ipc_player_screenshot_success_tip: 'Screenshot saved to album',
12
+ ipc_player_screenshot_multi_success_tip: 'Screenshots saved to album',
12
13
  ipc_player_error_screenshot_error_tip: 'Screenshot failed. Please try again later.',
13
14
  ipc_player_record_success_tip: 'Recording saved to album',
15
+ ipc_player_record_multi_success_tip: 'Recordings saved to album',
16
+ ipc_player_multi_capture_success_count: '{0} items',
14
17
  ipc_player_shot_success_check: 'View',
15
18
  ipc_player_record_success_check: 'View',
16
19
  ipc_player_recording_now_tip: 'Recording in progress...',
@@ -51,8 +54,11 @@ export default {
51
54
  ipc_player_resolution_AUDIO: '音频模式',
52
55
  ipc_player_current_resolution_is_equal: '已是当前清晰度',
53
56
  ipc_player_screenshot_success_tip: '截图已保存在APP相册',
57
+ ipc_player_screenshot_multi_success_tip: '图片已保存至相册',
54
58
  ipc_player_error_screenshot_error_tip: '截图失败了,请稍后再试',
55
59
  ipc_player_record_success_tip: '录像已保存在APP相册',
60
+ ipc_player_record_multi_success_tip: '视频已保存至相册',
61
+ ipc_player_multi_capture_success_count: '共{0}个',
56
62
  ipc_player_shot_success_check: '查看',
57
63
  ipc_player_record_success_check: '查看',
58
64
  ipc_player_recording_now_tip: '正在录像中...',
package/lib/index.d.ts CHANGED
@@ -5,7 +5,3 @@ import * as Widgets from './widgets';
5
5
  import * as Features from './features';
6
6
  import * as Utils from './utils';
7
7
  export { Widgets, Features, Utils };
8
- export { PlayerRenderModeContext } from './renderer/context';
9
- export type { PlayerRenderMode } from './renderer/context';
10
- export type { LynxPlayerAdapters } from './renderer/capabilities';
11
- export { LynxPlayerAdaptersContext } from './renderer/capabilities';
package/lib/index.js CHANGED
@@ -4,6 +4,4 @@ export * from './interface';
4
4
  import * as Widgets from './widgets';
5
5
  import * as Features from './features';
6
6
  import * as Utils from './utils';
7
- export { Widgets, Features, Utils };
8
- export { PlayerRenderModeContext } from './renderer/context';
9
- export { LynxPlayerAdaptersContext } from './renderer/capabilities';
7
+ export { Widgets, Features, Utils };
@@ -47,6 +47,7 @@ export type UseCtx = (options: {
47
47
  initBottomRightContent?: ComponentConfig[];
48
48
  initAbsoluteContent?: ComponentConfig[];
49
49
  saveToAlbum?: 0 | 1;
50
+ multiLens?: boolean;
50
51
  showPtzControlTip?: boolean;
51
52
  videoSplitProtocol?: VideoSplitProtocol;
52
53
  }) => {
@@ -54,6 +55,7 @@ export type UseCtx = (options: {
54
55
  brandColor: RetAtom<string>;
55
56
  verticalMic: RetAtom<boolean>;
56
57
  saveToAlbum: 0 | 1;
58
+ multiLens: boolean;
57
59
  showPtzControlTip: boolean;
58
60
  screenType: RetAtom<ScreenType>;
59
61
  isVerticalFullLayout: RetAtom<boolean>;
@@ -89,7 +91,8 @@ export type UseCtx = (options: {
89
91
  setRecordingDisabled: (type: boolean) => void;
90
92
  setResolution: (type: string) => Promise<boolean>;
91
93
  setResolutionList: (type: string[]) => void;
92
- setRecording: (value: boolean, onlyUpdateAtom?: boolean) => Promise<RecordInfoData>;
94
+ setRecording: (value: boolean, onlyUpdateAtom?: boolean) => Promise<CaptureResult>;
95
+ stopRecordingOnUnload: () => Promise<CaptureResult>;
93
96
  setIntercom: (value: boolean, onlyUpdateAtom?: boolean) => Promise<boolean>;
94
97
  setMute: (value: boolean) => Promise<boolean>;
95
98
  changeStreamStatus: (value: PlayerStreamStatus) => void;
@@ -120,8 +123,12 @@ export type ComponentConfig<T = ReturnType<UseCtx> & Record<string, any>> = {
120
123
  absoluteContentClassName?: string;
121
124
  absoluteContentStyle?: React.CSSProperties;
122
125
  absoluteNoCoverView?: boolean;
126
+ renderWhen?: (state: ComponentRenderState) => boolean;
123
127
  hidden?: boolean;
124
128
  };
129
+ export type ComponentRenderState = {
130
+ playState: PlayState;
131
+ };
125
132
  export type ComponentConfigProps = {
126
133
  IPCPlayerContext: IpcContext;
127
134
  } & ReturnType<UseCtx>;
@@ -129,11 +136,17 @@ export type PlayStatusData = {
129
136
  playState: PlayState;
130
137
  playCode: number;
131
138
  };
132
- export type RecordInfoData = boolean | {
139
+ export type CaptureFileInfo = {
140
+ index?: number;
133
141
  tempImagePath: string;
134
142
  filePath: string;
135
- thumbPath: string;
143
+ thumbPath?: string;
144
+ width?: number;
145
+ height?: number;
146
+ data?: string;
136
147
  };
148
+ export type CaptureResult = boolean | CaptureFileInfo;
149
+ export type RecordInfoData = CaptureResult;
137
150
  /**
138
151
  * 多目屏幕模式
139
152
  */
@@ -0,0 +1,2 @@
1
+ import type { ComponentConfig, ComponentRenderState } from '../interface';
2
+ export declare function shouldRenderContent<T>(item: ComponentConfig<T>, state: ComponentRenderState): boolean;
@@ -0,0 +1,3 @@
1
+ export function shouldRenderContent(item, state) {
2
+ return !item.hidden && (!item.renderWhen || item.renderWhen(state));
3
+ }
@@ -8,7 +8,6 @@ import "core-js/modules/esnext.iterator.reduce.js";
8
8
  import React, { useEffect, useMemo, useRef, useState } from 'react';
9
9
  import { CoverView, ScrollView, View } from '@ray-js/ray';
10
10
  import clsx from 'clsx';
11
- import { usePlayerRenderMode } from '../renderer/context';
12
11
  import { useStore } from '../ctx/store';
13
12
  import { useComponentHideState } from './hooks';
14
13
  import { TrialBadge, useTrialBadge } from '../widgets/trialBadge';
@@ -80,7 +79,6 @@ const BottomLeftContent = _ref => {
80
79
  const tryExp = bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.find(item => item.id === 'TryExperience');
81
80
  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;
82
81
  }, [bottomLeftContent]);
83
- const renderMode = usePlayerRenderMode();
84
82
  const [shouldHide] = useComponentHideState();
85
83
  const {
86
84
  showTrialBadge,
@@ -88,7 +86,7 @@ const BottomLeftContent = _ref => {
88
86
  handleCountdownEnd
89
87
  } = useTrialBadge(ctx.event, ctx.devId, trialRemainingSec);
90
88
 
91
- // 横向滚动状态:右侧仍有内容时显示右箭头提示
89
+ // 横向滚动状态:内容溢出且未滑到对应边缘时,显示左 / 右箭头提示
92
90
  const idRef = useRef(++scrollClsSeq);
93
91
  // wrap 是左下角的可用区(left:0 ~ right:reservedRight),宽度不随 ScrollView 收窄而变,
94
92
  // 因此用它、而不是 ScrollView 自身,作为“能摆多宽”的基准,避免收窄与分档互相依赖
@@ -109,8 +107,6 @@ const BottomLeftContent = _ref => {
109
107
  // 点击箭头时的受控滚动目标;仅在程序化滚动期间为数值,结束后置回 undefined,
110
108
  // 避免持续受控导致用户手动拖动被回弹
111
109
  const [scrollTo, setScrollTo] = useState(undefined);
112
- const [lynxAtEnd, setLynxAtEnd] = useState(false);
113
- const endPageTouchRef = useRef(null);
114
110
  // 横竖屏切换后,强制 ScrollView 重新挂载并把滚动状态重置为初始值
115
111
  const [scrollResetKey, setScrollResetKey] = useState(0);
116
112
  // 用户在某种屏幕模式下拖动过一次之后,该模式不再展示箭头(竖屏 / 横屏各自独立记录)
@@ -133,12 +129,10 @@ const BottomLeftContent = _ref => {
133
129
  const scrollEndTimerRef = useRef();
134
130
  // 测量时需要叠加当前滚动量,用 ref 避免闭包拿到过期值
135
131
  const scrollLeftRef = useRef(0);
136
- const pageOffsetRef = useRef(0);
137
132
  useEffect(() => {
138
133
  setScrollResetKey(k => k + 1);
139
134
  setScrollLeft(0);
140
135
  setScrollTo(undefined);
141
- setLynxAtEnd(false);
142
136
  scrollLeftRef.current = 0;
143
137
  // 清零上一屏的测量值,避免用旧 clientWidth/contentWidth 在重新测量前误判溢出导致箭头闪现
144
138
  setClientWidth(0);
@@ -299,7 +293,7 @@ const BottomLeftContent = _ref => {
299
293
  // 这样即使内容容器被撑满到可视内盒宽,也能拿到真实内容宽;哨兵不可用时回退到容器宽。
300
294
  let tw = 0;
301
295
  if (scrollRect && endRect && typeof endRect.left === 'number') {
302
- tw = endRect.left - scrollRect.left - paddingLeftPx + scrollLeftRef.current + pageOffsetRef.current;
296
+ tw = endRect.left - scrollRect.left - paddingLeftPx + scrollLeftRef.current;
303
297
  }
304
298
  if (!(tw > 0)) {
305
299
  tw = (contentRect === null || contentRect === void 0 ? void 0 : contentRect.width) || 0;
@@ -308,11 +302,11 @@ const BottomLeftContent = _ref => {
308
302
  setContentWidth(tw);
309
303
  }
310
304
  attempts += 1;
311
- // Lynx 首轮加密测量以尽快收敛,WebView 保持原有 400ms/15 次节奏。
312
- if (attempts >= (renderMode === 'lynx' ? 20 : 15)) {
305
+ // 最多轮询 15 次(约 6s)兜底,避免无限轮询
306
+ if (attempts >= 15) {
313
307
  return;
314
308
  }
315
- timer = setTimeout(measure, renderMode === 'lynx' && attempts < 8 ? 150 : 400);
309
+ timer = setTimeout(measure, 400);
316
310
  });
317
311
  };
318
312
 
@@ -328,7 +322,7 @@ const BottomLeftContent = _ref => {
328
322
  // playState:视频就绪后 overlay 可能重新布局,需重新测量
329
323
  playState, bottomLeftContent === null || bottomLeftContent === void 0 ? void 0 : bottomLeftContent.length, shouldHide, showBadge, wrapCls, scrollCls, contentCls, scrollResetKey, resizeSignal,
330
324
  // 收紧后各项 padding 变小,必须重测一遍逐项宽,否则分档还在用收紧前的旧值
331
- tightened, renderMode]);
325
+ tightened]);
332
326
 
333
327
  // 子元素主动上报宽度变化 → 重跑测量,及时更新横滑箭头与右边缘淡出
334
328
  useEffect(() => {
@@ -359,11 +353,7 @@ const BottomLeftContent = _ref => {
359
353
  // 竖屏由“个数”决定是否溢出(平铺档恒不溢出);横屏保持原来的像素比对
360
354
  const isOverflow = isVertical ? !isFlat : totalContentWidth > clientWidth + 1;
361
355
  const scrollViewWidth = verticalScrollWidth > 0 ? verticalScrollWidth : clientWidth;
362
- const atEnd = lynxAtEnd || !isOverflow || scrollLeft + scrollViewWidth >= totalContentWidth - 2;
363
- // Lynx 不响应 ScrollView 的受控 scrollLeft / scrollIntoView,点击时平移现有内容。
364
- // 保留原节点;末页通过右滑返回,不增加 WebView 没有的反向箭头。
365
- const pageOffset = renderMode === 'lynx' && lynxAtEnd ? Math.max(0, totalContentWidth - scrollViewWidth - scrollLeft) : 0;
366
- pageOffsetRef.current = pageOffset;
356
+ const atEnd = !isOverflow || scrollLeft + scrollViewWidth >= totalContentWidth - 2;
367
357
  const isDismissed = dismissed[screenType];
368
358
  const isButtonHint = scrollHintMode === 'button';
369
359
  // button 模式:溢出且未到末端即常显(不受 dismissed 影响);pulse 模式:保留拖动后消失的旧逻辑。
@@ -372,19 +362,9 @@ const BottomLeftContent = _ref => {
372
362
  // 右侧还有未滚到头的内容时,启用右边缘淡出,把没完全露出的元素渐隐隐藏(横竖屏都生效)
373
363
  const fadeRightEdge = isOverflow && !atEnd;
374
364
 
375
- // Lynx 用子节点 id 定位末端:其受控 scrollLeft 属性不会可靠地驱动原生横滑。
376
- // WebView 仍以有限的实际最大偏移滚动。
365
+ // 点击右箭头:直接滚动到最右端。
366
+ // 给一个足够大的目标值,交由 ScrollView 自身夹取到真实最右端,避免测量误差导致滚不到底。
377
367
 
378
- const readTouch = event => {
379
- var _event$touches, _event$changedTouches, _event$origin, _event$origin2, _touch$clientX, _touch$clientY;
380
- const touch = (event === null || event === void 0 || (_event$touches = event.touches) === null || _event$touches === void 0 ? void 0 : _event$touches[0]) || (event === null || event === void 0 || (_event$changedTouches = event.changedTouches) === null || _event$changedTouches === void 0 ? void 0 : _event$changedTouches[0]) || (event === null || event === void 0 || (_event$origin = event.origin) === null || _event$origin === void 0 || (_event$origin = _event$origin.touches) === null || _event$origin === void 0 ? void 0 : _event$origin[0]) || (event === null || event === void 0 || (_event$origin2 = event.origin) === null || _event$origin2 === void 0 || (_event$origin2 = _event$origin2.changedTouches) === null || _event$origin2 === void 0 ? void 0 : _event$origin2[0]);
381
- const x = (_touch$clientX = touch === null || touch === void 0 ? void 0 : touch.clientX) !== null && _touch$clientX !== void 0 ? _touch$clientX : touch === null || touch === void 0 ? void 0 : touch.pageX;
382
- const y = (_touch$clientY = touch === null || touch === void 0 ? void 0 : touch.clientY) !== null && _touch$clientY !== void 0 ? _touch$clientY : touch === null || touch === void 0 ? void 0 : touch.pageY;
383
- return typeof x === 'number' && typeof y === 'number' ? {
384
- x,
385
- y
386
- } : null;
387
- };
388
368
  const coverHeight = screenType === 'vertical' ? shouldHide ? 49 : 48 : shouldHide ? 59 : 58;
389
369
  const containerHeight = screenType === 'vertical' ? 48 : 58;
390
370
 
@@ -410,18 +390,15 @@ const BottomLeftContent = _ref => {
410
390
  })();
411
391
  return /*#__PURE__*/React.createElement(CoverView, {
412
392
  className: clsx('ipc-player-bottom-left-content-wrap', wrapCls),
413
- style: _objectSpread(_objectSpread({
393
+ style: {
414
394
  right: rightCss,
415
395
  height: showBadge ? `${coverHeight + 30}px` : `${coverHeight}px`,
416
396
  display: 'flex',
417
397
  flexDirection: 'column',
418
398
  justifyContent: 'flex-start',
419
- opacity: shouldHide ? 0 : 1
420
- }, renderMode === 'lynx' ? {
421
- transition: 'opacity 0.3s ease'
422
- } : {}), {}, {
399
+ opacity: shouldHide ? 0 : 1,
423
400
  pointerEvents: shouldHide ? 'none' : 'auto'
424
- })
401
+ }
425
402
  }, showBadge && /*#__PURE__*/React.createElement(View, {
426
403
  style: {
427
404
  height: '32px',
@@ -434,7 +411,7 @@ const BottomLeftContent = _ref => {
434
411
  onCountdownEnd: handleCountdownEnd
435
412
  })), /*#__PURE__*/React.createElement(ScrollView, {
436
413
  key: scrollResetKey,
437
- scrollX: renderMode !== 'lynx' || !lynxAtEnd,
414
+ scrollX: true,
438
415
  scrollLeft: scrollTo,
439
416
  scrollWithAnimation: true,
440
417
  onScroll: e => {
@@ -485,32 +462,16 @@ const BottomLeftContent = _ref => {
485
462
  whiteSpace: 'nowrap'
486
463
  }
487
464
  }, /*#__PURE__*/React.createElement(View, {
488
- onTouchStart: renderMode === 'lynx' ? event => {
489
- endPageTouchRef.current = renderMode === 'lynx' && lynxAtEnd ? readTouch(event) : null;
490
- } : undefined,
491
- onTouchEnd: renderMode === 'lynx' ? event => {
492
- const start = endPageTouchRef.current;
493
- const end = readTouch(event);
494
- endPageTouchRef.current = null;
495
- if (!start || !end || renderMode !== 'lynx' || !lynxAtEnd) return;
496
- const dx = end.x - start.x;
497
- if (dx > 24 && dx > Math.abs(end.y - start.y)) setLynxAtEnd(false);
498
- } : undefined,
499
- onTouchCancel: () => {
500
- endPageTouchRef.current = null;
501
- },
502
465
  className: clsx('ipc-player-bottom-left-content-container', contentCls, {
503
466
  'ipc-player-bottom-left-content-container-tight': tightened
504
467
  }),
505
- style: _objectSpread({
506
- display: renderMode === 'lynx' ? 'flex' : 'inline-flex',
468
+ style: {
469
+ display: 'inline-flex',
507
470
  flexDirection: 'row',
508
471
  height: `${visibleRowHeight}px`,
509
472
  alignItems: 'center',
510
473
  paddingLeft: `${contentPaddingLeftPx}px`
511
- }, pageOffset > 0 ? {
512
- transform: `translateX(-${pageOffset}px)`
513
- } : {})
474
+ }
514
475
  }, children, /*#__PURE__*/React.createElement(View, {
515
476
  className: endCls,
516
477
  style: {
@@ -537,11 +498,7 @@ const BottomLeftContent = _ref => {
537
498
  if (!isOverflow) {
538
499
  return;
539
500
  }
540
- if (renderMode === 'lynx') {
541
- setLynxAtEnd(true);
542
- return;
543
- }
544
- setScrollTo(Math.max(0, Math.ceil(totalContentWidth - scrollViewWidth)));
501
+ setScrollTo(totalContentWidth + clientWidth + 9999);
545
502
  } : undefined
546
503
  }, /*#__PURE__*/React.createElement(View, {
547
504
  className: clsx('ipc-player-bottom-left-scroll-hint-arrow', {
@@ -2,7 +2,6 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import React, { useEffect, useRef } from 'react';
3
3
  import { CoverView, View } from '@ray-js/ray';
4
4
  import clsx from 'clsx';
5
- import { usePlayerRenderMode } from '../renderer/context';
6
5
  import { useStore } from '../ctx/store';
7
6
  import { useComponentHideState } from './hooks';
8
7
 
@@ -25,7 +24,6 @@ const BottomRightContent = _ref => {
25
24
  bottomRightContent: ctx.bottomRightContent
26
25
  });
27
26
  const [shouldHide] = useComponentHideState();
28
- const renderMode = usePlayerRenderMode();
29
27
  const idRef = useRef(++rightClsSeq);
30
28
  const wrapCls = `ipc-br-wrap-${idRef.current}`;
31
29
  const lastWidthRef = useRef(0);
@@ -46,18 +44,17 @@ const BottomRightContent = _ref => {
46
44
  onWidthChange === null || onWidthChange === void 0 || onWidthChange(w);
47
45
  }
48
46
  attempts += 1;
49
- // Lynx 首轮加密测量以尽快收敛,WebView 保持原有节奏。
50
- if (attempts >= (renderMode === 'lynx' ? 20 : 15)) {
47
+ if (attempts >= 15) {
51
48
  return;
52
49
  }
53
- timer = setTimeout(measure, renderMode === 'lynx' && attempts < 8 ? 150 : 400);
50
+ timer = setTimeout(measure, 400);
54
51
  });
55
52
  };
56
53
  timer = setTimeout(measure, 60);
57
54
  return () => {
58
55
  if (timer) clearTimeout(timer);
59
56
  };
60
- }, [screenType, playState, bottomRightContent === null || bottomRightContent === void 0 ? void 0 : bottomRightContent.length, shouldHide, wrapCls, onWidthChange, renderMode]);
57
+ }, [screenType, playState, bottomRightContent === null || bottomRightContent === void 0 ? void 0 : bottomRightContent.length, shouldHide, wrapCls, onWidthChange]);
61
58
  const containerHeight = screenType === 'vertical' ? 48 : 58;
62
59
 
63
60
  // 将 width 统一规范成 CSS 合法值。number → "${n}px",string → 原样透传。
package/lib/ui/ui.d.ts CHANGED
@@ -1,6 +1,4 @@
1
1
  import React from 'react';
2
- import { PlayerRenderMode } from '../renderer/context';
3
- import { LynxPlayerAdapters } from '../renderer/capabilities';
4
2
  import { PlayStatusData, UseCtx, EventInstance } from '../interface';
5
3
  import './ui.less';
6
4
  type CtxInstance = ReturnType<UseCtx>;
@@ -16,9 +14,6 @@ type CSSVariable = {
16
14
  '--fontSize': string;
17
15
  };
18
16
  type Props = {
19
- renderMode?: PlayerRenderMode;
20
- /** Required when Lynx enables widgets backed by WebView-only renderers. */
21
- lynxAdapters?: LynxPlayerAdapters;
22
17
  devId: string;
23
18
  isShare?: boolean;
24
19
  ignoreHideStopPreview?: boolean;
package/lib/ui/ui.js CHANGED
@@ -12,10 +12,6 @@ import clsx from 'clsx';
12
12
  import IPCPlayer from '@ray-js/ray-ipc-player';
13
13
  import { ipcTTTOperatorLog } from '@ray-js/ray-ipc-utils';
14
14
  import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
15
- import { PlayerRenderModeContext, PlayerControlVisibilityContext } from '../renderer/context';
16
- import lynxStyles from '../renderer/index.module.less';
17
- import { getPlayerViewport } from '../renderer/viewport';
18
- import { LynxPlayerAdaptersContext } from '../renderer/capabilities';
19
15
  import { PlayState, PlayerStreamStatus, MultiCameraScreenMode } from '../interface';
20
16
  import { useCtx } from '../ctx/ctx.composition';
21
17
  import { useStore, updateAtom, getDefaultStore } from '../ctx/store';
@@ -32,7 +28,9 @@ import { Storage } from '../utils/storage';
32
28
  import './ui.less';
33
29
  import { updatePlayerWidgetProps } from '../features';
34
30
  import { getNgRawData, getSmartImageQualityState, isLowPhone } from '../utils/ttt';
31
+ import { getCaptureResultSummary } from '../utils/captureResult';
35
32
  import { lensCount } from '../widgets/zoomTurntable/lensSkill';
33
+ import { shouldRenderContent } from './absoluteContent';
36
34
  const AutoClarityOnly = _ref => {
37
35
  let {
38
36
  instance
@@ -103,7 +101,6 @@ const SCALE_MATCH_EPS = 0.01;
103
101
  const BOTTOM_RIGHT_SAFE_GAP = 4;
104
102
  export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
105
103
  const {
106
- renderMode = 'webview',
107
104
  className,
108
105
  devId,
109
106
  style,
@@ -568,7 +565,6 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
568
565
  // canOpenSettings: true,
569
566
  // };
570
567
  const getNgRes = await getNgRawData();
571
- console.log('res===getSmartImageQualityState', res);
572
568
  updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
573
569
  isPurchase: res.isPurchase,
574
570
  buttonState: res.buttonState,
@@ -691,14 +687,16 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
691
687
  ipcTTTOperatorLog('hide: 调用停止录制方法');
692
688
  setRecording(false, true);
693
689
  setIntercom(false, true);
694
- instance === null || instance === void 0 || instance.IPCPlayerInstance.stopRecord({
695
- saveToAlbum: 1,
696
- success: () => {
697
- ipcTTTOperatorLog('hide: 调用停止录制方法成功');
698
- },
699
- fail: () => {
700
- ipcTTTOperatorLog('hide: 调用停止录制方法失败');
701
- }
690
+ instance === null || instance === void 0 || instance.stopRecordingOnUnload().then(async result => {
691
+ var _instance$multiLens, _instance$multiCamera;
692
+ const summary = await getCaptureResultSummary(result, {
693
+ multiLens: (_instance$multiLens = instance === null || instance === void 0 ? void 0 : instance.multiLens) !== null && _instance$multiLens !== void 0 ? _instance$multiLens : false,
694
+ protocolCount: instance === null || instance === void 0 || (_instance$multiCamera = instance.multiCameraCtx) === null || _instance$multiCamera === void 0 || (_instance$multiCamera = _instance$multiCamera.protocol) === null || _instance$multiCamera === void 0 ? void 0 : _instance$multiCamera.total_split_num,
695
+ devId
696
+ });
697
+ ipcTTTOperatorLog(summary !== null && summary !== void 0 && summary.isMultiLens ? `hide: stop recording succeeded with ${summary.count} files` : 'hide: 调用停止录制方法成功');
698
+ }).catch(() => {
699
+ ipcTTTOperatorLog('hide: 调用停止录制方法失败');
702
700
  });
703
701
  ipcTTTOperatorLog('hide: 调用停止对讲方法');
704
702
  instance === null || instance === void 0 || instance.IPCPlayerInstance.stopTalk({
@@ -1092,31 +1090,22 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1092
1090
  });
1093
1091
  const playerContainerHeight = screenType === 'vertical' ? (style === null || style === void 0 ? void 0 : style.height) || '100%' : '100vh';
1094
1092
  const isVerticalFullMode = isVerticalFullLayout && screenType === 'vertical';
1095
- const lynxVerticalFull = renderMode === 'lynx' && isVerticalFullMode;
1096
- const viewport = getPlayerViewport(renderMode, isVerticalFullMode, playerContainerHeight);
1097
- return /*#__PURE__*/React.createElement(PlayerRenderModeContext.Provider, {
1098
- value: renderMode
1099
- }, /*#__PURE__*/React.createElement(LynxPlayerAdaptersContext.Provider, {
1100
- value: props.lynxAdapters || {}
1101
- }, /*#__PURE__*/React.createElement(UIEventContext.Provider, {
1093
+ return /*#__PURE__*/React.createElement(UIEventContext.Provider, {
1102
1094
  value: {
1103
1095
  event: eventRef.current,
1104
1096
  componentHideState,
1105
1097
  refreshElement
1106
1098
  }
1107
1099
  }, /*#__PURE__*/React.createElement(View, {
1108
- className: clsx('ipc-player-content', renderMode === 'lynx' && lynxStyles.root, isSmallScreen && 'ipc-player-content-small-screen', className),
1100
+ className: clsx('ipc-player-content', isSmallScreen && 'ipc-player-content-small-screen', className),
1109
1101
  style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultCSSVariable), CSSVariable), style), {}, {
1110
1102
  height: playerContainerHeight
1111
- }, lynxVerticalFull ? {
1112
- backgroundColor: '#000'
1113
- } : {})
1103
+ })
1114
1104
  }, /*#__PURE__*/React.createElement(View, {
1115
- className: lynxVerticalFull ? lynxStyles.verticalViewport : undefined,
1116
- style: viewport.style
1117
- }, /*#__PURE__*/React.createElement(IPCPlayer, _extends({}, renderMode === 'lynx' ? {
1118
- renderMode: 'lynx'
1119
- } : {}, {
1105
+ style: {
1106
+ height: isVerticalFullMode ? `calc(${playerContainerHeight} - 48px)` : playerContainerHeight
1107
+ }
1108
+ }, /*#__PURE__*/React.createElement(IPCPlayer, {
1120
1109
  defaultMute: mute,
1121
1110
  devId: devId,
1122
1111
  onlineStatus: deviceOnline,
@@ -1135,7 +1124,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1135
1124
  onCameraNotifyWeakNetwork: data => {
1136
1125
  console.log(`onCameraNotifyWeakNetwork: ${JSON.stringify(data)}`);
1137
1126
  },
1138
- clarity: decodeClarityDic[String(resolution).toUpperCase()] || decodeClarityDic.HD,
1127
+ clarity: decodeClarityDic[resolution],
1139
1128
  onZoomChange: onZoomChange
1140
1129
  // objectFit={
1141
1130
  // screenType === 'vertical'
@@ -1149,7 +1138,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1149
1138
  // scaleMultiple={0}
1150
1139
  ,
1151
1140
  awakeStatus: awakeStatus,
1152
- objectFit: viewport.objectFit,
1141
+ objectFit: "fillCrop",
1153
1142
  scaleMultiple: scaleMultiple
1154
1143
  // 安卓横屏问题
1155
1144
  // ptzControllable={screenType === 'vertical'}
@@ -1169,17 +1158,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1169
1158
  // 这一下起,自动隐藏倒计时才开始生效
1170
1159
  hasUserTappedPlayerRef.current = true;
1171
1160
  if (instance.multiCameraCtx.isSupport) {
1172
- var _instance$multiCamera, _instance$multiCamera2;
1173
- const preTapIndex = (_instance$multiCamera = (_instance$multiCamera2 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera2 === void 0 ? void 0 : _instance$multiCamera2.index) !== null && _instance$multiCamera !== void 0 ? _instance$multiCamera : prevSelectedIndexRef.current;
1161
+ var _instance$multiCamera2, _instance$multiCamera3;
1162
+ const preTapIndex = (_instance$multiCamera2 = (_instance$multiCamera3 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera3 === void 0 ? void 0 : _instance$multiCamera3.index) !== null && _instance$multiCamera2 !== void 0 ? _instance$multiCamera2 : prevSelectedIndexRef.current;
1174
1163
  const wasHidden = componentHideState;
1175
1164
  instance.multiCameraCtx.selectVideoFiredRef.current = false;
1176
1165
  if (multiTapTimerRef.current) {
1177
1166
  clearTimeout(multiTapTimerRef.current);
1178
1167
  }
1179
1168
  multiTapTimerRef.current = setTimeout(() => {
1180
- var _instance$multiCamera3, _instance$multiCamera4;
1169
+ var _instance$multiCamera4, _instance$multiCamera5;
1181
1170
  const selectFired = !!instance.multiCameraCtx.selectVideoFiredRef.current;
1182
- const currentIndex = (_instance$multiCamera3 = (_instance$multiCamera4 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera4 === void 0 ? void 0 : _instance$multiCamera4.index) !== null && _instance$multiCamera3 !== void 0 ? _instance$multiCamera3 : preTapIndex;
1171
+ const currentIndex = (_instance$multiCamera4 = (_instance$multiCamera5 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera5 === void 0 ? void 0 : _instance$multiCamera5.index) !== null && _instance$multiCamera4 !== void 0 ? _instance$multiCamera4 : preTapIndex;
1183
1172
  if (selectFired && currentIndex === preTapIndex) {
1184
1173
  if (wasHidden) {
1185
1174
  showComponents();
@@ -1231,11 +1220,9 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1231
1220
  limitFlow: limitFlow,
1232
1221
  autoWakeUp: autoWakeUp,
1233
1222
  extend: _objectSpread(_objectSpread({
1234
- backgroundColor: viewport.backgroundColor
1223
+ backgroundColor: '#262626'
1235
1224
  }, instance.multiCameraCtx.extendProps), extend)
1236
- }))), /*#__PURE__*/React.createElement(PlayerControlVisibilityContext.Provider, {
1237
- value: !componentHideState && !refreshElement
1238
- }, showTopContent && /*#__PURE__*/React.createElement(View, {
1225
+ })), showTopContent && /*#__PURE__*/React.createElement(View, {
1239
1226
  className: clsx('ipc-player-top-content', {
1240
1227
  'ipc-player-top-content-hide': componentHideState,
1241
1228
  'ipc-player-top-content-show': !componentHideState
@@ -1249,17 +1236,18 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1249
1236
  ctx: instance
1250
1237
  }, renderTopRightContent, !hasVisibleBitrateWidget && /*#__PURE__*/React.createElement(AutoClarityOnly, {
1251
1238
  instance: instance
1252
- })))), /*#__PURE__*/React.createElement(View, {
1239
+ })))), /*#__PURE__*/React.createElement(StandaloneAutoClarity, {
1240
+ instance: instance,
1241
+ show: !showTopContent || componentHideState || !playerReady
1242
+ }), /*#__PURE__*/React.createElement(View, {
1253
1243
  className: clsx('ipc-player-bottom-content', {
1254
1244
  'ipc-player-bottom-content-hide': componentHideState,
1255
1245
  'ipc-player-bottom-content-show': !componentHideState,
1256
1246
  'ipc-player-bottom-content-full': isVerticalFullMode
1257
1247
  }),
1258
- style: _objectSpread({
1248
+ style: {
1259
1249
  height: screenType === 'vertical' ? '48px' : '72px'
1260
- }, lynxVerticalFull ? {
1261
- paddingBottom: 0
1262
- } : {})
1250
+ }
1263
1251
  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BottomLeftContent, {
1264
1252
  ctx: instance,
1265
1253
  reservedRight: bottomRightReserved
@@ -1267,19 +1255,19 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1267
1255
  ctx: instance,
1268
1256
  width: bottomRightStyleWidth,
1269
1257
  onWidthChange: handleBottomRightWidthChange
1270
- }, renderBottomRightContent)))), /*#__PURE__*/React.createElement(StandaloneAutoClarity, {
1271
- instance: instance,
1272
- show: !showTopContent || componentHideState || !playerReady
1273
- }), (() => {
1258
+ }, renderBottomRightContent))), (() => {
1274
1259
  if (!absoluteContent || !(absoluteContent !== null && absoluteContent !== void 0 && absoluteContent.length)) return null;
1275
1260
  return absoluteContent.map(item => {
1276
- if (item.hidden) return null;
1261
+ if (!shouldRenderContent(item, {
1262
+ playState
1263
+ })) return null;
1264
+ const contentProps = _objectSpread(_objectSpread(_objectSpread({
1265
+ key: item.id
1266
+ }, item.initProps), instance), {}, {
1267
+ IPCPlayerContext: instance.IPCPlayerInstance
1268
+ });
1277
1269
  if (item.absoluteNoCoverView) {
1278
- return /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread(_objectSpread({
1279
- key: item.id
1280
- }, item.initProps), instance), {}, {
1281
- IPCPlayerContext: instance.IPCPlayerInstance
1282
- }));
1270
+ return /*#__PURE__*/React.createElement(item.content, contentProps);
1283
1271
  }
1284
1272
  return /*#__PURE__*/React.createElement(CoverView, {
1285
1273
  key: item.id,
@@ -1287,13 +1275,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1287
1275
  position: 'absolute'
1288
1276
  }, item.absolutePosition),
1289
1277
  className: item.absoluteContentClassName
1290
- }, /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread(_objectSpread({
1291
- key: item.id
1292
- }, item.initProps), instance), {}, {
1293
- IPCPlayerContext: instance.IPCPlayerInstance,
1278
+ }, /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread({}, contentProps), {}, {
1294
1279
  // 添加通用变量单独组件类名
1295
1280
  className: clsx('absolute-item-container')
1296
1281
  })));
1297
1282
  });
1298
- })()))));
1283
+ })()));
1299
1284
  });