@ray-js/ipc-player-integration 0.0.67-beta.1 → 0.0.68-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 (149) hide show
  1. package/README.md +6 -0
  2. package/lib/ctx/ctx.composition.js +3 -13
  3. package/lib/ctx/ctx.js +35 -48
  4. package/lib/ctx/multiCameraCtx.d.ts +0 -2
  5. package/lib/ctx/multiCameraCtx.js +1 -17
  6. package/lib/i18n/index.d.ts +0 -12
  7. package/lib/i18n/strings.d.ts +0 -6
  8. package/lib/i18n/strings.js +0 -6
  9. package/lib/index.d.ts +4 -0
  10. package/lib/index.js +3 -1
  11. package/lib/interface.d.ts +3 -18
  12. package/lib/renderer/capabilities.d.ts +8 -0
  13. package/lib/renderer/capabilities.js +19 -0
  14. package/lib/renderer/context.d.ts +5 -0
  15. package/lib/renderer/context.js +6 -0
  16. package/lib/renderer/directionControl.d.ts +6 -0
  17. package/lib/renderer/directionControl.js +3 -0
  18. package/lib/renderer/font-manifest.json +9 -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/overlay.d.ts +4 -0
  24. package/lib/renderer/overlay.js +6 -0
  25. package/lib/renderer/ptzZoom.d.ts +6 -0
  26. package/lib/renderer/ptzZoom.js +3 -0
  27. package/lib/renderer/text.d.ts +4 -0
  28. package/lib/renderer/text.js +32 -0
  29. package/lib/renderer/text.module.less +4 -0
  30. package/lib/renderer/viewport.d.ts +7 -0
  31. package/lib/renderer/viewport.js +24 -0
  32. package/lib/res/lynx-signal/index.d.ts +1 -0
  33. package/lib/res/lynx-signal/index.js +22 -0
  34. package/lib/res/lynx-signal/signalFour0.png +0 -0
  35. package/lib/res/lynx-signal/signalFour1.png +0 -0
  36. package/lib/res/lynx-signal/signalFour2.png +0 -0
  37. package/lib/res/lynx-signal/signalFour3.png +0 -0
  38. package/lib/res/lynx-signal/signalFour4.png +0 -0
  39. package/lib/res/lynx-signal/signalThree0.png +0 -0
  40. package/lib/res/lynx-signal/signalThree1.png +0 -0
  41. package/lib/res/lynx-signal/signalThree2.png +0 -0
  42. package/lib/res/lynx-signal/signalThree3.png +0 -0
  43. package/lib/res/player-charging.png +0 -0
  44. package/lib/res/player-more-arrow.png +0 -0
  45. package/lib/res/player-solar.png +0 -0
  46. package/lib/ui/bottomLeftContent.js +122 -56
  47. package/lib/ui/bottomRightContent.js +10 -5
  48. package/lib/ui/scrollHintArrow.d.ts +23 -0
  49. package/lib/ui/scrollHintArrow.js +83 -0
  50. package/lib/ui/topLeftContent.js +4 -2
  51. package/lib/ui/topRightContent.js +4 -2
  52. package/lib/ui/ui.d.ts +5 -0
  53. package/lib/ui/ui.js +93 -100
  54. package/lib/utils/navigation.d.ts +1 -2
  55. package/lib/utils/navigation.js +3 -13
  56. package/lib/widgets/battery/battery.js +7 -5
  57. package/lib/widgets/battery/batteryFull.js +7 -5
  58. package/lib/widgets/battery/statusIcon.d.ts +6 -0
  59. package/lib/widgets/battery/statusIcon.js +36 -0
  60. package/lib/widgets/battery/statusIcon.less +24 -0
  61. package/lib/widgets/captureToast/captureToast.d.ts +9 -0
  62. package/lib/widgets/captureToast/captureToast.js +73 -0
  63. package/lib/widgets/floodlight/floodlight.js +2 -1
  64. package/lib/widgets/flowLowTip/flowLowTip.js +2 -1
  65. package/lib/widgets/fullScreen/fullScreen.js +18 -4
  66. package/lib/widgets/fullScreen/fullTravelRouteControl.d.ts +1 -1
  67. package/lib/widgets/fullScreen/fullTravelRouteControl.js +1 -1
  68. package/lib/widgets/fullScreen/verticalScreen.js +2 -1
  69. package/lib/widgets/index.d.ts +0 -1
  70. package/lib/widgets/index.js +1 -2
  71. package/lib/widgets/moveInteractiveControl/controlButton.js +2 -1
  72. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.js +16 -5
  73. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.less +24 -4
  74. package/lib/widgets/multiCamera/index.less +0 -1
  75. package/lib/widgets/multiCamera/landscapeTip.js +5 -2
  76. package/lib/widgets/multiCamera/moveablePtzControl.js +9 -7
  77. package/lib/widgets/multiCamera/multiPtz.js +3 -2
  78. package/lib/widgets/multiCamera/ptzMoveableTip.js +5 -2
  79. package/lib/widgets/multiCamera/switchLayout.js +2 -1
  80. package/lib/widgets/multiCamera/tileMultiPtz.js +3 -2
  81. package/lib/widgets/multiCamera/tileSwitchLayout.js +2 -1
  82. package/lib/widgets/multiCamera/tileTip.js +5 -2
  83. package/lib/widgets/muted/muted.js +2 -1
  84. package/lib/widgets/muted/muted.test.js +66 -52
  85. package/lib/widgets/ptz/ptz.js +2 -1
  86. package/lib/widgets/ptz/ptzControl.js +4 -3
  87. package/lib/widgets/ptzControlTip/ptzControlTip.js +9 -4
  88. package/lib/widgets/ptzControlTip/ptzControlTip.less +6 -0
  89. package/lib/widgets/realTimeMagnification/realTimeMagnification.js +2 -1
  90. package/lib/widgets/recordVideo/recordVideo.js +32 -178
  91. package/lib/widgets/recordVideo/recordVideo.less +74 -17
  92. package/lib/widgets/recordVideo/recordVideo.test.js +169 -3
  93. package/lib/widgets/recordVideo/recordVideoTimer.d.ts +3 -0
  94. package/lib/widgets/recordVideo/recordVideoTimer.js +26 -0
  95. package/lib/widgets/resolution/fullResolutionControl.js +29 -19
  96. package/lib/widgets/resolution/resolution.js +3 -2
  97. package/lib/widgets/screenshot/screenshot.js +35 -125
  98. package/lib/widgets/screenshot/screenshot.less +40 -1
  99. package/lib/widgets/screenshot/screenshot.test.js +108 -113
  100. package/lib/widgets/signal4G/signal4G.js +4 -1
  101. package/lib/widgets/siren/siren.js +2 -1
  102. package/lib/widgets/tempHumidity/tempHumidity.js +2 -1
  103. package/lib/widgets/toggleVerticalFull/toggleVerticalFull.js +2 -1
  104. package/lib/widgets/trialBadge/index.d.ts +1 -2
  105. package/lib/widgets/trialBadge/index.js +17 -20
  106. package/lib/widgets/trialBadge/index.less +24 -0
  107. package/lib/widgets/trialBadge/useTrialBadge.d.ts +2 -3
  108. package/lib/widgets/trialBadge/useTrialBadge.js +3 -21
  109. package/lib/widgets/tryExperience/tryExperience.js +2 -1
  110. package/lib/widgets/videoBitKBP/videoBitKBP.js +2 -1
  111. package/lib/widgets/voiceIntercom/voiceIntercom.js +50 -24
  112. package/lib/widgets/voiceIntercom/voiceIntercom.less +16 -0
  113. package/lib/widgets/zoomTurntable/lynxDockLayout.d.ts +6 -0
  114. package/lib/widgets/zoomTurntable/lynxDockLayout.js +30 -0
  115. package/lib/widgets/zoomTurntable/turntable/index.d.ts +5 -7
  116. package/lib/widgets/zoomTurntable/turntable/index.js +3 -1
  117. package/lib/widgets/zoomTurntable/turntable/lynx.d.ts +5 -0
  118. package/lib/widgets/zoomTurntable/turntable/lynx.js +273 -0
  119. package/lib/widgets/zoomTurntable/turntable/lynx.less +9 -0
  120. package/lib/widgets/zoomTurntable/turntable/lynxModel.d.ts +37 -0
  121. package/lib/widgets/zoomTurntable/turntable/lynxModel.js +122 -0
  122. package/lib/widgets/zoomTurntable/turntable/lynxPaint.d.ts +3 -0
  123. package/lib/widgets/zoomTurntable/turntable/lynxPaint.js +36 -0
  124. package/lib/widgets/zoomTurntable/zoomTurntableDock.d.ts +5 -3
  125. package/lib/widgets/zoomTurntable/zoomTurntableDock.js +4 -4
  126. package/lib/widgets/zoomTurntable/zoomTurntableEntry.js +32 -19
  127. package/lib/widgets/zoomTurntable/zoomTurntableTip.js +24 -3
  128. package/package.json +15 -7
  129. package/lib/ctx/ctx.album.test.d.ts +0 -1
  130. package/lib/ctx/ctx.album.test.js +0 -197
  131. package/lib/ctx/multiCameraCtx.test.d.ts +0 -1
  132. package/lib/ctx/multiCameraCtx.test.js +0 -65
  133. package/lib/ui/absoluteContent.d.ts +0 -2
  134. package/lib/ui/absoluteContent.js +0 -3
  135. package/lib/utils/captureResult.d.ts +0 -12
  136. package/lib/utils/captureResult.js +0 -70
  137. package/lib/utils/captureResult.test.d.ts +0 -1
  138. package/lib/utils/captureResult.test.js +0 -223
  139. package/lib/utils/fullLinkTracking.d.ts +0 -5
  140. package/lib/utils/fullLinkTracking.js +0 -71
  141. package/lib/widgets/captureResult/captureResult.d.ts +0 -16
  142. package/lib/widgets/captureResult/captureResult.js +0 -85
  143. package/lib/widgets/captureResult/captureResult.less +0 -144
  144. package/lib/widgets/captureResult/captureResult.test.d.ts +0 -1
  145. package/lib/widgets/captureResult/captureResult.test.js +0 -84
  146. package/lib/widgets/captureResult/index.d.ts +0 -2
  147. package/lib/widgets/captureResult/index.js +0 -2
  148. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.d.ts +0 -1
  149. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.js +0 -106
