@ray-js/ipc-player-integration 0.0.71-beta.0 → 0.0.72-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 (145) hide show
  1. package/README.md +0 -6
  2. package/lib/ctx/ctx.composition.d.ts +5 -1
  3. package/lib/ctx/ctx.composition.js +4 -1
  4. package/lib/ctx/ctx.js +17 -12
  5. package/lib/ctx/ctx.test.js +19 -54
  6. package/lib/features/initPlayerWidgets/index.d.ts +3 -0
  7. package/lib/features/initPlayerWidgets/index.js +4 -0
  8. package/lib/index.d.ts +0 -4
  9. package/lib/index.js +1 -3
  10. package/lib/interface.d.ts +1 -1
  11. package/lib/ui/bottomControlLayout.d.ts +11 -0
  12. package/lib/ui/bottomControlLayout.js +19 -0
  13. package/lib/ui/bottomControlLayout.test.js +64 -0
  14. package/lib/ui/bottomLeftContent.js +73 -180
  15. package/lib/ui/bottomLeftContent.test.js +138 -0
  16. package/lib/ui/bottomRightContent.d.ts +2 -2
  17. package/lib/ui/bottomRightContent.js +24 -16
  18. package/lib/ui/bottomRightContent.test.js +144 -0
  19. package/lib/ui/constant.d.ts +2 -0
  20. package/lib/ui/constant.js +4 -1
  21. package/lib/ui/topLeftContent.js +2 -4
  22. package/lib/ui/topRightContent.js +2 -4
  23. package/lib/ui/ui.d.ts +0 -5
  24. package/lib/ui/ui.js +33 -86
  25. package/lib/ui/ui.less +24 -59
  26. package/lib/widgets/battery/battery.js +5 -7
  27. package/lib/widgets/battery/batteryFull.js +5 -7
  28. package/lib/widgets/captureResult/captureResult.js +1 -2
  29. package/lib/widgets/floatWindow/floatWindow.d.ts +13 -0
  30. package/lib/widgets/floatWindow/floatWindow.js +93 -0
  31. package/lib/widgets/floatWindow/floatWindow.less +14 -0
  32. package/lib/widgets/floatWindow/floatWindow.test.d.ts +1 -0
  33. package/lib/widgets/floatWindow/floatWindow.test.js +164 -0
  34. package/lib/widgets/floatWindow/icon.d.ts +1 -0
  35. package/lib/widgets/floatWindow/icon.js +4 -0
  36. package/lib/widgets/floatWindow/index.d.ts +1 -0
  37. package/lib/widgets/floatWindow/index.js +1 -0
  38. package/lib/widgets/floodlight/floodlight.js +1 -2
  39. package/lib/widgets/flowLowTip/flowLowTip.js +1 -2
  40. package/lib/widgets/fullScreen/fullScreen.js +1 -2
  41. package/lib/widgets/fullScreen/fullTravelRouteControl.d.ts +1 -1
  42. package/lib/widgets/fullScreen/fullTravelRouteControl.js +1 -1
  43. package/lib/widgets/fullScreen/verticalScreen.js +1 -2
  44. package/lib/widgets/index.d.ts +1 -0
  45. package/lib/widgets/index.js +2 -1
  46. package/lib/widgets/moveInteractiveControl/controlButton.js +1 -2
  47. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.js +5 -16
  48. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.less +4 -24
  49. package/lib/widgets/multiCamera/landscapeTip.js +2 -8
  50. package/lib/widgets/multiCamera/moveablePtzControl.js +3 -5
  51. package/lib/widgets/multiCamera/multiPtz.js +1 -2
  52. package/lib/widgets/multiCamera/ptzMoveableTip.js +2 -8
  53. package/lib/widgets/multiCamera/switchLayout.js +1 -2
  54. package/lib/widgets/multiCamera/tileMultiPtz.js +1 -2
  55. package/lib/widgets/multiCamera/tileSwitchLayout.js +1 -2
  56. package/lib/widgets/multiCamera/tileTip.js +2 -8
  57. package/lib/widgets/muted/muted.js +1 -2
  58. package/lib/widgets/muted/muted.test.js +52 -66
  59. package/lib/widgets/ptz/ptz.js +1 -2
  60. package/lib/widgets/ptz/ptzControl.js +3 -4
  61. package/lib/widgets/ptzControlTip/ptzControlTip.js +4 -9
  62. package/lib/widgets/ptzControlTip/ptzControlTip.less +0 -6
  63. package/lib/widgets/realTimeMagnification/realTimeMagnification.js +1 -2
  64. package/lib/widgets/recordVideo/recordVideo.js +169 -47
  65. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.js +2 -4
  66. package/lib/widgets/recordVideo/recordVideo.test.js +2 -169
  67. package/lib/widgets/resolution/fullResolutionControl.js +19 -29
  68. package/lib/widgets/resolution/resolution.js +2 -3
  69. package/lib/widgets/screenshot/screenshot.js +122 -48
  70. package/lib/widgets/screenshot/screenshot.test.js +113 -108
  71. package/lib/widgets/signal4G/signal4G.js +1 -4
  72. package/lib/widgets/siren/siren.js +1 -2
  73. package/lib/widgets/tempHumidity/tempHumidity.js +1 -2
  74. package/lib/widgets/toggleVerticalFull/toggleVerticalFull.js +1 -2
  75. package/lib/widgets/trialBadge/index.js +3 -8
  76. package/lib/widgets/trialBadge/index.less +0 -24
  77. package/lib/widgets/tryExperience/tryExperience.js +1 -2
  78. package/lib/widgets/videoBitKBP/videoBitKBP.js +1 -2
  79. package/lib/widgets/voiceIntercom/voiceIntercom.js +81 -57
  80. package/lib/widgets/voiceIntercom/voiceIntercom.less +0 -35
  81. package/lib/widgets/zoomTurntable/turntable/index.d.ts +7 -5
  82. package/lib/widgets/zoomTurntable/turntable/index.js +1 -3
  83. package/lib/widgets/zoomTurntable/zoomTurntableDock.d.ts +3 -5
  84. package/lib/widgets/zoomTurntable/zoomTurntableDock.js +4 -4
  85. package/lib/widgets/zoomTurntable/zoomTurntableEntry.js +19 -32
  86. package/lib/widgets/zoomTurntable/zoomTurntableTip.js +3 -17
  87. package/package.json +7 -15
  88. package/lib/ctx/intercom.test.js +0 -85
  89. package/lib/renderer/capabilities.d.ts +0 -8
  90. package/lib/renderer/capabilities.js +0 -19
  91. package/lib/renderer/context.d.ts +0 -5
  92. package/lib/renderer/context.js +0 -6
  93. package/lib/renderer/directionControl.d.ts +0 -6
  94. package/lib/renderer/directionControl.js +0 -3
  95. package/lib/renderer/font-manifest.json +0 -9
  96. package/lib/renderer/font.less +0 -5
  97. package/lib/renderer/glyphs.d.ts +0 -1
  98. package/lib/renderer/glyphs.js +0 -256
  99. package/lib/renderer/index.module.less +0 -48
  100. package/lib/renderer/overlay.d.ts +0 -6
  101. package/lib/renderer/overlay.js +0 -18
  102. package/lib/renderer/ptzZoom.d.ts +0 -6
  103. package/lib/renderer/ptzZoom.js +0 -3
  104. package/lib/renderer/text.d.ts +0 -4
  105. package/lib/renderer/text.js +0 -32
  106. package/lib/renderer/text.module.less +0 -4
  107. package/lib/renderer/viewport.d.ts +0 -7
  108. package/lib/renderer/viewport.js +0 -24
  109. package/lib/res/lynx-signal/index.d.ts +0 -1
  110. package/lib/res/lynx-signal/index.js +0 -22
  111. package/lib/res/lynx-signal/signalFour0.png +0 -0
  112. package/lib/res/lynx-signal/signalFour1.png +0 -0
  113. package/lib/res/lynx-signal/signalFour2.png +0 -0
  114. package/lib/res/lynx-signal/signalFour3.png +0 -0
  115. package/lib/res/lynx-signal/signalFour4.png +0 -0
  116. package/lib/res/lynx-signal/signalThree0.png +0 -0
  117. package/lib/res/lynx-signal/signalThree1.png +0 -0
  118. package/lib/res/lynx-signal/signalThree2.png +0 -0
  119. package/lib/res/lynx-signal/signalThree3.png +0 -0
  120. package/lib/res/player-charging.png +0 -0
  121. package/lib/res/player-more-arrow.png +0 -0
  122. package/lib/res/player-solar.png +0 -0
  123. package/lib/ui/scrollHintArrow.d.ts +0 -23
  124. package/lib/ui/scrollHintArrow.js +0 -83
  125. package/lib/widgets/battery/statusIcon.d.ts +0 -6
  126. package/lib/widgets/battery/statusIcon.js +0 -36
  127. package/lib/widgets/battery/statusIcon.less +0 -24
  128. package/lib/widgets/captureToast/captureToast.d.ts +0 -10
  129. package/lib/widgets/captureToast/captureToast.js +0 -58
  130. package/lib/widgets/recordVideo/recordVideoTimer.d.ts +0 -3
  131. package/lib/widgets/recordVideo/recordVideoTimer.js +0 -26
  132. package/lib/widgets/screenshot/screenshot.permissions.test.js +0 -137
  133. package/lib/widgets/voiceIntercom/voiceIntercom.test.js +0 -135
  134. package/lib/widgets/zoomTurntable/lynxDockLayout.d.ts +0 -6
  135. package/lib/widgets/zoomTurntable/lynxDockLayout.js +0 -30
  136. package/lib/widgets/zoomTurntable/turntable/lynx.d.ts +0 -5
  137. package/lib/widgets/zoomTurntable/turntable/lynx.js +0 -273
  138. package/lib/widgets/zoomTurntable/turntable/lynx.less +0 -9
  139. package/lib/widgets/zoomTurntable/turntable/lynxModel.d.ts +0 -37
  140. package/lib/widgets/zoomTurntable/turntable/lynxModel.js +0 -122
  141. package/lib/widgets/zoomTurntable/turntable/lynxPaint.d.ts +0 -3
  142. package/lib/widgets/zoomTurntable/turntable/lynxPaint.js +0 -36
  143. /package/lib/{ctx/intercom.test.d.ts → ui/bottomControlLayout.test.d.ts} +0 -0
  144. /package/lib/{widgets/screenshot/screenshot.permissions.test.d.ts → ui/bottomLeftContent.test.d.ts} +0 -0
  145. /package/lib/{widgets/voiceIntercom/voiceIntercom.test.d.ts → ui/bottomRightContent.test.d.ts} +0 -0
