@ray-js/ipc-player-integration 0.0.58-beta.1 → 0.0.59-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 (123) hide show
  1. package/README.md +6 -0
  2. package/lib/ctx/ctx.composition.js +4 -19
  3. package/lib/ctx/ctx.js +55 -106
  4. package/lib/ctx/ports.output.d.ts +0 -1
  5. package/lib/ctx/resolution.d.ts +1 -1
  6. package/lib/ctx/resolution.js +1 -9
  7. package/lib/i18n/index.d.ts +0 -12
  8. package/lib/i18n/strings.d.ts +0 -6
  9. package/lib/i18n/strings.js +0 -6
  10. package/lib/index.d.ts +4 -0
  11. package/lib/index.js +3 -1
  12. package/lib/interface.d.ts +3 -16
  13. package/lib/renderer/capabilities.d.ts +8 -0
  14. package/lib/renderer/capabilities.js +19 -0
  15. package/lib/renderer/context.d.ts +5 -0
  16. package/lib/renderer/context.js +6 -0
  17. package/lib/renderer/directionControl.d.ts +6 -0
  18. package/lib/renderer/directionControl.js +3 -0
  19. package/lib/renderer/font.less +5 -0
  20. package/lib/renderer/glyphs.d.ts +1 -0
  21. package/lib/renderer/glyphs.js +256 -0
  22. package/lib/renderer/index.module.less +48 -0
  23. package/lib/renderer/ptzZoom.d.ts +6 -0
  24. package/lib/renderer/ptzZoom.js +3 -0
  25. package/lib/renderer/text.d.ts +4 -0
  26. package/lib/renderer/text.js +32 -0
  27. package/lib/renderer/text.module.less +4 -0
  28. package/lib/renderer/viewport.d.ts +7 -0
  29. package/lib/renderer/viewport.js +24 -0
  30. package/lib/res/lynx-signal/index.d.ts +1 -0
  31. package/lib/res/lynx-signal/index.js +22 -0
  32. package/lib/res/lynx-signal/signalFour0.png +0 -0
  33. package/lib/res/lynx-signal/signalFour1.png +0 -0
  34. package/lib/res/lynx-signal/signalFour2.png +0 -0
  35. package/lib/res/lynx-signal/signalFour3.png +0 -0
  36. package/lib/res/lynx-signal/signalFour4.png +0 -0
  37. package/lib/res/lynx-signal/signalThree0.png +0 -0
  38. package/lib/res/lynx-signal/signalThree1.png +0 -0
  39. package/lib/res/lynx-signal/signalThree2.png +0 -0
  40. package/lib/res/lynx-signal/signalThree3.png +0 -0
  41. package/lib/res/player-more-arrow.png +0 -0
  42. package/lib/ui/bottomLeftContent.js +118 -52
  43. package/lib/ui/bottomRightContent.js +6 -3
  44. package/lib/ui/scrollHintArrow.d.ts +23 -0
  45. package/lib/ui/scrollHintArrow.js +82 -0
  46. package/lib/ui/ui.d.ts +5 -0
  47. package/lib/ui/ui.js +60 -45
  48. package/lib/utils/ttt.js +8 -2
  49. package/lib/widgets/battery/battery.js +2 -1
  50. package/lib/widgets/battery/batteryFull.js +2 -1
  51. package/lib/widgets/floodlight/floodlight.js +2 -1
  52. package/lib/widgets/flowLowTip/flowLowTip.js +2 -1
  53. package/lib/widgets/fullScreen/fullScreen.js +2 -1
  54. package/lib/widgets/fullScreen/fullTravelRouteControl.d.ts +1 -1
  55. package/lib/widgets/fullScreen/fullTravelRouteControl.js +1 -1
  56. package/lib/widgets/fullScreen/verticalScreen.js +2 -1
  57. package/lib/widgets/index.d.ts +0 -1
  58. package/lib/widgets/index.js +1 -2
  59. package/lib/widgets/moveInteractiveControl/controlButton.js +2 -1
  60. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.js +12 -3
  61. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.less +24 -4
  62. package/lib/widgets/multiCamera/landscapeTip.js +2 -1
  63. package/lib/widgets/multiCamera/moveablePtzControl.js +1 -1
  64. package/lib/widgets/multiCamera/multiPtz.js +2 -1
  65. package/lib/widgets/multiCamera/ptzMoveableTip.js +2 -1
  66. package/lib/widgets/multiCamera/switchLayout.js +2 -1
  67. package/lib/widgets/multiCamera/tileMultiPtz.js +2 -1
  68. package/lib/widgets/multiCamera/tileSwitchLayout.js +2 -1
  69. package/lib/widgets/multiCamera/tileTip.js +2 -1
  70. package/lib/widgets/muted/muted.js +5 -10
  71. package/lib/widgets/muted/muted.less +1 -5
  72. package/lib/widgets/ptz/ptz.js +2 -1
  73. package/lib/widgets/ptz/ptzControl.js +1 -1
  74. package/lib/widgets/ptzControlTip/ptzControlTip.js +6 -3
  75. package/lib/widgets/ptzControlTip/ptzControlTip.less +6 -0
  76. package/lib/widgets/realTimeMagnification/realTimeMagnification.js +2 -1
  77. package/lib/widgets/recordVideo/recordVideo.js +53 -53
  78. package/lib/widgets/recordVideo/recordVideo.less +74 -17
  79. package/lib/widgets/recordVideo/recordVideo.test.js +0 -1
  80. package/lib/widgets/resolution/fullResolutionControl.js +29 -19
  81. package/lib/widgets/resolution/resolution.js +3 -2
  82. package/lib/widgets/screenshot/screenshot.js +45 -66
  83. package/lib/widgets/screenshot/screenshot.less +40 -1
  84. package/lib/widgets/signal4G/signal4G.js +4 -1
  85. package/lib/widgets/siren/siren.js +2 -1
  86. package/lib/widgets/tempHumidity/tempHumidity.js +2 -1
  87. package/lib/widgets/toggleVerticalFull/toggleVerticalFull.js +2 -1
  88. package/lib/widgets/trialBadge/index.js +8 -3
  89. package/lib/widgets/trialBadge/index.less +24 -0
  90. package/lib/widgets/tryExperience/tryExperience.js +3 -1
  91. package/lib/widgets/videoBitKBP/videoBitKBP.js +2 -1
  92. package/lib/widgets/voiceIntercom/voiceIntercom.js +50 -24
  93. package/lib/widgets/voiceIntercom/voiceIntercom.less +16 -0
  94. package/lib/widgets/zoomTurntable/turntable/index.d.ts +5 -7
  95. package/lib/widgets/zoomTurntable/turntable/index.js +2 -1
  96. package/lib/widgets/zoomTurntable/zoomTurntableEntry.js +2 -1
  97. package/lib/widgets/zoomTurntable/zoomTurntableTip.js +2 -1
  98. package/package.json +15 -8
  99. package/lib/ctx/ctx.album.test.d.ts +0 -1
  100. package/lib/ctx/ctx.album.test.js +0 -197
  101. package/lib/ctx/useAutoClarityConfig.d.ts +0 -8
  102. package/lib/ctx/useAutoClarityConfig.js +0 -40
  103. package/lib/ui/absoluteContent.d.ts +0 -2
  104. package/lib/ui/absoluteContent.js +0 -3
  105. package/lib/utils/captureResult.d.ts +0 -14
  106. package/lib/utils/captureResult.js +0 -70
  107. package/lib/utils/captureResult.test.d.ts +0 -1
  108. package/lib/utils/captureResult.test.js +0 -117
  109. package/lib/utils/productAbility.d.ts +0 -6
  110. package/lib/utils/productAbility.js +0 -20
  111. package/lib/widgets/captureResult/captureResult.d.ts +0 -16
  112. package/lib/widgets/captureResult/captureResult.js +0 -85
  113. package/lib/widgets/captureResult/captureResult.less +0 -144
  114. package/lib/widgets/captureResult/captureResult.test.d.ts +0 -1
  115. package/lib/widgets/captureResult/captureResult.test.js +0 -80
  116. package/lib/widgets/captureResult/index.d.ts +0 -2
  117. package/lib/widgets/captureResult/index.js +0 -2
  118. package/lib/widgets/muted/muted.test.d.ts +0 -1
  119. package/lib/widgets/muted/muted.test.js +0 -81
  120. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.d.ts +0 -1
  121. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.js +0 -106
  122. package/lib/widgets/screenshot/screenshot.test.d.ts +0 -1
  123. package/lib/widgets/screenshot/screenshot.test.js +0 -120