@@ -1,9 +1,18 @@
1
- import { act, renderHook } from '@testing-library/react-hooks/dom';
2
- import { atom } from 'jotai';
1
+ import _extends from "@babel/runtime/helpers/esm/extends";
2
+ import "core-js/modules/esnext.iterator.constructor.js";
3
+ import "core-js/modules/esnext.iterator.filter.js";
4
+ import "core-js/modules/esnext.iterator.map.js";
5
+ import React from 'react';
6
+ import ReactDOM from 'react-dom';
7
+ import { act, Simulate } from 'react-dom/test-utils';
8
+ import { renderHook } from '@testing-library/react-hooks/dom';
9
+ import { atom, getDefaultStore } from 'jotai';
3
10
  import { RecordVideo } from './recordVideo';
4
11
  import { PlayState } from '../../interface';
12
+ import { PlayerRenderModeContext } from '../../renderer/context';
5
13
  jest.mock('@ray-js/ray', () => ({
6
14
  View: 'div',
15
+ CoverView: 'div',
7
16
  Text: 'span',
8
17
  Image: 'img',
9
18
  getSystemInfoSync: () => ({
@@ -22,7 +31,6 @@ jest.mock('../../i18n', () => ({
22
31
  }
23
32
  }));
24
33
  jest.mock('./recordVideo.less', () => ({}));
25
- jest.mock('../captureResult/captureResult.less', () => ({}));
26
34
  it('keeps the record control idle when starting is declined', async () => {
27
35
  const addContent = jest.fn();
28
36
  const setRecordingDisabled = jest.fn();
@@ -56,4 +64,162 @@ it('keeps the record control idle when starting is declined', async () => {
56
64
  expect(setRecordingDisabled).not.toHaveBeenCalled();
57
65
  expect(toast).not.toHaveBeenCalled();
58
66
  unmount();
67
+ });
68
+ describe('successful recording timer', () => {
69
+ let container;
70
+ beforeEach(() => {
71
+ jest.useFakeTimers();
72
+ jest.setSystemTime(10000);
73
+ container = document.createElement('div');
74
+ document.body.appendChild(container);
75
+ });
76
+ afterEach(() => {
77
+ act(() => {
78
+ ReactDOM.unmountComponentAtNode(container);
79
+ });
80
+ container.remove();
81
+ jest.clearAllTimers();
82
+ jest.restoreAllMocks();
83
+ jest.useRealTimers();
84
+ });
85
+ function mountRecorder(mode) {
86
+ const store = getDefaultStore();
87
+ const recording = atom(false);
88
+ const recordingDisabled = atom(false);
89
+ const brandColor = atom('#000000');
90
+ let updateContents;
91
+ let recreateControl;
92
+ const props = {
93
+ recording,
94
+ recordingDisabled,
95
+ brandColor,
96
+ screenType: atom('vertical'),
97
+ playState: atom(PlayState.PLAYING),
98
+ setRecording: jest.fn(async value => {
99
+ store.set(recording, value);
100
+ return value ? true : {
101
+ tempImagePath: 'record.jpg'
102
+ };
103
+ }),
104
+ setRecordingDisabled: value => store.set(recordingDisabled, value),
105
+ addContent: (_area, item) => updateContents(items => [...items, item]),
106
+ deleteContent: (_area, id) => updateContents(items => items.filter(item => item.id !== id)),
107
+ toast: jest.fn(),
108
+ devId: 'test-device',
109
+ event: {
110
+ emit: jest.fn()
111
+ }
112
+ };
113
+ const Harness = () => {
114
+ const [contents, setContents] = React.useState([]);
115
+ const [generation, setGeneration] = React.useState(0);
116
+ recreateControl = () => setGeneration(value => value + 1);
117
+ updateContents = setContents;
118
+ return /*#__PURE__*/React.createElement(PlayerRenderModeContext.Provider, {
119
+ value: mode
120
+ }, /*#__PURE__*/React.createElement(RecordVideo, _extends({
121
+ key: generation
122
+ }, props)), contents.map(item => /*#__PURE__*/React.createElement(item.content, _extends({
123
+ key: item.id
124
+ }, item.initProps))));
125
+ };
126
+ act(() => {
127
+ ReactDOM.render(/*#__PURE__*/React.createElement(Harness, null), container);
128
+ });
129
+ return {
130
+ props,
131
+ store,
132
+ brandColor,
133
+ remountControl: () => {
134
+ act(() => {
135
+ recreateControl();
136
+ });
137
+ },
138
+ click: async () => {
139
+ await act(async () => {
140
+ Simulate.click(container.firstElementChild);
141
+ });
142
+ },
143
+ timer: () => container.querySelector('.ipc-player-plugin-record-video-toast-time')
144
+ };
145
+ }
146
+ it.each(['webview', 'lynx'])('ticks and cleans up in %s', async mode => {
147
+ const clear = jest.spyOn(global, 'clearInterval');
148
+ const start = jest.spyOn(global, 'setInterval');
149
+ const recorder = mountRecorder(mode);
150
+ await recorder.click();
151
+ expect(recorder.props.setRecording).toHaveBeenCalledWith(true);
152
+ expect(recorder.timer().textContent).toBe('00:00');
153
+ expect(start).toHaveBeenCalledTimes(1);
154
+ const interval = start.mock.results[0].value;
155
+ act(() => {
156
+ jest.advanceTimersByTime(1000);
157
+ });
158
+ expect(recorder.timer().textContent).toBe('00:01');
159
+ act(() => {
160
+ recorder.store.set(recorder.brandColor, '#ffffff');
161
+ });
162
+ expect(recorder.timer().textContent).toBe('00:01');
163
+ act(() => {
164
+ jest.advanceTimersByTime(59000);
165
+ });
166
+ expect(recorder.timer().textContent).toBe('01:00');
167
+ expect(start).toHaveBeenCalledTimes(1);
168
+ await recorder.click();
169
+ expect(recorder.props.setRecording).toHaveBeenLastCalledWith(false);
170
+ expect(recorder.timer()).toBeNull();
171
+ expect(clear).toHaveBeenCalledWith(interval);
172
+ await recorder.click();
173
+ expect(recorder.timer().textContent).toBe('00:00');
174
+ const nextInterval = start.mock.results[1].value;
175
+ act(() => {
176
+ ReactDOM.unmountComponentAtNode(container);
177
+ });
178
+ expect(clear).toHaveBeenCalledWith(nextInterval);
179
+ });
180
+ it('uses elapsed wall time after a delayed tick', async () => {
181
+ const recorder = mountRecorder('lynx');
182
+ await recorder.click();
183
+ act(() => {
184
+ jest.setSystemTime(74000);
185
+ jest.advanceTimersByTime(1000);
186
+ });
187
+ expect(recorder.timer().textContent).toBe('01:05');
188
+ });
189
+ it.each(['webview', 'lynx'])('stops the persistent timer after orientation remounts the %s toolbar', async mode => {
190
+ const clear = jest.spyOn(global, 'clearInterval');
191
+ const start = jest.spyOn(global, 'setInterval');
192
+ const recorder = mountRecorder(mode);
193
+ await recorder.click();
194
+ const interval = start.mock.results[0].value;
195
+ act(() => {
196
+ jest.advanceTimersByTime(4000);
197
+ });
198
+ act(() => {
199
+ recorder.store.set(recorder.props.screenType, 'full');
200
+ });
201
+ recorder.remountControl();
202
+ expect(recorder.timer().textContent).toBe('00:04');
203
+ act(() => {
204
+ jest.advanceTimersByTime(1000);
205
+ });
206
+ act(() => {
207
+ recorder.store.set(recorder.props.screenType, 'vertical');
208
+ });
209
+ recorder.remountControl();
210
+ expect(recorder.timer().textContent).toBe('00:05');
211
+ await recorder.click();
212
+ expect(recorder.props.setRecording).toHaveBeenLastCalledWith(false);
213
+ expect(recorder.timer()).toBeNull();
214
+ expect(clear).toHaveBeenCalledWith(interval);
215
+ });
216
+ it('removes the timer when recording stops outside the remounted control', async () => {
217
+ const recorder = mountRecorder('lynx');
218
+ await recorder.click();
219
+ recorder.remountControl();
220
+ act(() => {
221
+ recorder.store.set(recorder.props.recording, false);
222
+ });
223
+ expect(recorder.timer()).toBeNull();
224
+ });
59
225
  });
@@ -0,0 +1,3 @@
1
+ import React from 'react';
2
+ declare const RecordVideoTimer: () => React.JSX.Element;
3
+ export default RecordVideoTimer;
@@ -0,0 +1,26 @@
1
+ import React from 'react';
2
+ import { View } from '@ray-js/ray';
3
+
4
+ // Keep the timer state in this component, without a separate custom-hook binding.
5
+ const RecordVideoTimer = () => {
6
+ const [elapsedSeconds, setElapsedSeconds] = React.useState(0);
7
+ React.useEffect(() => {
8
+ const startedAt = Date.now();
9
+ const interval = setInterval(() => {
10
+ setElapsedSeconds(Math.max(0, Math.floor((Date.now() - startedAt) / 1000)));
11
+ }, 1000);
12
+ return () => clearInterval(interval);
13
+ }, []);
14
+ const minutes = String(Math.floor(elapsedSeconds / 60)).padStart(2, '0');
15
+ const seconds = String(elapsedSeconds % 60).padStart(2, '0');
16
+ return /*#__PURE__*/React.createElement(View, {
17
+ className: "ipc-player-plugin-record-video-toast-time"
18
+ }, /*#__PURE__*/React.createElement(View, {
19
+ className: "ipc-player-plugin-record-video-toast-time-warp"
20
+ }, minutes), /*#__PURE__*/React.createElement(View, {
21
+ className: "ipc-player-plugin-record-video-toast-time-delimiter"
22
+ }, ":"), /*#__PURE__*/React.createElement(View, {
23
+ className: "ipc-player-plugin-record-video-toast-time-warp"
24
+ }, seconds));
25
+ };
26
+ export default RecordVideoTimer;
@@ -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,19 +1,14 @@
1
- import "core-js/modules/esnext.iterator.constructor.js";
2
- import "core-js/modules/esnext.iterator.map.js";
3
- import React, { useContext, useEffect, useRef } from 'react';
4
- import { View, Text, getSystemInfoSync } from '@ray-js/ray';
5
- import { useSetState, useUpdateEffect, useMemoizedFn } from 'ahooks';
1
+ import React, { useContext } from 'react';
2
+ import { View, getSystemInfoSync } from '@ray-js/ray';
3
+ import { useMemoizedFn } from 'ahooks';
6
4
  import clsx from 'clsx';
7
- import { goToIpcPageNativeRoute } from '@ray-js/ray-ipc-utils';
5
+ import { PlayerText as Text } from '../../renderer/text';
8
6
  import Strings from '../../i18n';
9
- import { useStore } from '../../ctx/store';
10
7
  import { UIEventContext } from '../../ui/context';
11
8
  import { pauseTimeToHideAllComponent, changeIgnoreHideStopPreview, widgetLabs, widgetClick } from '../../ui/constant';
12
- import { getCaptureResultSummary } from '../../utils/captureResult';
13
9
  import { ensureAlbumPermission } from '../../utils/authorize/album';
14
- import { CaptureResultToast } from '../captureResult/captureResult';
10
+ import CaptureToast from '../captureToast/captureToast';
15
11
  import './screenshot.less';
16
- const CLOSE_TIME = 5000;
17
12
  export function Screenshot(props) {
18
13
  const {
19
14
  IPCPlayerContext,
@@ -25,97 +20,34 @@ export function Screenshot(props) {
25
20
  className,
26
21
  hideScreenShotMenu
27
22
  } = props;
28
- const {
29
- screenType,
30
- brandColor
31
- } = useStore({
32
- screenType: props.screenType,
33
- brandColor: props.brandColor
34
- });
35
23
  const {
36
24
  event
37
25
  } = useContext(UIEventContext);
38
-
39
- /** 记录截屏url */
40
- const [state, setState] = useSetState({
41
- showShot: false,
42
- shotUrl: '',
43
- shotCount: 0
44
- });
45
- const snapshotRequestIdRef = useRef(0);
46
- useEffect(() => {
47
- return () => {
48
- snapshotRequestIdRef.current += 1;
49
- };
50
- }, []);
51
- useUpdateEffect(() => {
52
- if (state.showShot && screenType) {
53
- showShotToast();
54
- }
55
- }, [state.showShot, screenType]);
56
- const timer = useRef();
57
- const timeToCloseToast = () => {
58
- clearInterval(timer.current);
59
- // @ts-ignore
60
- timer.current = setTimeout(() => {
61
- setState({
62
- showShot: false,
63
- shotUrl: '',
64
- shotCount: 0
65
- });
66
- deleteContent('absolute', 'plugin-screenshot-toast');
67
- }, CLOSE_TIME);
68
- };
69
-
70
- /** 跳转相册 */
71
- const handCheck = () => {
72
- setState({
73
- showShot: false,
74
- shotUrl: '',
75
- shotCount: 0
76
- });
77
- deleteContent('absolute', 'plugin-screenshot-toast');
78
- clearInterval(timer.current);
79
- goToIpcPageNativeRoute('ipc_album_panel', devId);
80
- };
81
-
82
- /** 添加截屏成功弹窗 */
83
- const showShotToast = () => {
26
+ const showShotToast = imageUrl => {
84
27
  deleteContent('absolute', 'plugin-screenshot-toast');
85
28
  addContent('absolute', {
86
29
  id: 'plugin-screenshot-toast',
87
- absoluteContentClassName: 'ipc-player-plugin-screenshot-toast-wrap',
88
- absolutePosition: {
89
- top: screenType === 'vertical' ? '12px' : '60px',
90
- left: screenType === 'vertical' ? '16px' : '50%',
91
- right: screenType === 'vertical' ? '16px' : 'unset',
92
- display: 'flex',
93
- width: screenType === 'vertical' ? 'auto' : '400px',
94
- marginLeft: screenType === 'vertical' ? '0' : '-200px'
95
- },
96
- content: () => {
97
- return /*#__PURE__*/React.createElement(CaptureResultToast, {
98
- brandColor: brandColor,
99
- count: state.shotCount,
100
- kind: "screenshot",
101
- onCheck: handCheck,
102
- thumbnailPath: state.shotUrl
103
- });
30
+ absoluteNoCoverView: true,
31
+ content: CaptureToast,
32
+ initProps: {
33
+ kind: 'screenshot',
34
+ imageUrl,
35
+ captureId: Date.now(),
36
+ screenType: props.screenType,
37
+ brandColor: props.brandColor,
38
+ devId,
39
+ deleteContent
104
40
  }
105
41
  });
106
- timeToCloseToast();
107
42
  };
108
43
  const handClick = useMemoizedFn(async () => {
109
- var _props$event;
110
- ((_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event).emit(widgetClick, {
44
+ var _props$event, _props$event2;
45
+ const ev = (_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event;
46
+ ((_props$event2 = props.event) !== null && _props$event2 !== void 0 ? _props$event2 : event).emit(widgetClick, {
111
47
  widgetId: widgetLabs.SCREENSHOT
112
48
  });
113
49
  console.log('截屏!!!');
114
50
  deleteContent('absolute', 'plugin-screenshot-toast');
115
- clearTimeout(timer.current);
116
- setState({
117
- showShot: false
118
- });
119
51
  const {
120
52
  platform
121
53
  } = getSystemInfoSync();
@@ -123,46 +55,24 @@ export function Screenshot(props) {
123
55
  props.event ? props.event.emit(changeIgnoreHideStopPreview, true) : event.emit(changeIgnoreHideStopPreview, true);
124
56
  }
125
57
  event.emit(pauseTimeToHideAllComponent);
126
- const setIgnoreHideStopPreview = value => {
127
- var _props$event2;
128
- ((_props$event2 = props.event) !== null && _props$event2 !== void 0 ? _props$event2 : event).emit(changeIgnoreHideStopPreview, value);
129
- };
130
- const handleSnapshotFail = err => {
131
- setIgnoreHideStopPreview(false);
132
- console.log(err, 'err');
133
- const errObj = err.innerError || err || {};
134
- const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
135
- toast({
136
- title: errMsg
137
- });
138
- };
139
58
  const granted = await ensureAlbumPermission();
140
- setIgnoreHideStopPreview(false);
59
+ ev.emit(changeIgnoreHideStopPreview, false);
141
60
  if (!granted) return;
142
- (() => {
143
- const requestId = ++snapshotRequestIdRef.current;
144
- IPCPlayerContext.snapshot({
145
- saveToAlbum,
146
- success: async res => {
147
- var _props$multiCameraCtx;
148
- setIgnoreHideStopPreview(false);
149
- const lensIndices = (_props$multiCameraCtx = props.multiCameraCtx) === null || _props$multiCameraCtx === void 0 || (_props$multiCameraCtx = _props$multiCameraCtx.protocol) === null || _props$multiCameraCtx === void 0 || (_props$multiCameraCtx = _props$multiCameraCtx.split_info) === null || _props$multiCameraCtx === void 0 ? void 0 : _props$multiCameraCtx.map(lens => lens.index);
150
- const summary = await getCaptureResultSummary(res, {
151
- multiLens: props.multiLens,
152
- lensIndices,
153
- devId
154
- });
155
- if (requestId !== snapshotRequestIdRef.current) return;
156
- if (!summary) return;
157
- setState({
158
- showShot: true,
159
- shotUrl: summary.thumbnailPath,
160
- shotCount: summary.isMultiLens ? summary.count : 0
161
- });
162
- },
163
- fail: handleSnapshotFail
164
- });
165
- })();
61
+ IPCPlayerContext.snapshot({
62
+ saveToAlbum,
63
+ success: res => {
64
+ ev.emit(changeIgnoreHideStopPreview, false);
65
+ showShotToast(res.tempImagePath);
66
+ },
67
+ fail: err => {
68
+ ev.emit(changeIgnoreHideStopPreview, false);
69
+ const errObj = err.innerError || err || {};
70
+ const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
71
+ toast({
72
+ title: errMsg
73
+ });
74
+ }
75
+ });
166
76
  });
167
77
  if (hideScreenShotMenu) return null;
168
78
  return /*#__PURE__*/React.createElement(View, {
@@ -2,7 +2,46 @@
2
2
  color: var(--iconColor);
3
3
  font-size: calc(var(--iconPlayerSize) * var(--ipc-player-size-scale, 1)) !important;
4
4
  }
5
-
6
5
  .ipc-player-plugin-screenshot-toast-wrap {
7
6
  position: absolute;
8
7
  }
8
+ .ipc-player-plugin-screenshot-toast {
9
+ flex: 1;
10
+ border-radius: calc(8px * var(--ipc-player-size-scale, 1));;
11
+ background-color: var(--shot-card-bg-color);
12
+ display: flex;
13
+ align-items: center;
14
+ padding: calc(8px * var(--ipc-player-size-scale, 1)) calc(12px * var(--ipc-player-size-scale, 1));
15
+ z-index: 100;
16
+ .ipc-player-plugin-screenshot-toast-image-box {
17
+ border-radius: calc(4px * var(--ipc-player-size-scale, 1));
18
+ overflow: hidden;
19
+ width: calc(66px * var(--ipc-player-size-scale, 1));
20
+ height: calc(66px * 0.57 * var(--ipc-player-size-scale, 1));
21
+ }
22
+ .ipc-player-plugin-screenshot-toast-image {
23
+ width: 100%;
24
+ height: 100%;
25
+ object-fit: cover;
26
+ }
27
+ .ipc-player-plugin-screenshot-toast-title {
28
+ flex: 1;
29
+ margin-left: calc(12px * var(--ipc-player-size-scale, 1));
30
+ font-size: calc(14px * var(--ipc-player-size-scale, 1));
31
+ color: var(--fontColor);
32
+ margin-right: calc(12px * var(--ipc-player-size-scale, 1));
33
+ word-break: break-word;
34
+
35
+ }
36
+ .ipc-player-plugin-screenshot-toast-bottom {
37
+ border: 1px solid #1989FA;
38
+ min-width: calc(52px * var(--ipc-player-size-scale, 1));
39
+ max-width: calc(100px * var(--ipc-player-size-scale, 1));
40
+ border-radius: calc(4px * var(--ipc-player-size-scale, 1));
41
+ padding: calc(5px * var(--ipc-player-size-scale, 1)) calc(11px * var(--ipc-player-size-scale, 1));
42
+ font-size: calc(14px * var(--ipc-player-size-scale, 1));
43
+ white-space: nowrap;
44
+ overflow: hidden;
45
+ text-overflow: ellipsis;
46
+ }
47
+ }