@@ -1,11 +1,9 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
- import React, { useRef, useContext, useEffect, forwardRef, useImperativeHandle } from 'react';
3
- import { View, Image, Text, getSystemInfoSync } from '@ray-js/ray';
2
+ import React, { useRef, useContext, useState, useEffect, forwardRef, useImperativeHandle } from 'react';
3
+ import { View, Image, getSystemInfoSync } from '@ray-js/ray';
4
4
  import clsx from 'clsx';
5
- import { useStore, updateAtom } from '../../ctx/store';
5
+ import { useStore, getDefaultStore, updateAtom } from '../../ctx/store';
6
6
  import './voiceIntercom.less';
7
- import { usePlayerRenderMode } from '../../renderer/context';
8
- import { PlayerText } from '../../renderer/text';
9
7
  import { PlayerStreamStatus, IntercomMode, PlayState } from '../../interface';
10
8
  import { UIEventContext } from '../../ui/context';
11
9
  import { radialGradient } from '../../utils';
@@ -33,10 +31,12 @@ export const VoiceIntercom = /*#__PURE__*/forwardRef((props, ref) => {
33
31
  bgColor,
34
32
  disabled = false
35
33
  } = props;
34
+ const [frame, setFrame] = useState(0);
35
+ const talkingInterval = useRef(null);
36
+ // 每帧间隔(ms)
36
37
  const {
37
38
  event
38
39
  } = useContext(UIEventContext);
39
- const renderMode = usePlayerRenderMode();
40
40
  const {
41
41
  recording,
42
42
  mute,
@@ -69,8 +69,11 @@ export const VoiceIntercom = /*#__PURE__*/forwardRef((props, ref) => {
69
69
  }
70
70
  console.log('==== 开始对讲 =====');
71
71
  originMuteStatusBeforeVoice.current = _mute;
72
- const started = await setIntercom(true);
73
- if (!started) return;
72
+ try {
73
+ await setIntercom(true);
74
+ } catch (e) {
75
+ console.error('setIntercom failed:', e);
76
+ }
74
77
  // 确定对讲有成功回调后,单向对讲判断开始对讲前需要静音
75
78
  // 确定对讲有成功回调后, 双路对讲开始对讲前需要打开拾音器
76
79
  const muteTarget = intercomMode === IntercomMode.OneWay;
@@ -95,18 +98,20 @@ export const VoiceIntercom = /*#__PURE__*/forwardRef((props, ref) => {
95
98
  }, [playState, intercom]);
96
99
  const endVoice = async () => {
97
100
  console.log('=== 结束对讲 ====');
98
- // 先释放对讲,扬声器恢复的失败或延迟不应阻止挂断。
99
- await setIntercom(false);
101
+ // 对讲结束之后,统一关闭静态状态
100
102
  await setMute(false);
103
+ await setIntercom(false);
101
104
  event.emit(startTimeToHideAllComponent);
102
105
  };
103
106
  const handTouchStart = async e => {
104
- var _props$event;
107
+ var _props$event, _props$event2;
105
108
  if (disabled) return;
106
- ((_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event).emit(widgetClick, {
109
+ (_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event;
110
+ ((_props$event2 = props.event) !== null && _props$event2 !== void 0 ? _props$event2 : event).emit(widgetClick, {
107
111
  widgetId: widgetLabs.VOICE_INTERCOM
108
112
  });
109
113
  onTouchStart(e);
114
+ getDefaultStore();
110
115
  if (loading.current) return;
111
116
  loading.current = true;
112
117
  // const _intercom = store.get(intercomAtom);
@@ -135,6 +140,47 @@ export const VoiceIntercom = /*#__PURE__*/forwardRef((props, ref) => {
135
140
  triggerIntercom: e => handTouchStart(e)
136
141
  }));
137
142
 
143
+ // 获取 requestAnimationFrame 和兼容性回退
144
+ const requestFrame = callback => {
145
+ if (typeof requestAnimationFrame !== 'undefined') {
146
+ return requestAnimationFrame(callback);
147
+ }
148
+ return setTimeout(callback, 30); // 使用 setTimeout 模拟帧更新
149
+ };
150
+ const cancelFrame = id => {
151
+ if (typeof cancelAnimationFrame !== 'undefined') {
152
+ cancelAnimationFrame(id);
153
+ } else {
154
+ clearTimeout(id); // 清除 setTimeout
155
+ }
156
+ };
157
+
158
+ /**
159
+ * 处理对讲中动画
160
+ */
161
+ useEffect(() => {
162
+ const updateFrame = () => {
163
+ setFrame(prevFrame => (prevFrame + 1) % 124);
164
+ talkingInterval.current = requestFrame(updateFrame);
165
+ };
166
+ const stopAnimation = () => {
167
+ if (talkingInterval.current) {
168
+ cancelFrame(talkingInterval.current);
169
+ talkingInterval.current = null;
170
+ }
171
+ };
172
+ intercom ? (() => {
173
+ if (!talkingInterval.current) {
174
+ talkingInterval.current = requestFrame(updateFrame);
175
+ }
176
+ })() : stopAnimation();
177
+ return () => {
178
+ stopAnimation();
179
+ };
180
+ }, [intercom]);
181
+
182
+ // 根据当前帧和矩形索引计算高度
183
+
138
184
  // 渲染对讲中的动画
139
185
 
140
186
  // 渲染非对讲状态的图标
@@ -149,44 +195,23 @@ export const VoiceIntercom = /*#__PURE__*/forwardRef((props, ref) => {
149
195
  }, intercomClassName),
150
196
  onTouchStart: handTouchStart,
151
197
  onTouchEnd: onTouchEnd
152
- }, intercom ? (() => {
153
- if (renderMode === 'lynx') {
154
- return /*#__PURE__*/React.createElement(View, {
155
- className: clsx('lynx-talking-bars', mode === 'circle' && 'intercom-default-size', mode !== 'circle' && 'ipc-player-plugin-voice-small-intercom', iconClassName),
156
- style: {
157
- transform: `scale(${scale})`,
158
- transformOrigin: 'center'
159
- }
160
- }, [0, 1, 2, 3, 4].map(index => {
161
- const baseHeight = [5, 10, 16, 10, 5][index];
162
- return /*#__PURE__*/React.createElement(View, {
163
- key: index,
164
- className: `lynx-talking-bar lynx-talking-bar-${index}`,
165
- style: {
166
- height: `${baseHeight}px`,
167
- background: talkingColor
168
- }
169
- });
170
- }));
198
+ }, intercom ? (() => /*#__PURE__*/React.createElement(View, {
199
+ className: clsx({
200
+ 'ipc-player-plugin-voice-small-ing-intercom': mode !== 'circle'
201
+ })
202
+ }, /*#__PURE__*/React.createElement(View, {
203
+ className: clsx('bars'),
204
+ style: {
205
+ transform: `scale(${scale})`,
206
+ transformOrigin: 'center'
171
207
  }
172
- return /*#__PURE__*/React.createElement(View, {
173
- className: clsx({
174
- 'ipc-player-plugin-voice-small-ing-intercom': mode !== 'circle'
175
- })
176
- }, /*#__PURE__*/React.createElement(View, {
177
- className: clsx('bars'),
178
- style: {
179
- transform: `scale(${scale})`,
180
- transformOrigin: 'center'
181
- }
182
- }, [0, 1, 2, 3, 4].map(index => /*#__PURE__*/React.createElement(View, {
183
- key: index,
184
- className: clsx('bar'),
185
- style: {
186
- background: talkingColor
187
- }
188
- }))));
189
- })() : (() => {
208
+ }, [0, 1, 2, 3, 4].map(index => /*#__PURE__*/React.createElement(View, {
209
+ key: index,
210
+ className: clsx('bar'),
211
+ style: {
212
+ background: talkingColor
213
+ }
214
+ })))))() : (() => {
190
215
  if (icon) {
191
216
  if (typeof icon === 'string') {
192
217
  return /*#__PURE__*/React.createElement(View, {
@@ -200,14 +225,13 @@ export const VoiceIntercom = /*#__PURE__*/forwardRef((props, ref) => {
200
225
  className: clsx('icon-image-default-container', iconClassName)
201
226
  }, icon);
202
227
  }
203
- const className = clsx('icon-panel',
204
- // 按 iconfont 的 font_class 使用 yuyin,而不是 name one-way-intercom。
205
- 'icon-panel-yuyin', mode === 'circle' && 'intercom-default-size', mode !== 'circle' && 'ipc-player-plugin-voice-small-intercom', iconClassName);
206
- if (renderMode === 'lynx') return /*#__PURE__*/React.createElement(PlayerText, {
207
- className: className
208
- });
209
- return /*#__PURE__*/React.createElement(Text, {
210
- className: className
228
+ return /*#__PURE__*/React.createElement(View, {
229
+ className: clsx('icon-panel',
230
+ // 类名按 iconfont 的 font_class 取,不是 name —— 图标库里这枚图标的
231
+ // name 是「one-way-intercom」(单向对讲)、font_class 是「yuyin」(unicode e63c),
232
+ // 而 CSS 类是按 font_class 生成的。曾经按 name 拼类名,字形永远找不到,
233
+ // 重新导出多少次都不会有那个类。别再"顺手改成语义化名字"。
234
+ 'icon-panel-yuyin', mode === 'circle' && 'intercom-default-size', mode !== 'circle' && 'ipc-player-plugin-voice-small-intercom', iconClassName)
211
235
  });
212
236
  })());
213
237
  });
@@ -32,23 +32,6 @@
32
32
  align-items: center;
33
33
  height: 100%;
34
34
  }
35
-
36
- // Lynx 由渲染线程绘制声波,独立类名避免依赖 :nth-child。
37
- .lynx-talking-bars {
38
- padding: 0 1px;
39
- display: flex;
40
- align-items: center;
41
- justify-content: center;
42
- }
43
-
44
- .lynx-talking-bar {
45
- width: 2px;
46
- margin: 0 1px;
47
- border-radius: 5px;
48
- transform-origin: center;
49
- animation: lynx-intercom-pulse 600ms ease-in-out infinite;
50
- }
51
-
52
35
  .ipc-player-plugin-voice-intercom-img {
53
36
  width: calc(@size * var(--ipc-player-size-scale, 1));
54
37
  height: calc(@size * var(--ipc-player-size-scale, 1));
@@ -168,21 +151,3 @@
168
151
  // transform: translateX(10px) translateY(-50%) rotate(45deg);
169
152
  // }
170
153
  // }
171
-
172
- @keyframes lynx-intercom-pulse {
173
- 0%,
174
- 100% {
175
- transform: scaleY(0.8);
176
- }
177
- 50% {
178
- transform: scaleY(1.2);
179
- }
180
- }
181
-
182
- .lynx-talking-bar-1,
183
- .lynx-talking-bar-3 {
184
- animation-delay: -200ms;
185
- }
186
- .lynx-talking-bar-2 {
187
- animation-delay: -400ms;
188
- }
@@ -1,8 +1,10 @@
1
1
  import React from 'react';
2
2
  import type { ZoomTurntableProps } from './type';
3
3
  import './index.less';
4
- declare const _default: {
5
- (props: ZoomTurntableProps): React.JSX.Element;
6
- displayName: string;
7
- };
8
- export default _default;
4
+ /**
5
+ * 焦距转盘渲染层。
6
+ * 内嵌自 ray-zoom-turntable,实际绘制与手势在 rjs(render 线程)内完成,
7
+ * 拖动不过桥,保证跟手。
8
+ */
9
+ declare const ZoomTurntable: React.FC<ZoomTurntableProps>;
10
+ export default ZoomTurntable;
@@ -1,9 +1,7 @@
1
1
  import React, { useRef } from 'react';
2
2
  // @ts-ignore rjs 原生组件,无类型声明
3
3
  import Component from './rjs/index.js';
4
- import LynxZoomTurntable from './lynx';
5
4
  import './index.less';
6
- import { withPlayerRenderer } from '../../../renderer/capabilities';
7
5
  let canvasIdCounter = 0;
8
6
 
9
7
  /**
@@ -83,4 +81,4 @@ const ZoomTurntable = props => {
83
81
  }
84
82
  });
85
83
  };
86
- export default withPlayerRenderer('zoomTurntable', ZoomTurntable, LynxZoomTurntable);
84
+ export default ZoomTurntable;
@@ -2,18 +2,16 @@ import React from 'react';
2
2
  import { ComponentConfigProps } from '../../interface';
3
3
  import './zoomTurntableDock.less';
4
4
  type Props = ComponentConfigProps & {
5
- /** 由 ui.tsx 的 absolute 容器分支注入(absolute-item-container) */
5
+ /** 由 ui.tsx 的 CoverView 分支注入(absolute-item-container) */
6
6
  className?: string;
7
- /** Internal native clipping host preserves legacy canvas coordinates. */
8
- lynxClipContentStyle?: React.CSSProperties;
9
7
  };
10
8
  /**
11
9
  * 焦距转盘浮层。
12
10
  *
13
- * 由播放器 absolute 容器承载(WebView 为 CoverView,Lynx 为 View):
11
+ * 必须由 CoverView 承载(Entry 里 addContent 不设 absoluteNoCoverView):
14
12
  * 播放器是原生组件、层级高于普通 View,放在普通 View 里的 canvas 会被它盖住,
15
13
  * touchstart 到不了 canvas,转盘完全滑不动(实测 setupEventListeners 成功但无任何 touch 日志)。
16
- * 定位与层级由承载容器通过 absolutePosition 提供。
14
+ * 定位与层级由承载的 CoverView 通过 absolutePosition 提供。
17
15
  */
18
16
  export declare const ZoomTurntableDock: (props: Props) => React.JSX.Element | null;
19
17
  export {};
@@ -34,10 +34,10 @@ const getPageId = () => {
34
34
  /**
35
35
  * 焦距转盘浮层。
36
36
  *
37
- * 由播放器 absolute 容器承载(WebView 为 CoverView,Lynx 为 View):
37
+ * 必须由 CoverView 承载(Entry 里 addContent 不设 absoluteNoCoverView):
38
38
  * 播放器是原生组件、层级高于普通 View,放在普通 View 里的 canvas 会被它盖住,
39
39
  * touchstart 到不了 canvas,转盘完全滑不动(实测 setupEventListeners 成功但无任何 touch 日志)。
40
- * 定位与层级由承载容器通过 absolutePosition 提供。
40
+ * 定位与层级由承载的 CoverView 通过 absolutePosition 提供。
41
41
  */
42
42
  export const ZoomTurntableDock = props => {
43
43
  var _initialValueRef$curr;
@@ -292,7 +292,7 @@ export const ZoomTurntableDock = props => {
292
292
  requestClose();
293
293
  });
294
294
 
295
- // 定位由播放器承载容器负责(absolutePosition),这里只做布局容器。
295
+ // 定位由承载的 CoverView 负责(absolutePosition),这里只做布局容器。
296
296
  const turntableStyle = useMemo(() => ({
297
297
  width: isRight ? 'auto' : '100%',
298
298
  height: '100%',
@@ -327,7 +327,7 @@ export const ZoomTurntableDock = props => {
327
327
  className: clsx(className, 'ipc-player-plugin-zoom-turntable-dock', {
328
328
  'ipc-player-plugin-zoom-turntable-dock-right': isRight
329
329
  }),
330
- style: _objectSpread(_objectSpread({}, turntableStyle), props.lynxClipContentStyle)
330
+ style: turntableStyle
331
331
  }, /*#__PURE__*/React.createElement(View, {
332
332
  style: canvasHolderStyle
333
333
  }, /*#__PURE__*/React.createElement(ZoomTurntable, {
@@ -2,14 +2,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import "core-js/modules/esnext.iterator.constructor.js";
3
3
  import "core-js/modules/esnext.iterator.map.js";
4
4
  import React, { useContext, useEffect, useRef, useState } from 'react';
5
- import { View, usePageEvent } from '@ray-js/ray';
5
+ import { View, Text, usePageEvent } from '@ray-js/ray';
6
6
  import clsx from 'clsx';
7
7
  import { useMemoizedFn } from 'ahooks';
8
- import { usePlayerRenderMode } from '../../renderer/context';
9
- import { clipZoomDock } from './lynxDockLayout';
10
- import { dialGeometry } from './turntable/lynxModel';
11
- import { STYLE_OPTIONS_RIGHT, CROP_RATIO_RIGHT, FORCE_SHOW_ZOOM_TIP, LONG_PRESS_MS, MOVE_TOLERANCE, TIP_RESHOW_DELAY, getZoomDockBottom, getZoomDockHeight, getZoomDockRight, ZOOM_DOCK_Z_INDEX, zoomTurntableClose, zoomTurntableDockId, zoomTurntableOpen, zoomTurntableTipId } from './constants';
12
- import { PlayerText as Text } from '../../renderer/text';
13
8
  import { useStore } from '../../ctx/store';
14
9
  import { UIEventContext } from '../../ui/context';
15
10
  import { PlayState } from '../../interface';
@@ -20,6 +15,7 @@ import { ZoomTurntableDock } from './zoomTurntableDock';
20
15
  import { ZoomTurntableTip } from './zoomTurntableTip';
21
16
  import { measureBottomBarHeight, measureEntryVisible } from './measureVisible';
22
17
  import { ZOOM_ENTRY_ANCHOR_CLS } from './entryAnchor';
18
+ import { FORCE_SHOW_ZOOM_TIP, LONG_PRESS_MS, MOVE_TOLERANCE, TIP_RESHOW_DELAY, getZoomDockBottom, getZoomDockHeight, getZoomDockRight, ZOOM_DOCK_Z_INDEX, zoomTurntableClose, zoomTurntableDockId, zoomTurntableOpen, zoomTurntableTipId } from './constants';
23
19
  import './zoomTurntableEntry.less';
24
20
  /**
25
21
  * 焦距转盘入口:左下角工具条中的图标,长按弹出转盘。
@@ -28,7 +24,6 @@ import './zoomTurntableEntry.less';
28
24
  */
29
25
  export const ZoomTurntableEntry = props => {
30
26
  var _props$event;
31
- const renderMode = usePlayerRenderMode();
32
27
  const {
33
28
  devId,
34
29
  className,
@@ -133,35 +128,27 @@ export const ZoomTurntableEntry = props => {
133
128
  }
134
129
  event.emit(pauseTimeToHideAllComponent);
135
130
  if (!hasContent('absolute', zoomTurntableDockId)) {
136
- // 由播放器 absolute 容器承载(不能设 absoluteNoCoverView):WebView 使用 CoverView,Lynx 使用 View,
131
+ // 必须用 CoverView 承载(不能设 absoluteNoCoverView):播放器是原生组件、层级更高,
137
132
  // 普通 View 里的 canvas 会被它盖住,touchstart 到不了 canvas,转盘滑不动。
138
- const legacyPosition = screenType === 'full' ? {
139
- top: 0,
140
- right: getZoomDockRight(),
141
- bottom: 0,
142
- zIndex: ZOOM_DOCK_Z_INDEX
143
- } : {
144
- left: 0,
145
- right: 0,
146
- // 一律是带单位的 px 字符串 —— 裸数字会被当 rpx,见 constants 里 px() 的说明。
147
- // 竖屏全屏让出底部工具条(实测高度,避免与 ui.tsx 的写死值不同步);
148
- // 普通竖屏工具条已藏,直接下沉一份底部触摸余量贴住播放器底边。
149
- bottom: getZoomDockBottom(isVerticalFull, barHeight),
150
- height: getZoomDockHeight(isVerticalFull),
151
- zIndex: ZOOM_DOCK_Z_INDEX
152
- };
153
- const clipped = renderMode === 'lynx' ? clipZoomDock(legacyPosition, screenType === 'full' ? dialGeometry({
154
- orientation: 'right',
155
- cropRatio: CROP_RATIO_RIGHT,
156
- styleOptions: STYLE_OPTIONS_RIGHT
157
- }).width : undefined) : null;
158
133
  addContent('absolute', {
159
134
  id: zoomTurntableDockId,
160
135
  content: dockProps => /*#__PURE__*/React.createElement(ZoomTurntableDock, dockProps),
161
- absolutePosition: (clipped === null || clipped === void 0 ? void 0 : clipped.position) || legacyPosition,
162
- initProps: _objectSpread(_objectSpread({
163
- lynxClipContentStyle: clipped === null || clipped === void 0 ? void 0 : clipped.content
164
- }, props), {}, {
136
+ absolutePosition: screenType === 'full' ? {
137
+ top: 0,
138
+ right: getZoomDockRight(),
139
+ bottom: 0,
140
+ zIndex: ZOOM_DOCK_Z_INDEX
141
+ } : {
142
+ left: 0,
143
+ right: 0,
144
+ // 一律是带单位的 px 字符串 —— 裸数字会被当 rpx,见 constants 里 px() 的说明。
145
+ // 竖屏全屏让出底部工具条(实测高度,避免与 ui.tsx 的写死值不同步);
146
+ // 普通竖屏工具条已藏,直接下沉一份底部触摸余量贴住播放器底边。
147
+ bottom: getZoomDockBottom(isVerticalFull, barHeight),
148
+ height: getZoomDockHeight(isVerticalFull),
149
+ zIndex: ZOOM_DOCK_Z_INDEX
150
+ },
151
+ initProps: _objectSpread(_objectSpread({}, props), {}, {
165
152
  skipLoad: true
166
153
  })
167
154
  });
@@ -1,9 +1,6 @@
1
1
  import React, { useEffect, useState } from 'react';
2
- import { View } from '@ray-js/ray';
2
+ import { CoverView, Text, View } from '@ray-js/ray';
3
3
  import clsx from 'clsx';
4
- import { usePlayerOverlayHost, usePlayerOverlayFillStyle } from '../../renderer/overlay';
5
- import { usePlayerRenderMode } from '../../renderer/context';
6
- import { PlayerText as Text } from '../../renderer/text';
7
4
  import { useStore } from '../../ctx/store';
8
5
  import { PlayState } from '../../interface';
9
6
  import { widgetClick, widgetLabs } from '../../ui/constant';
@@ -19,14 +16,11 @@ import './zoomTurntableTip.less';
19
16
  * 差别在于入口位于横向 ScrollView 内、位置不固定,所以圈选框坐标由 JS 内联注入而非写死。
20
17
  */
21
18
  export const ZoomTurntableTip = props => {
22
- const Host = usePlayerOverlayHost();
23
- const overlayStyle = usePlayerOverlayFillStyle();
24
19
  const {
25
20
  devId,
26
21
  deleteContent,
27
22
  anchorRect
28
23
  } = props;
29
- const isLynx = usePlayerRenderMode() === 'lynx';
30
24
  const {
31
25
  playState
32
26
  } = useStore({
@@ -70,10 +64,7 @@ export const ZoomTurntableTip = props => {
70
64
  if (playState !== PlayState.PLAYING || !layout) {
71
65
  return null;
72
66
  }
73
- return /*#__PURE__*/React.createElement(Host, {
74
- className: isLynx ? 'ipc-player-plugin-zoom-turntable-tip-native' : undefined,
75
- style: overlayStyle
76
- }, /*#__PURE__*/React.createElement(View, {
67
+ return /*#__PURE__*/React.createElement(CoverView, null, /*#__PURE__*/React.createElement(View, {
77
68
  className: clsx('ipc-player-plugin-zoom-turntable-tip-ring'),
78
69
  style: layout.ring
79
70
  }), /*#__PURE__*/React.createElement(View, {
@@ -93,10 +84,5 @@ export const ZoomTurntableTip = props => {
93
84
  const storage = new Storage(devId);
94
85
  storage.set(zoomTurntableTipId, true);
95
86
  }
96
- }, isLynx ? /*#__PURE__*/React.createElement(Text, {
97
- style: {
98
- fontSize: '12px',
99
- lineHeight: '17px'
100
- }
101
- }, Strings.getLang('ipc_player_tip_confirm')) : Strings.getLang('ipc_player_tip_confirm'))));
87
+ }, Strings.getLang('ipc_player_tip_confirm'))));
102
88
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ray-js/ipc-player-integration",
3
- "version": "0.0.71-beta.0",
3
+ "version": "0.0.72-beta.0",
4
4
  "description": "IPC 融合播放器",
5
5
  "main": "lib/index",
6
6
  "files": [
@@ -29,19 +29,17 @@
29
29
  "start:web": "ray start ./example -t web",
30
30
  "prepublishOnly": "yarn build",
31
31
  "release-it": "standard-version",
32
- "test": "yarn jest",
33
- "test:lynx": "node --test tests/*.test.cjs",
34
- "test:features": "jest --runInBand --runTestsByPath tests/master-features.test.tsx tests/auto-clarity-config.test.tsx src/utils/authorize/album.test.ts src/widgets/recordVideo/recordVideo.test.tsx src/widgets/screenshot/screenshot.test.tsx src/widgets/zoomTurntable/lensModel.test.ts src/widgets/muted/muted.test.tsx tests/zoom-turntable-tip.test.tsx tests/zoom-turntable-touch.test.tsx"
32
+ "test": "yarn jest"
35
33
  },
36
34
  "peerDependencies": {
37
35
  "ahooks": "^3.1.6"
38
36
  },
39
37
  "dependencies": {
40
- "@ray-js/direction-control": "0.0.13-beta.1",
41
- "@ray-js/ipc-ptz-zoom": "0.0.5-beta.0",
38
+ "@ray-js/direction-control": "^0.0.8",
39
+ "@ray-js/ipc-ptz-zoom": "^0.0.3",
42
40
  "@ray-js/panel-sdk": "^1.13.1",
43
- "@ray-js/ray-ipc-player": "2.1.8-beta.1",
44
- "@ray-js/ray-ipc-utils": "^1.1.18",
41
+ "@ray-js/ray-ipc-player": "^2.1.7",
42
+ "@ray-js/ray-ipc-utils": "^1.1.16",
45
43
  "@ray-js/svg": "0.2.0",
46
44
  "clsx": "^1.2.1",
47
45
  "color": "^5.0.2",
@@ -59,13 +57,7 @@
59
57
  "eslint-config-tuya-panel": "^0.4.2",
60
58
  "husky": "^1.2.0",
61
59
  "lint-staged": "^10.2.11",
62
- "standard-version": "9.3.2",
63
- "react": "17.0.2",
64
- "react-dom": "17.0.2",
65
- "typescript": "4.9.5",
66
- "jest": "29.7.0",
67
- "ts-jest": "29.2.6",
68
- "jest-environment-jsdom": "29.7.0"
60
+ "standard-version": "9.3.2"
69
61
  },
70
62
  "resolutions": {
71
63
  "@ray-js/builder-mp": "^1.7.62"
@@ -1,85 +0,0 @@
1
- import { act, renderHook } from '@testing-library/react-hooks/dom';
2
- import { createUseCtx } from './ctx';
3
- import { getDefaultStore } from './store';
4
- jest.mock('@ray-js/ray', () => ({
5
- getSystemInfoSync: () => ({
6
- platform: 'android'
7
- })
8
- }));
9
- jest.mock('@ray-js/ray-ipc-utils/lib/interface', () => ({
10
- IntercomMode: {
11
- OneWay: 'OneWay',
12
- TwoWay: 'TwoWay'
13
- },
14
- ClarityType: {
15
- SD: 'SD',
16
- HD: 'HD',
17
- AUTO: 'AUTO'
18
- }
19
- }));
20
- jest.mock('../i18n', () => ({
21
- __esModule: true,
22
- default: {
23
- getLang: key => key
24
- }
25
- }));
26
- jest.mock('./multiCameraCtx', () => ({
27
- isMultiCameraTileSupported: () => false,
28
- useMultiCameraCtx: () => ({})
29
- }));
30
- jest.mock('./useAutoClarity', () => ({
31
- useAutoClarity: () => ({
32
- refreshAfterPlayback: () => undefined,
33
- restoreResolution: () => undefined,
34
- prepareResolutionSelection: () => undefined,
35
- finishResolutionSelection: () => undefined
36
- })
37
- }));
38
- it.each([undefined, null, {
39
- errorMsg: 'occupied'
40
- }, {
41
- innerError: {
42
- errorMsg: 'occupied'
43
- }
44
- }])('settles occupied/empty native failures, shows a toast and allows retry: %j', async error => {
45
- let pending;
46
- const player = {
47
- startTalk: jest.fn(options => {
48
- pending = options;
49
- })
50
- };
51
- const toast = jest.fn();
52
- global.ty = {
53
- authorizeStatus: _ref => {
54
- let {
55
- success
56
- } = _ref;
57
- return success({});
58
- }
59
- };
60
- const useCtx = createUseCtx({
61
- createPlayContext: () => player,
62
- toast,
63
- getMemoryState: () => new Promise(() => undefined)
64
- });
65
- const {
66
- result,
67
- unmount
68
- } = renderHook(() => useCtx({
69
- devId: 'test'
70
- }));
71
- const promise = result.current.setIntercom(true);
72
- const settled = promise.then(() => 'success', () => 'failure');
73
- expect(() => pending.fail(error)).not.toThrow();
74
- await expect(settled).resolves.toBe('failure');
75
- expect(toast).toHaveBeenCalledWith({
76
- title: error ? 'occupied' : 'ipc_player_error_intercom'
77
- });
78
- expect(getDefaultStore().get(result.current.intercom)).toBe(false);
79
- const retry = result.current.setIntercom(true);
80
- act(() => pending.success());
81
- await expect(retry).resolves.toBe(true);
82
- expect(player.startTalk).toHaveBeenCalledTimes(2);
83
- unmount();
84
- delete global.ty;
85
- });
@@ -1,8 +0,0 @@
1
- import React from 'react';
2
- export type LynxPlayerAdapters = Partial<Record<'zoomTurntable' | 'ptzZoom' | 'directionControl', React.ComponentType<any>>>;
3
- export declare const LynxPlayerAdaptersContext: React.Context<Partial<Record<"zoomTurntable" | "ptzZoom" | "directionControl", React.ComponentType<any>>>>;
4
- /** Never mount a WebView-only RJS renderer in the Lynx tree. */
5
- export declare function withPlayerRenderer<P>(capability: keyof LynxPlayerAdapters, WebViewComponent: React.ComponentType<P>, LynxComponent?: React.ComponentType<P>): {
6
- (props: P): React.JSX.Element;
7
- displayName: string;
8
- };
@@ -1,19 +0,0 @@
1
- import React, { createContext, useContext } from 'react';
2
- import { usePlayerRenderMode } from './context';
3
- export const LynxPlayerAdaptersContext = /*#__PURE__*/createContext({});
4
-
5
- /** Never mount a WebView-only RJS renderer in the Lynx tree. */
6
- export function withPlayerRenderer(capability, WebViewComponent, LynxComponent) {
7
- const RendererComponent = props => {
8
- const mode = usePlayerRenderMode();
9
- const adapters = useContext(LynxPlayerAdaptersContext);
10
- if (mode !== 'lynx') return /*#__PURE__*/React.createElement(WebViewComponent, props);
11
- const Adapter = adapters[capability] || LynxComponent;
12
- if (!Adapter) {
13
- throw new Error(`IPC_LYNX_CAPABILITY_MISSING:${capability}. Supply a supported Native/WebView adapter before enabling this widget.`);
14
- }
15
- return /*#__PURE__*/React.createElement(Adapter, props);
16
- };
17
- RendererComponent.displayName = `PlayerRenderer(${String(capability)})`;
18
- return RendererComponent;
19
- }
@@ -1,5 +0,0 @@
1
- /// <reference types="react" />
2
- export declare const PlayerControlVisibilityContext: import("react").Context<boolean | undefined>;
3
- export type PlayerRenderMode = 'webview' | 'lynx';
4
- export declare const PlayerRenderModeContext: import("react").Context<PlayerRenderMode>;
5
- export declare const usePlayerRenderMode: () => PlayerRenderMode;
@@ -1,6 +0,0 @@
1
- import { createContext, useContext } from 'react';
2
-
3
- // Scoped to the control bars, not absolute widgets or the standalone intercom.
4
- export const PlayerControlVisibilityContext = /*#__PURE__*/createContext(undefined);
5
- export const PlayerRenderModeContext = /*#__PURE__*/createContext('webview');
6
- export const usePlayerRenderMode = () => useContext(PlayerRenderModeContext);
@@ -1,6 +0,0 @@
1
- /// <reference types="react" />
2
- declare const _default: {
3
- (props: import("@ray-js/direction-control").IProps): import("react").JSX.Element;
4
- displayName: string;
5
- };
6
- export default _default;
@@ -1,3 +0,0 @@
1
- import WebViewDirectionControl from '@ray-js/direction-control';
2
- import { withPlayerRenderer } from './capabilities';
3
- export default withPlayerRenderer('directionControl', WebViewDirectionControl);