@@ -1,6 +1,8 @@
1
1
  import React, { useState } from 'react';
2
- import { View, Image, CoverView, Text, setStorage } from '@ray-js/ray';
2
+ import { View, Image, CoverView, setStorage } from '@ray-js/ray';
3
3
  import clsx from 'clsx';
4
+ import { PlayerText as Text } from '../../renderer/text';
5
+ import { usePlayerRenderMode } from '../../renderer/context';
4
6
  import { useStore } from '../../ctx/store';
5
7
  import { ptzControlTipId, widgetLabs, widgetClick } from '../../ui/constant';
6
8
  import { PlayState } from '../../interface';
@@ -12,6 +14,7 @@ export const PtzControlTip = props => {
12
14
  devId,
13
15
  deleteContent
14
16
  } = props;
17
+ const isLynx = usePlayerRenderMode() === 'lynx';
15
18
  const [showTipModal, setShowTipModal] = useState(true);
16
19
  const {
17
20
  playState
@@ -34,9 +37,9 @@ export const PtzControlTip = props => {
34
37
  return /*#__PURE__*/React.createElement(CoverView, {
35
38
  className: clsx('playerControlTipContainer')
36
39
  }, /*#__PURE__*/React.createElement(Image, {
37
- mode: "widthFix",
40
+ mode: isLynx ? 'aspectFit' : 'widthFix',
38
41
  src: playerPtzControlTip,
39
- className: clsx('controlTipImage')
42
+ className: clsx('controlTipImage', isLynx && 'controlTipImageLynx')
40
43
  }), /*#__PURE__*/React.createElement(Text, {
41
44
  className: clsx('controlTipText')
42
45
  }, Strings.getLang('ipc_player_ptz_control_tip')), /*#__PURE__*/React.createElement(View, {
@@ -39,3 +39,9 @@
39
39
  color: #ffffff;
40
40
  }
41
41
  }
42
+
43
+ // Original PNG is 404 x 158. Lynx needs both dimensions; widthFix is WebView-only.
44
+ .playerControlTipContainer .controlTipImageLynx {
45
+ height: calc(66.4851485149px * var(--ipc-player-size-scale, 1));
46
+ flex-shrink: 0;
47
+ }
@@ -1,6 +1,7 @@
1
1
  import React, { useCallback, useEffect, useMemo, useState } from 'react';
2
- import { View, Text } from '@ray-js/ray';
2
+ import { View } from '@ray-js/ray';
3
3
  import clsx from 'clsx';
4
+ import { PlayerText as Text } from '../../renderer/text';
4
5
  import { PlayState } from '../../interface';
5
6
  import { useStore } from '../../ctx/store';
6
7
  import { useDpSupport } from '../../hooks/useDpSupport';
@@ -1,12 +1,11 @@
1
1
  import React, { useState, useEffect, useRef, useContext } from 'react';
2
- import { View, Text, getSystemInfoSync } from '@ray-js/ray';
2
+ import { View, Image, getSystemInfoSync } from '@ray-js/ray';
3
3
  import { useSetState, useUpdateEffect } from 'ahooks';
4
4
  import clsx from 'clsx';
5
5
  import { goToIpcPageNativeRoute } from '@ray-js/ray-ipc-utils';
6
+ import { PlayerText as Text } from '../../renderer/text';
6
7
  import Strings from '../../i18n';
7
8
  import { PlayState } from '../../interface';
8
- import { getCaptureResultSummary } from '../../utils/captureResult';
9
- import { CaptureResultToast } from '../captureResult/captureResult';
10
9
  import { UIEventContext } from '../../ui/context';
11
10
  import { pauseTimeToHideAllComponent, changeIgnoreHideStopPreview, widgetLabs, widgetClick } from '../../ui/constant';
12
11
  import { useStore, getDefaultStore } from '../../ctx/store';
@@ -102,45 +101,22 @@ export function RecordVideo(props) {
102
101
  playState: props.playState
103
102
  });
104
103
  const [state, setState] = useSetState({
104
+ showTimer: false,
105
105
  showShot: false,
106
- shotUrl: '',
107
- shotCount: 0
106
+ shotUrl: ''
108
107
  });
109
- const recordResultRequestIdRef = useRef(0);
110
- useEffect(() => {
111
- return () => {
112
- recordResultRequestIdRef.current += 1;
113
- };
114
- }, []);
115
- const showRecordResult = async recordInfo => {
116
- var _props$multiCameraCtx;
117
- const requestId = ++recordResultRequestIdRef.current;
118
- const splitNum = (_props$multiCameraCtx = props.multiCameraCtx) === null || _props$multiCameraCtx === void 0 || (_props$multiCameraCtx = _props$multiCameraCtx.protocol) === null || _props$multiCameraCtx === void 0 ? void 0 : _props$multiCameraCtx.total_split_num;
119
- const summary = await getCaptureResultSummary(recordInfo, {
120
- multiLens: props.multiLens,
121
- protocolCount: splitNum,
122
- devId
123
- });
124
- if (requestId !== recordResultRequestIdRef.current) return;
125
- if (!summary) return;
126
- setState({
127
- showShot: true,
128
- shotUrl: summary.thumbnailPath,
129
- shotCount: summary.isMultiLens ? summary.count : 0
130
- });
131
- };
132
108
 
133
109
  /**
134
110
  * 针对 playState为非连接中状态时,如果处于录制中, 结束录制
135
111
  */
136
112
  useEffect(() => {
137
113
  (async () => {
138
- if (playState !== PlayState.PLAYING && recording) {
139
- try {
140
- const recordInfo = await setRecording(false);
141
- await showRecordResult(recordInfo);
142
- } catch {
143
- // setRecording reports the native failure through the configured toast.
114
+ if (playState !== PlayState.PLAYING) {
115
+ if (recording) {
116
+ setState({
117
+ showTimer: false
118
+ });
119
+ await setRecording(false);
144
120
  }
145
121
  }
146
122
  })();
@@ -154,8 +130,7 @@ export function RecordVideo(props) {
154
130
  timer.current = setTimeout(() => {
155
131
  setState({
156
132
  showShot: false,
157
- shotUrl: '',
158
- shotCount: 0
133
+ shotUrl: ''
159
134
  });
160
135
  deleteContent('absolute', RECORD_VIDEO_SUCCESS_TOAST_ID);
161
136
  }, CLOSE_TIME);
@@ -175,20 +150,22 @@ export function RecordVideo(props) {
175
150
  showRecordToast();
176
151
  }
177
152
  }, [state.showShot, screenType]);
153
+
154
+ /** 根据showTimer的显示定时器 */
178
155
  useUpdateEffect(() => {
179
- if (recording) {
156
+ if (state.showTimer) {
180
157
  showRecordTimer();
181
158
  } else {
182
159
  deleteContent('absolute', RECORD_VIDEO_TIMER_ID);
160
+ // 清除定时器,元素移除
183
161
  }
184
- }, [recording]);
162
+ }, [state.showTimer]);
185
163
 
186
164
  /** 跳转相册 */
187
165
  const handCheck = () => {
188
166
  setState({
189
167
  showShot: false,
190
- shotUrl: '',
191
- shotCount: 0
168
+ shotUrl: ''
192
169
  });
193
170
  deleteContent('absolute', RECORD_VIDEO_SUCCESS_TOAST_ID);
194
171
  clearInterval(timer.current);
@@ -210,13 +187,27 @@ export function RecordVideo(props) {
210
187
  marginLeft: screenType === 'vertical' ? '0' : '-200px'
211
188
  },
212
189
  content: () => {
213
- return /*#__PURE__*/React.createElement(CaptureResultToast, {
214
- brandColor: brandColor,
215
- count: state.shotCount,
216
- kind: "record",
217
- onCheck: handCheck,
218
- thumbnailPath: state.shotUrl
219
- });
190
+ return /*#__PURE__*/React.createElement(View, {
191
+ className: "ipc-player-plugin-record-success-toast"
192
+ }, /*#__PURE__*/React.createElement(View, {
193
+ className: "ipc-player-plugin-record-success-toast-image-box"
194
+ }, /*#__PURE__*/React.createElement(Image, {
195
+ className: "ipc-player-plugin-record-success-toast-image",
196
+ src: state.shotUrl
197
+ }), /*#__PURE__*/React.createElement(View, {
198
+ className: "ipc-player-plugin-record-success-play-icon-box"
199
+ }, /*#__PURE__*/React.createElement(Text, {
200
+ className: clsx('icon-panel', 'icon-panel-record-play', 'ipc-player-plugin-record-success-play-icon')
201
+ }))), /*#__PURE__*/React.createElement(View, {
202
+ className: "ipc-player-plugin-record-success-toast-title"
203
+ }, Strings.getLang('ipc_player_record_success_tip')), /*#__PURE__*/React.createElement(View, {
204
+ onClick: handCheck,
205
+ className: "ipc-player-plugin-record-success-toast-bottom",
206
+ style: {
207
+ color: brandColor,
208
+ borderColor: brandColor
209
+ }
210
+ }, Strings.getLang('ipc_player_record_success_check')));
220
211
  }
221
212
  });
222
213
  timeToCloseRecordToast();
@@ -228,8 +219,8 @@ export function RecordVideo(props) {
228
219
  absoluteContentClassName: 'ipc-player-plugin-record-video-toast-wrap',
229
220
  content: () => /*#__PURE__*/React.createElement(View, {
230
221
  className: clsx('ipc-player-plugin-record-video-toast', {
231
- 'ipc-player-plugin-record-video-toast-show': recording,
232
- 'ipc-player-plugin-record-video-toast-hide': !recording
222
+ 'ipc-player-plugin-record-video-toast-show': state.showTimer,
223
+ 'ipc-player-plugin-record-video-toast-hide': !state.showTimer
233
224
  })
234
225
  }, /*#__PURE__*/React.createElement(View, {
235
226
  className: "ipc-player-plugin-record-video-toast-point",
@@ -240,9 +231,9 @@ export function RecordVideo(props) {
240
231
  });
241
232
  };
242
233
  const handRecordVideo = async () => {
243
- var _props$event;
234
+ var _props$event, _props$event2;
244
235
  const ev = (_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event;
245
- ev.emit(widgetClick, {
236
+ ((_props$event2 = props.event) !== null && _props$event2 !== void 0 ? _props$event2 : event).emit(widgetClick, {
246
237
  widgetId: widgetLabs.RECORD_VIDEO
247
238
  });
248
239
  event.emit(pauseTimeToHideAllComponent);
@@ -252,7 +243,6 @@ export function RecordVideo(props) {
252
243
  if (recordingDisabled) {
253
244
  return false;
254
245
  }
255
- recordResultRequestIdRef.current += 1;
256
246
  if (state.showShot && _recording) {
257
247
  setState({
258
248
  showShot: false
@@ -273,11 +263,18 @@ export function RecordVideo(props) {
273
263
  }
274
264
  if (target) {
275
265
  setRecordingDisabled(true);
266
+ setState({
267
+ showTimer: true
268
+ });
276
269
  /** 录制开始后3秒后才可结束 */
277
270
  timeToResetRecordDisabled();
278
271
  } else {
279
272
  props.event ? props.event.emit(changeIgnoreHideStopPreview, false) : event.emit(changeIgnoreHideStopPreview, false);
280
- await showRecordResult(recordInfo);
273
+ setState({
274
+ showTimer: false,
275
+ showShot: true,
276
+ shotUrl: recordInfo.tempImagePath
277
+ });
281
278
  }
282
279
  } catch (err) {
283
280
  props.event ? props.event.emit(changeIgnoreHideStopPreview, false) : event.emit(changeIgnoreHideStopPreview, false);
@@ -287,6 +284,9 @@ export function RecordVideo(props) {
287
284
  toast({
288
285
  title: errMsg
289
286
  });
287
+ setState({
288
+ showTimer: false
289
+ });
290
290
  }
291
291
  return true;
292
292
  };
@@ -1,59 +1,116 @@
1
1
  .ipc-player-plugin-record-video-icon {
2
- color: var(--iconColor);
3
2
  font-size: calc(var(--iconPlayerSize) * var(--ipc-player-size-scale, 1)) !important;
3
+ color: var(--iconColor);
4
4
  }
5
-
6
5
  .ipc-player-plugin-record-video-toast-wrap {
6
+ z-index: 400;
7
7
  position: absolute;
8
8
  top: calc(7px * var(--ipc-player-size-scale, 1));
9
9
  left: 50%;
10
- z-index: 400;
11
10
  transform: translateX(-50%);
12
11
  }
13
12
 
13
+ // 计时器显示
14
14
  .ipc-player-plugin-record-video-toast-show {
15
15
  transform: translate(0, 0) !important;
16
16
  transition: transform ease-in 3s;
17
17
  }
18
-
18
+ // 计时器隐藏
19
19
  .ipc-player-plugin-record-video-toast-hide {
20
20
  transform: translate(0, -110%) !important;
21
21
  transition: transform 0.3s ease-in-out;
22
22
  }
23
23
 
24
24
  .ipc-player-plugin-record-video-toast {
25
+ transform: translate(0, -110%);
25
26
  display: flex;
26
- align-items: center;
27
27
  padding: calc(12px * var(--ipc-player-size-scale, 1));
28
- background: linear-gradient(0deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)),
29
- #000000;
28
+ align-items: center;
29
+ background-color: var(--shot-card-bg-color);
30
30
  border-radius: calc(8px * var(--ipc-player-size-scale, 1));
31
- transform: translate(0, -110%);
32
-
31
+ // background-color: #fff;
32
+ background: linear-gradient(0deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0.15)), #000000;
33
33
  .ipc-player-plugin-record-video-toast-point {
34
34
  width: calc(6px * var(--ipc-player-size-scale, 1));
35
35
  height: calc(6px * var(--ipc-player-size-scale, 1));
36
36
  border-radius: calc(6px * var(--ipc-player-size-scale, 1));
37
37
  }
38
-
39
38
  .ipc-player-plugin-record-video-toast-time {
39
+ font-size: calc(12px * var(--ipc-player-size-scale, 1));;
40
+ font-weight: 700;
41
+ color: var(--fontColor);
42
+ margin-left: calc(8px * var(--ipc-player-size-scale, 1));;
40
43
  display: flex;
41
44
  align-items: center;
42
- margin-left: calc(8px * var(--ipc-player-size-scale, 1));
43
- color: var(--fontColor);
44
- font-weight: 700;
45
- font-size: calc(12px * var(--ipc-player-size-scale, 1));
46
-
47
45
  .ipc-player-plugin-record-video-toast-time-warp {
48
46
  text-align: center;
49
47
  }
50
-
51
48
  .ipc-player-plugin-record-video-toast-time-delimiter {
52
- margin: 0 calc(2px * var(--ipc-player-size-scale, 1));
49
+ margin: 0 calc(2px * var(--ipc-player-size-scale, 1));;
53
50
  }
54
51
  }
55
52
  }
56
53
 
54
+ /** 录制成功弹窗 */
57
55
  .ipc-player-plugin-record-success-toast-wrap {
58
56
  position: absolute;
59
57
  }
58
+ .ipc-player-plugin-record-success-toast {
59
+ flex: 1;
60
+ border-radius: calc(8px * var(--ipc-player-size-scale, 1));;
61
+ background-color: var(--shot-card-bg-color);
62
+ display: flex;
63
+ align-items: center;
64
+ padding: calc(8px * var(--ipc-player-size-scale, 1)) calc(12px * var(--ipc-player-size-scale, 1));
65
+ z-index: 100;
66
+ .ipc-player-plugin-record-success-toast-image-box {
67
+ border-radius: calc(4px * var(--ipc-player-size-scale, 1));
68
+ overflow: hidden;
69
+ width: calc(66px * var(--ipc-player-size-scale, 1));
70
+ height: calc(66px * 0.57 * var(--ipc-player-size-scale, 1));
71
+ position: relative;
72
+ }
73
+ .ipc-player-plugin-record-success-toast-image {
74
+ width: 100%;
75
+ height: 100%;
76
+ object-fit: cover;
77
+ }
78
+ .ipc-player-plugin-record-success-play-icon-box {
79
+ width: 30px;
80
+ height: 30px;
81
+ background-color: rgba(0, 0, 0, 0.2);
82
+ border-radius: 50%;
83
+ overflow: hidden;
84
+ position: absolute;
85
+ top: 50%;
86
+ left: 50%;
87
+ transform: translate(-50%, -50%);
88
+ display: flex;
89
+ align-items: center;
90
+ justify-content: center;
91
+ }
92
+ .ipc-player-plugin-record-success-play-icon {
93
+ font-size: calc(18px * var(--ipc-player-size-scale, 1)) !important;
94
+ color: #ffffff;
95
+ }
96
+ .ipc-player-plugin-record-success-toast-title {
97
+ flex: 1;
98
+ margin-left: calc(12px * var(--ipc-player-size-scale, 1));
99
+ font-size: calc(14px * var(--ipc-player-size-scale, 1));
100
+ color: var(--fontColor);
101
+ margin-right: calc(12px * var(--ipc-player-size-scale, 1));
102
+ word-break: break-word;
103
+
104
+ }
105
+ .ipc-player-plugin-record-success-toast-bottom {
106
+ border: 1px solid #1989FA;
107
+ min-width: calc(52px * var(--ipc-player-size-scale, 1));
108
+ max-width: calc(100px * var(--ipc-player-size-scale, 1));
109
+ border-radius: calc(4px * var(--ipc-player-size-scale, 1));
110
+ padding: calc(5px * var(--ipc-player-size-scale, 1)) calc(11px * var(--ipc-player-size-scale, 1));
111
+ font-size: calc(14px * var(--ipc-player-size-scale, 1));
112
+ white-space: nowrap;
113
+ overflow: hidden;
114
+ text-overflow: ellipsis;
115
+ }
116
+ }
@@ -22,7 +22,6 @@ jest.mock('../../i18n', () => ({
22
22
  }
23
23
  }));
24
24
  jest.mock('./recordVideo.less', () => ({}));
25
- jest.mock('../captureResult/captureResult.less', () => ({}));
26
25
  it('keeps the record control idle when starting is declined', async () => {
27
26
  const addContent = jest.fn();
28
27
  const setRecordingDisabled = jest.fn();
@@ -1,8 +1,9 @@
1
1
  import "core-js/modules/esnext.iterator.constructor.js";
2
2
  import "core-js/modules/esnext.iterator.map.js";
3
3
  import React, { useState, useContext, useEffect } from 'react';
4
- import { Text, View, showToast } from '@ray-js/ray';
4
+ import { View, showToast } from '@ray-js/ray';
5
5
  import clsx from 'clsx';
6
+ import { PlayerText as Text } from '../../renderer/text';
6
7
  import Strings from '../../i18n';
7
8
  import { useMemoizedFn } from '../../hooks';
8
9
  import { useStore } from '../../ctx/store';
@@ -33,6 +34,10 @@ export const FullResolutionControl = props => {
33
34
  const onPlayerTap = useMemoizedFn(() => {
34
35
  setHide(true);
35
36
  });
37
+ const normalizeResolution = value => {
38
+ const normalized = String(value || '').toUpperCase();
39
+ return normalized === 'HD' ? 'HD' : 'SD';
40
+ };
36
41
  useEffect(() => {
37
42
  event.on('showFullResolutionControl', onShowFullResolutionControl);
38
43
  event.on(playerTap, onPlayerTap);
@@ -42,13 +47,14 @@ export const FullResolutionControl = props => {
42
47
  };
43
48
  }, []);
44
49
  const changeResolution = useMemoizedFn(value => {
45
- if (value === resolution) {
50
+ const targetResolution = normalizeResolution(value);
51
+ if (targetResolution === normalizeResolution(resolution)) {
46
52
  showToast({
47
53
  icon: 'none',
48
54
  title: Strings.getLang('ipc_player_current_resolution_is_equal')
49
55
  });
50
56
  } else {
51
- setResolution(value).then(() => {
57
+ setResolution(targetResolution).then(() => {
52
58
  showToast({
53
59
  icon: 'none',
54
60
  title: Strings.getLang('ipc_player_change_resolution_success')
@@ -68,20 +74,24 @@ export const FullResolutionControl = props => {
68
74
  className: clsx('ipc-player-plugin-full-resolution-control', 'ipc-plugin-absolute-move-in-right', {
69
75
  'ipc-plugin-absolute-move-in-right-hide': hide
70
76
  })
71
- }, resolutionList.map(item => /*#__PURE__*/React.createElement(Text, {
72
- onClick: () => {
73
- event.emit(widgetClick, {
74
- widgetId: widgetLabs.FULL_RESOLUTION_CONTROL,
75
- extra: {
76
- resolution: item
77
- }
78
- });
79
- changeResolution(item);
80
- },
81
- key: item,
82
- className: clsx('ipc-player-plugin-full-resolution-control-text'),
83
- style: item === resolution && {
84
- color: brandColor
85
- }
86
- }, Strings.getLang(`ipc_player_resolution_${item}`))));
77
+ }, resolutionList.map(item => {
78
+ const normalizedItem = normalizeResolution(item);
79
+ const selected = normalizedItem === normalizeResolution(resolution);
80
+ return /*#__PURE__*/React.createElement(Text, {
81
+ key: item,
82
+ onClick: () => {
83
+ event.emit(widgetClick, {
84
+ widgetId: widgetLabs.FULL_RESOLUTION_CONTROL,
85
+ extra: {
86
+ resolution: normalizedItem
87
+ }
88
+ });
89
+ changeResolution(normalizedItem);
90
+ },
91
+ className: clsx('ipc-player-plugin-full-resolution-control-text'),
92
+ style: selected ? {
93
+ color: brandColor
94
+ } : undefined
95
+ }, Strings.getLang(`ipc_player_resolution_${normalizedItem}`));
96
+ }));
87
97
  };
@@ -1,8 +1,9 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
- import { View, Text } from '@ray-js/ray';
2
+ import { View } from '@ray-js/ray';
3
3
  import clsx from 'clsx';
4
4
  import React, { useContext } from 'react';
5
5
  import { useMemoizedFn } from 'ahooks';
6
+ import { PlayerText as Text } from '../../renderer/text';
6
7
  import Strings from '../../i18n';
7
8
  import { FullResolutionControl } from './fullResolutionControl';
8
9
  import { fullResolutionId, pauseTimeToHideAllComponent, hideAllComponent, widgetLabs, widgetClick } from '../../ui/constant';
@@ -52,7 +53,7 @@ export const Resolution = props => {
52
53
  }
53
54
  if (verticalResolutionCustomClick) return false;
54
55
  if (screenType === 'vertical') {
55
- setResolution(resolution === 'HD' ? 'SD' : 'HD');
56
+ setResolution(String(resolution).toUpperCase() === 'HD' ? 'SD' : 'HD');
56
57
  }
57
58
  event.emit(pauseTimeToHideAllComponent);
58
59
  return true;
@@ -1,15 +1,14 @@
1
- import React, { useContext, useEffect, useRef } from 'react';
2
- import { View, Text, getSystemInfoSync } from '@ray-js/ray';
1
+ import React, { useContext, useRef } from 'react';
2
+ import { View, Image, getSystemInfoSync } from '@ray-js/ray';
3
3
  import { useSetState, useUpdateEffect, useMemoizedFn } from 'ahooks';
4
4
  import clsx from 'clsx';
5
5
  import { goToIpcPageNativeRoute } from '@ray-js/ray-ipc-utils';
6
+ import { PlayerText as Text } from '../../renderer/text';
6
7
  import Strings from '../../i18n';
7
8
  import { useStore } from '../../ctx/store';
8
9
  import { UIEventContext } from '../../ui/context';
9
10
  import { pauseTimeToHideAllComponent, changeIgnoreHideStopPreview, widgetLabs, widgetClick } from '../../ui/constant';
10
- import { getCaptureResultSummary } from '../../utils/captureResult';
11
11
  import { ensureAlbumPermission } from '../../utils/authorize/album';
12
- import { CaptureResultToast } from '../captureResult/captureResult';
13
12
  import './screenshot.less';
14
13
  const CLOSE_TIME = 5000;
15
14
  export function Screenshot(props) {
@@ -37,15 +36,8 @@ export function Screenshot(props) {
37
36
  /** 记录截屏url */
38
37
  const [state, setState] = useSetState({
39
38
  showShot: false,
40
- shotUrl: '',
41
- shotCount: 0
39
+ shotUrl: ''
42
40
  });
43
- const snapshotRequestIdRef = useRef(0);
44
- useEffect(() => {
45
- return () => {
46
- snapshotRequestIdRef.current += 1;
47
- };
48
- }, []);
49
41
  useUpdateEffect(() => {
50
42
  if (state.showShot && screenType) {
51
43
  showShotToast();
@@ -58,8 +50,7 @@ export function Screenshot(props) {
58
50
  timer.current = setTimeout(() => {
59
51
  setState({
60
52
  showShot: false,
61
- shotUrl: '',
62
- shotCount: 0
53
+ shotUrl: ''
63
54
  });
64
55
  deleteContent('absolute', 'plugin-screenshot-toast');
65
56
  }, CLOSE_TIME);
@@ -69,8 +60,7 @@ export function Screenshot(props) {
69
60
  const handCheck = () => {
70
61
  setState({
71
62
  showShot: false,
72
- shotUrl: '',
73
- shotCount: 0
63
+ shotUrl: ''
74
64
  });
75
65
  deleteContent('absolute', 'plugin-screenshot-toast');
76
66
  clearInterval(timer.current);
@@ -92,20 +82,31 @@ export function Screenshot(props) {
92
82
  marginLeft: screenType === 'vertical' ? '0' : '-200px'
93
83
  },
94
84
  content: () => {
95
- return /*#__PURE__*/React.createElement(CaptureResultToast, {
96
- brandColor: brandColor,
97
- count: state.shotCount,
98
- kind: "screenshot",
99
- onCheck: handCheck,
100
- thumbnailPath: state.shotUrl
101
- });
85
+ return /*#__PURE__*/React.createElement(View, {
86
+ className: "ipc-player-plugin-screenshot-toast"
87
+ }, /*#__PURE__*/React.createElement(View, {
88
+ className: "ipc-player-plugin-screenshot-toast-image-box"
89
+ }, /*#__PURE__*/React.createElement(Image, {
90
+ className: "ipc-player-plugin-screenshot-toast-image",
91
+ src: state.shotUrl
92
+ })), /*#__PURE__*/React.createElement(View, {
93
+ className: "ipc-player-plugin-screenshot-toast-title"
94
+ }, Strings.getLang('ipc_player_screenshot_success_tip')), /*#__PURE__*/React.createElement(View, {
95
+ onClick: handCheck,
96
+ className: "ipc-player-plugin-screenshot-toast-bottom",
97
+ style: {
98
+ color: brandColor,
99
+ borderColor: brandColor
100
+ }
101
+ }, Strings.getLang('ipc_player_shot_success_check')));
102
102
  }
103
103
  });
104
104
  timeToCloseToast();
105
105
  };
106
106
  const handClick = useMemoizedFn(async () => {
107
- var _props$event;
108
- ((_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event).emit(widgetClick, {
107
+ var _props$event, _props$event2;
108
+ const ev = (_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event;
109
+ ((_props$event2 = props.event) !== null && _props$event2 !== void 0 ? _props$event2 : event).emit(widgetClick, {
109
110
  widgetId: widgetLabs.SCREENSHOT
110
111
  });
111
112
  console.log('截屏!!!');
@@ -119,49 +120,27 @@ export function Screenshot(props) {
119
120
  props.event ? props.event.emit(changeIgnoreHideStopPreview, true) : event.emit(changeIgnoreHideStopPreview, true);
120
121
  }
121
122
  event.emit(pauseTimeToHideAllComponent);
122
- const setIgnoreHideStopPreview = value => {
123
- var _props$event2;
124
- ((_props$event2 = props.event) !== null && _props$event2 !== void 0 ? _props$event2 : event).emit(changeIgnoreHideStopPreview, value);
125
- };
126
- const handleSnapshotFail = err => {
127
- setIgnoreHideStopPreview(false);
128
- console.log(err, 'err');
129
- const errObj = err.innerError || err || {};
130
- const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
131
- toast({
132
- title: errMsg
133
- });
134
- };
135
123
  const granted = await ensureAlbumPermission();
136
- setIgnoreHideStopPreview(false);
124
+ ev.emit(changeIgnoreHideStopPreview, false);
137
125
  if (!granted) return;
138
- (() => {
139
- const requestId = ++snapshotRequestIdRef.current;
140
- IPCPlayerContext.snapshot({
141
- saveToAlbum,
142
- success: async res => {
143
- var _props$multiCameraCtx;
144
- setIgnoreHideStopPreview(false);
145
- const splitNum = (_props$multiCameraCtx = props.multiCameraCtx) === null || _props$multiCameraCtx === void 0 || (_props$multiCameraCtx = _props$multiCameraCtx.protocol) === null || _props$multiCameraCtx === void 0 ? void 0 : _props$multiCameraCtx.total_split_num;
146
- const summary = await getCaptureResultSummary(res, {
147
- multiLens: props.multiLens,
148
- protocolCount: splitNum,
149
- devId
150
- });
151
- if (requestId !== snapshotRequestIdRef.current) return;
152
- if (!summary) {
153
- handleSnapshotFail({});
154
- return;
155
- }
156
- setState({
157
- showShot: true,
158
- shotUrl: summary.thumbnailPath,
159
- shotCount: summary.isMultiLens ? summary.count : 0
160
- });
161
- },
162
- fail: handleSnapshotFail
163
- });
164
- })();
126
+ IPCPlayerContext.snapshot({
127
+ saveToAlbum,
128
+ success: res => {
129
+ ev.emit(changeIgnoreHideStopPreview, false);
130
+ setState({
131
+ showShot: true,
132
+ shotUrl: res.tempImagePath
133
+ });
134
+ },
135
+ fail: err => {
136
+ ev.emit(changeIgnoreHideStopPreview, false);
137
+ const errObj = err.innerError || err || {};
138
+ const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
139
+ toast({
140
+ title: errMsg
141
+ });
142
+ }
143
+ });
165
144
  });
166
145
  if (hideScreenShotMenu) return null;
167
146
  return /*#__PURE__*/React.createElement(View, {