@ray-js/ipc-player-integration 0.0.55-beta.1 → 0.0.56-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.
- package/lib/ctx/ctx.album.test.d.ts +1 -0
- package/lib/ctx/ctx.album.test.js +197 -0
- package/lib/ctx/ctx.composition.js +13 -3
- package/lib/ctx/ctx.js +43 -35
- package/lib/i18n/index.d.ts +12 -0
- package/lib/i18n/strings.d.ts +6 -0
- package/lib/i18n/strings.js +6 -0
- package/lib/interface.d.ts +16 -3
- package/lib/ui/absoluteContent.d.ts +2 -0
- package/lib/ui/absoluteContent.js +3 -0
- package/lib/ui/ui.js +26 -22
- package/lib/utils/captureResult.d.ts +14 -0
- package/lib/utils/captureResult.js +70 -0
- package/lib/utils/captureResult.test.d.ts +1 -0
- package/lib/utils/captureResult.test.js +117 -0
- package/lib/widgets/captureResult/captureResult.d.ts +16 -0
- package/lib/widgets/captureResult/captureResult.js +85 -0
- package/lib/widgets/captureResult/captureResult.less +144 -0
- package/lib/widgets/captureResult/captureResult.test.d.ts +1 -0
- package/lib/widgets/captureResult/captureResult.test.js +80 -0
- package/lib/widgets/captureResult/index.d.ts +2 -0
- package/lib/widgets/captureResult/index.js +2 -0
- package/lib/widgets/index.d.ts +1 -0
- package/lib/widgets/index.js +2 -1
- package/lib/widgets/muted/muted.js +12 -3
- package/lib/widgets/muted/muted.less +5 -1
- package/lib/widgets/muted/muted.test.d.ts +1 -0
- package/lib/widgets/muted/muted.test.js +78 -0
- package/lib/widgets/recordVideo/recordVideo.js +50 -35
- package/lib/widgets/recordVideo/recordVideo.less +17 -74
- package/lib/widgets/recordVideo/recordVideo.test.js +1 -0
- package/lib/widgets/screenshot/screenshot.js +66 -44
- package/lib/widgets/screenshot/screenshot.less +1 -40
- package/lib/widgets/screenshot/screenshot.test.d.ts +1 -0
- package/lib/widgets/screenshot/screenshot.test.js +120 -0
- package/package.json +2 -2
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/* eslint-disable camelcase */
|
|
2
|
+
|
|
3
|
+
import { getDeviceInfo } from './device';
|
|
4
|
+
const MULTI_LENS_ABILITY_CODE = 'tyabimr4v3';
|
|
5
|
+
const LENS_SUFFIX_PATTERN = /_lens\d+(?=\.[^./?#]+(?:[?#].*)?$)/;
|
|
6
|
+
const FILE_EXTENSION_PATTERN = /(\.[^./?#]+)([?#].*)?$/;
|
|
7
|
+
/** 从新多目高级能力配置获取当前设备的总镜头数 */
|
|
8
|
+
export async function getMultiLensCountFromAbility(devId) {
|
|
9
|
+
if (!devId) return 0;
|
|
10
|
+
try {
|
|
11
|
+
var _devInfo$configMetas;
|
|
12
|
+
const devInfo = await getDeviceInfo(devId);
|
|
13
|
+
const raw = devInfo === null || devInfo === void 0 || (_devInfo$configMetas = devInfo.configMetas) === null || _devInfo$configMetas === void 0 ? void 0 : _devInfo$configMetas[MULTI_LENS_ABILITY_CODE];
|
|
14
|
+
if (raw) {
|
|
15
|
+
const parsed = typeof raw === 'string' ? JSON.parse(raw) : raw;
|
|
16
|
+
const count = Number(parsed === null || parsed === void 0 ? void 0 : parsed.total_split_num) || (Array.isArray(parsed === null || parsed === void 0 ? void 0 : parsed.split_info) ? parsed.split_info.length : 0);
|
|
17
|
+
if (count > 1) {
|
|
18
|
+
return count;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
} catch (e) {
|
|
22
|
+
// ignore
|
|
23
|
+
}
|
|
24
|
+
return 0;
|
|
25
|
+
}
|
|
26
|
+
const normalizeMultiLensThumbnailPath = path => {
|
|
27
|
+
if (!path || LENS_SUFFIX_PATTERN.test(path)) return path;
|
|
28
|
+
return path.replace(FILE_EXTENSION_PATTERN, '_lens1$1$2');
|
|
29
|
+
};
|
|
30
|
+
const extractPath = item => {
|
|
31
|
+
if (!item) return '';
|
|
32
|
+
if (typeof item === 'string') return item;
|
|
33
|
+
if (typeof (item === null || item === void 0 ? void 0 : item.value) === 'string') return item.value;
|
|
34
|
+
return '';
|
|
35
|
+
};
|
|
36
|
+
export async function getCaptureResultSummary(result, _ref) {
|
|
37
|
+
let {
|
|
38
|
+
multiLens,
|
|
39
|
+
protocolCount,
|
|
40
|
+
devId
|
|
41
|
+
} = _ref;
|
|
42
|
+
if (!result || typeof result === 'boolean') return null;
|
|
43
|
+
const thumbnailPath = extractPath(result.tempImagePath) || extractPath(result.thumbPath) || extractPath(result.filePath) || '';
|
|
44
|
+
if (!multiLens) {
|
|
45
|
+
return {
|
|
46
|
+
count: 1,
|
|
47
|
+
isMultiLens: false,
|
|
48
|
+
thumbnailPath
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
const splitCount = Number(protocolCount) > 1 ? Number(protocolCount) : 0;
|
|
52
|
+
const multiLensAbilityCount = await getMultiLensCountFromAbility(devId);
|
|
53
|
+
|
|
54
|
+
// The native multi-lens snapshot can return one object while writing lens-specific
|
|
55
|
+
// files. Use the ability result to distinguish that file-name convention from the
|
|
56
|
+
// legacy split protocol.
|
|
57
|
+
const multiCount = splitCount || multiLensAbilityCount;
|
|
58
|
+
if (multiCount > 1) {
|
|
59
|
+
return {
|
|
60
|
+
count: multiCount,
|
|
61
|
+
isMultiLens: true,
|
|
62
|
+
thumbnailPath: multiLensAbilityCount > 1 ? normalizeMultiLensThumbnailPath(thumbnailPath) : thumbnailPath
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
return {
|
|
66
|
+
count: 1,
|
|
67
|
+
isMultiLens: false,
|
|
68
|
+
thumbnailPath
|
|
69
|
+
};
|
|
70
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import { getCaptureResultSummary } from './captureResult';
|
|
2
|
+
import { getDeviceInfo } from './device';
|
|
3
|
+
jest.mock('./device', () => ({
|
|
4
|
+
getDeviceInfo: jest.fn()
|
|
5
|
+
}));
|
|
6
|
+
const mockGetDeviceInfo = getDeviceInfo;
|
|
7
|
+
const basePath = 'thingfile://tmp/capture_123.jpg';
|
|
8
|
+
const createCaptureResult = tempImagePath => ({
|
|
9
|
+
tempImagePath,
|
|
10
|
+
filePath: tempImagePath
|
|
11
|
+
});
|
|
12
|
+
describe('getCaptureResultSummary', () => {
|
|
13
|
+
beforeEach(() => {
|
|
14
|
+
mockGetDeviceInfo.mockReset();
|
|
15
|
+
mockGetDeviceInfo.mockResolvedValue({
|
|
16
|
+
configMetas: {}
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
it('normalizes the thumbnail path for the new multi-lens ability', async () => {
|
|
20
|
+
mockGetDeviceInfo.mockResolvedValue({
|
|
21
|
+
configMetas: {
|
|
22
|
+
tyabimr4v3: {
|
|
23
|
+
total_split_num: 4
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
await expect(getCaptureResultSummary(createCaptureResult(basePath), {
|
|
28
|
+
multiLens: true,
|
|
29
|
+
devId: 'dev-1'
|
|
30
|
+
})).resolves.toEqual({
|
|
31
|
+
count: 4,
|
|
32
|
+
isMultiLens: true,
|
|
33
|
+
thumbnailPath: 'thingfile://tmp/capture_123_lens1.jpg'
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
it('keeps the single-lens result for a legacy multi-camera device', async () => {
|
|
37
|
+
await expect(getCaptureResultSummary(createCaptureResult(basePath), {
|
|
38
|
+
multiLens: false,
|
|
39
|
+
protocolCount: 4,
|
|
40
|
+
devId: 'dev-1'
|
|
41
|
+
})).resolves.toEqual({
|
|
42
|
+
count: 1,
|
|
43
|
+
isMultiLens: false,
|
|
44
|
+
thumbnailPath: basePath
|
|
45
|
+
});
|
|
46
|
+
expect(mockGetDeviceInfo).not.toHaveBeenCalled();
|
|
47
|
+
});
|
|
48
|
+
it('uses the protocol count when the multi-lens mode is enabled', async () => {
|
|
49
|
+
await expect(getCaptureResultSummary(createCaptureResult(basePath), {
|
|
50
|
+
multiLens: true,
|
|
51
|
+
protocolCount: 4,
|
|
52
|
+
devId: 'dev-1'
|
|
53
|
+
})).resolves.toEqual({
|
|
54
|
+
count: 4,
|
|
55
|
+
isMultiLens: true,
|
|
56
|
+
thumbnailPath: basePath
|
|
57
|
+
});
|
|
58
|
+
expect(mockGetDeviceInfo).toHaveBeenCalledWith('dev-1');
|
|
59
|
+
});
|
|
60
|
+
it('uses the lens path when both multi-lens sources are present', async () => {
|
|
61
|
+
mockGetDeviceInfo.mockResolvedValue({
|
|
62
|
+
configMetas: {
|
|
63
|
+
tyabimr4v3: {
|
|
64
|
+
total_split_num: 4
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
await expect(getCaptureResultSummary(createCaptureResult(basePath), {
|
|
69
|
+
multiLens: true,
|
|
70
|
+
protocolCount: 4,
|
|
71
|
+
devId: 'dev-1'
|
|
72
|
+
})).resolves.toEqual({
|
|
73
|
+
count: 4,
|
|
74
|
+
isMultiLens: true,
|
|
75
|
+
thumbnailPath: 'thingfile://tmp/capture_123_lens1.jpg'
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
it('does not add a duplicate lens suffix', async () => {
|
|
79
|
+
mockGetDeviceInfo.mockResolvedValue({
|
|
80
|
+
configMetas: {
|
|
81
|
+
tyabimr4v3: JSON.stringify({
|
|
82
|
+
total_split_num: 4
|
|
83
|
+
})
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
const path = 'thingfile://tmp/capture_123_lens1.jpg';
|
|
87
|
+
await expect(getCaptureResultSummary(createCaptureResult(path), {
|
|
88
|
+
multiLens: true,
|
|
89
|
+
devId: 'dev-1'
|
|
90
|
+
})).resolves.toEqual({
|
|
91
|
+
count: 4,
|
|
92
|
+
isMultiLens: true,
|
|
93
|
+
thumbnailPath: path
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
it('keeps a mono result unchanged', async () => {
|
|
97
|
+
await expect(getCaptureResultSummary(createCaptureResult(basePath), {
|
|
98
|
+
multiLens: false,
|
|
99
|
+
devId: 'dev-1'
|
|
100
|
+
})).resolves.toEqual({
|
|
101
|
+
count: 1,
|
|
102
|
+
isMultiLens: false,
|
|
103
|
+
thumbnailPath: basePath
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
it('keeps a single-lens result when multi-lens mode has one lens', async () => {
|
|
107
|
+
await expect(getCaptureResultSummary(createCaptureResult(basePath), {
|
|
108
|
+
multiLens: true,
|
|
109
|
+
protocolCount: 1,
|
|
110
|
+
devId: 'dev-1'
|
|
111
|
+
})).resolves.toEqual({
|
|
112
|
+
count: 1,
|
|
113
|
+
isMultiLens: false,
|
|
114
|
+
thumbnailPath: basePath
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import './captureResult.less';
|
|
3
|
+
export type CaptureKind = 'record' | 'screenshot';
|
|
4
|
+
export interface CaptureResultToastProps {
|
|
5
|
+
brandColor: string;
|
|
6
|
+
kind: CaptureKind;
|
|
7
|
+
thumbnailPath: string;
|
|
8
|
+
onCheck: () => void;
|
|
9
|
+
count?: number;
|
|
10
|
+
/** 自定义标题(可选),不传时使用默认文案 */
|
|
11
|
+
title?: React.ReactNode;
|
|
12
|
+
/** 自定义操作按钮文案(可选),不传时默认为“查看” */
|
|
13
|
+
checkText?: string;
|
|
14
|
+
className?: string;
|
|
15
|
+
}
|
|
16
|
+
export declare function CaptureResultToast({ brandColor, count, kind, onCheck, thumbnailPath, title, checkText, className, }: CaptureResultToastProps): React.JSX.Element;
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { Image, Text, View } from '@ray-js/ray';
|
|
3
|
+
import clsx from 'clsx';
|
|
4
|
+
import Strings from '../../i18n';
|
|
5
|
+
import './captureResult.less';
|
|
6
|
+
const BACKDROP_LAYERS = ['back', 'middle'];
|
|
7
|
+
const TEXT_KEYS = {
|
|
8
|
+
record: {
|
|
9
|
+
check: 'ipc_player_record_success_check',
|
|
10
|
+
multi: 'ipc_player_record_multi_success_tip',
|
|
11
|
+
single: 'ipc_player_record_success_tip'
|
|
12
|
+
},
|
|
13
|
+
screenshot: {
|
|
14
|
+
check: 'ipc_player_shot_success_check',
|
|
15
|
+
multi: 'ipc_player_screenshot_multi_success_tip',
|
|
16
|
+
single: 'ipc_player_screenshot_success_tip'
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
const LEGACY_CLASS_MAP = {
|
|
20
|
+
record: {
|
|
21
|
+
toast: 'ipc-player-plugin-record-success-toast',
|
|
22
|
+
imageBox: 'ipc-player-plugin-record-success-toast-image-box',
|
|
23
|
+
imageBoxMulti: 'ipc-player-plugin-record-success-toast-image-box-multi',
|
|
24
|
+
image: 'ipc-player-plugin-record-success-toast-image',
|
|
25
|
+
playIconBox: 'ipc-player-plugin-record-success-play-icon-box',
|
|
26
|
+
playIcon: 'ipc-player-plugin-record-success-play-icon',
|
|
27
|
+
title: 'ipc-player-plugin-record-success-toast-title',
|
|
28
|
+
check: 'ipc-player-plugin-record-success-toast-bottom'
|
|
29
|
+
},
|
|
30
|
+
screenshot: {
|
|
31
|
+
toast: 'ipc-player-plugin-screenshot-toast',
|
|
32
|
+
imageBox: 'ipc-player-plugin-screenshot-toast-image-box',
|
|
33
|
+
imageBoxMulti: 'ipc-player-plugin-screenshot-toast-image-box-multi',
|
|
34
|
+
image: 'ipc-player-plugin-screenshot-toast-image',
|
|
35
|
+
playIconBox: '',
|
|
36
|
+
playIcon: '',
|
|
37
|
+
title: 'ipc-player-plugin-screenshot-toast-title',
|
|
38
|
+
check: 'ipc-player-plugin-screenshot-toast-bottom'
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
export function CaptureResultToast(_ref) {
|
|
42
|
+
let {
|
|
43
|
+
brandColor,
|
|
44
|
+
count = 0,
|
|
45
|
+
kind,
|
|
46
|
+
onCheck,
|
|
47
|
+
thumbnailPath,
|
|
48
|
+
title,
|
|
49
|
+
checkText,
|
|
50
|
+
className
|
|
51
|
+
} = _ref;
|
|
52
|
+
const isMultiLens = count > 1;
|
|
53
|
+
const textKeys = TEXT_KEYS[kind];
|
|
54
|
+
const legacyCls = LEGACY_CLASS_MAP[kind];
|
|
55
|
+
const imageClassName = clsx('ipc-player-plugin-capture-result-image', legacyCls.image);
|
|
56
|
+
return /*#__PURE__*/React.createElement(View, {
|
|
57
|
+
className: clsx('ipc-player-plugin-capture-result-toast', legacyCls.toast, className)
|
|
58
|
+
}, /*#__PURE__*/React.createElement(View, {
|
|
59
|
+
className: clsx('ipc-player-plugin-capture-result-image-box', legacyCls.imageBox, isMultiLens && ['ipc-player-plugin-capture-result-image-box-multi', legacyCls.imageBoxMulti])
|
|
60
|
+
}, isMultiLens ? /*#__PURE__*/React.createElement(React.Fragment, null, BACKDROP_LAYERS.map(layer => /*#__PURE__*/React.createElement(View, {
|
|
61
|
+
key: layer,
|
|
62
|
+
className: clsx('ipc-player-plugin-capture-result-backdrop', `ipc-player-plugin-capture-result-image-${layer}`)
|
|
63
|
+
})), /*#__PURE__*/React.createElement(Image, {
|
|
64
|
+
className: clsx(imageClassName, 'ipc-player-plugin-capture-result-image-front'),
|
|
65
|
+
src: thumbnailPath
|
|
66
|
+
})) : /*#__PURE__*/React.createElement(Image, {
|
|
67
|
+
className: imageClassName,
|
|
68
|
+
src: thumbnailPath
|
|
69
|
+
}), kind === 'record' && /*#__PURE__*/React.createElement(View, {
|
|
70
|
+
className: clsx('ipc-player-plugin-capture-result-play-icon-box', legacyCls.playIconBox)
|
|
71
|
+
}, /*#__PURE__*/React.createElement(Text, {
|
|
72
|
+
className: clsx('icon-panel', 'icon-panel-record-play', 'ipc-player-plugin-capture-result-play-icon', legacyCls.playIcon)
|
|
73
|
+
}))), /*#__PURE__*/React.createElement(View, {
|
|
74
|
+
className: clsx('ipc-player-plugin-capture-result-title', legacyCls.title)
|
|
75
|
+
}, title ? typeof title === 'string' ? /*#__PURE__*/React.createElement(Text, null, title) : title : isMultiLens ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, null, Strings.getLang(textKeys.multi)), /*#__PURE__*/React.createElement(Text, {
|
|
76
|
+
className: "ipc-player-plugin-capture-result-count"
|
|
77
|
+
}, Strings.formatString(Strings.getLang('ipc_player_multi_capture_success_count'), count))) : Strings.getLang(textKeys.single)), /*#__PURE__*/React.createElement(View, {
|
|
78
|
+
onClick: onCheck,
|
|
79
|
+
className: clsx('ipc-player-plugin-capture-result-check', legacyCls.check),
|
|
80
|
+
style: {
|
|
81
|
+
color: brandColor,
|
|
82
|
+
borderColor: brandColor
|
|
83
|
+
}
|
|
84
|
+
}, checkText || Strings.getLang(textKeys.check)));
|
|
85
|
+
}
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
.ipc-player-plugin-capture-result-toast,
|
|
2
|
+
.ipc-player-plugin-record-success-toast,
|
|
3
|
+
.ipc-player-plugin-screenshot-toast {
|
|
4
|
+
--capture-result-text-color: var(--fontColor, #fff);
|
|
5
|
+
--capture-result-near-backdrop-color: rgba(255, 255, 255, 0.2);
|
|
6
|
+
--capture-result-far-backdrop-color: rgba(255, 255, 255, 0.1);
|
|
7
|
+
|
|
8
|
+
z-index: 100;
|
|
9
|
+
display: flex;
|
|
10
|
+
flex: 1;
|
|
11
|
+
align-items: center;
|
|
12
|
+
padding: calc(7px * var(--ipc-player-size-scale, 1))
|
|
13
|
+
calc(16px * var(--ipc-player-size-scale, 1))
|
|
14
|
+
calc(7px * var(--ipc-player-size-scale, 1))
|
|
15
|
+
calc(12px * var(--ipc-player-size-scale, 1));
|
|
16
|
+
background-color: var(--shot-card-bg-color);
|
|
17
|
+
border-radius: calc(8px * var(--ipc-player-size-scale, 1));
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
:root[theme='light'] .ipc-player-plugin-capture-result-toast {
|
|
21
|
+
--capture-result-text-color: #1a1a1a;
|
|
22
|
+
--capture-result-near-backdrop-color: rgba(0, 0, 0, 0.1);
|
|
23
|
+
--capture-result-far-backdrop-color: rgba(0, 0, 0, 0.05);
|
|
24
|
+
|
|
25
|
+
background-color: #fff;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
.ipc-player-plugin-capture-result-image-box,
|
|
29
|
+
.ipc-player-plugin-record-success-toast-image-box,
|
|
30
|
+
.ipc-player-plugin-screenshot-toast-image-box {
|
|
31
|
+
position: relative;
|
|
32
|
+
width: calc(66px * var(--ipc-player-size-scale, 1));
|
|
33
|
+
height: calc(39px * var(--ipc-player-size-scale, 1));
|
|
34
|
+
overflow: hidden;
|
|
35
|
+
border-radius: calc(4px * var(--ipc-player-size-scale, 1));
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
.ipc-player-plugin-capture-result-image,
|
|
39
|
+
.ipc-player-plugin-record-success-toast-image,
|
|
40
|
+
.ipc-player-plugin-screenshot-toast-image {
|
|
41
|
+
width: 100%;
|
|
42
|
+
height: 100%;
|
|
43
|
+
object-fit: cover;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
.ipc-player-plugin-capture-result-backdrop,
|
|
47
|
+
.ipc-player-plugin-capture-result-image-front {
|
|
48
|
+
position: absolute;
|
|
49
|
+
box-sizing: border-box;
|
|
50
|
+
border-radius: calc(4px * var(--ipc-player-size-scale, 1));
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
.ipc-player-plugin-capture-result-image-back {
|
|
54
|
+
top: calc(1px * var(--ipc-player-size-scale, 1));
|
|
55
|
+
left: calc(5px * var(--ipc-player-size-scale, 1));
|
|
56
|
+
z-index: 1;
|
|
57
|
+
width: calc(56px * var(--ipc-player-size-scale, 1));
|
|
58
|
+
height: calc(28px * var(--ipc-player-size-scale, 1));
|
|
59
|
+
background: var(--capture-result-far-backdrop-color);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
.ipc-player-plugin-capture-result-image-middle {
|
|
63
|
+
top: calc(3px * var(--ipc-player-size-scale, 1));
|
|
64
|
+
left: calc(2.5px * var(--ipc-player-size-scale, 1));
|
|
65
|
+
z-index: 2;
|
|
66
|
+
width: calc(61px * var(--ipc-player-size-scale, 1));
|
|
67
|
+
height: calc(30.5px * var(--ipc-player-size-scale, 1));
|
|
68
|
+
background: var(--capture-result-near-backdrop-color);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
.ipc-player-plugin-capture-result-image-front {
|
|
72
|
+
top: calc(5px * var(--ipc-player-size-scale, 1));
|
|
73
|
+
left: 0;
|
|
74
|
+
z-index: 3;
|
|
75
|
+
width: calc(66px * var(--ipc-player-size-scale, 1));
|
|
76
|
+
height: calc(33px * var(--ipc-player-size-scale, 1));
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
.ipc-player-plugin-capture-result-play-icon-box,
|
|
80
|
+
.ipc-player-plugin-record-success-play-icon-box {
|
|
81
|
+
position: absolute;
|
|
82
|
+
top: 50%;
|
|
83
|
+
left: 50%;
|
|
84
|
+
z-index: 4;
|
|
85
|
+
display: flex;
|
|
86
|
+
align-items: center;
|
|
87
|
+
justify-content: center;
|
|
88
|
+
width: calc(16px * var(--ipc-player-size-scale, 1));
|
|
89
|
+
height: calc(16px * var(--ipc-player-size-scale, 1));
|
|
90
|
+
overflow: hidden;
|
|
91
|
+
background-color: rgba(0, 0, 0, 0.2);
|
|
92
|
+
border-radius: 50%;
|
|
93
|
+
transform: translate(-50%, -50%);
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
.ipc-player-plugin-capture-result-image-box-multi
|
|
97
|
+
.ipc-player-plugin-capture-result-play-icon-box {
|
|
98
|
+
top: calc(50% + 2px * var(--ipc-player-size-scale, 1));
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
.ipc-player-plugin-capture-result-play-icon,
|
|
102
|
+
.ipc-player-plugin-record-success-play-icon {
|
|
103
|
+
color: #ffffff;
|
|
104
|
+
font-size: calc(9px * var(--ipc-player-size-scale, 1)) !important;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
.ipc-player-plugin-capture-result-title,
|
|
108
|
+
.ipc-player-plugin-record-success-toast-title,
|
|
109
|
+
.ipc-player-plugin-screenshot-toast-title {
|
|
110
|
+
display: flex;
|
|
111
|
+
flex: 1;
|
|
112
|
+
flex-direction: column;
|
|
113
|
+
min-width: 0;
|
|
114
|
+
margin-right: calc(12px * var(--ipc-player-size-scale, 1));
|
|
115
|
+
margin-left: calc(8px * var(--ipc-player-size-scale, 1));
|
|
116
|
+
color: var(--capture-result-text-color, var(--fontColor));
|
|
117
|
+
font-size: calc(14px * var(--ipc-player-size-scale, 1));
|
|
118
|
+
line-height: calc(20px * var(--ipc-player-size-scale, 1));
|
|
119
|
+
word-break: break-word;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
.ipc-player-plugin-capture-result-count {
|
|
123
|
+
margin-top: calc(2px * var(--ipc-player-size-scale, 1));
|
|
124
|
+
color: var(--capture-result-text-color, var(--fontColor));
|
|
125
|
+
font-size: calc(12px * var(--ipc-player-size-scale, 1));
|
|
126
|
+
line-height: calc(17px * var(--ipc-player-size-scale, 1));
|
|
127
|
+
opacity: 0.5;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
.ipc-player-plugin-capture-result-check,
|
|
131
|
+
.ipc-player-plugin-record-success-toast-bottom,
|
|
132
|
+
.ipc-player-plugin-screenshot-toast-bottom {
|
|
133
|
+
min-width: calc(52px * var(--ipc-player-size-scale, 1));
|
|
134
|
+
max-width: calc(100px * var(--ipc-player-size-scale, 1));
|
|
135
|
+
flex-shrink: 0;
|
|
136
|
+
padding: calc(5px * var(--ipc-player-size-scale, 1))
|
|
137
|
+
calc(11px * var(--ipc-player-size-scale, 1));
|
|
138
|
+
overflow: hidden;
|
|
139
|
+
font-size: calc(14px * var(--ipc-player-size-scale, 1));
|
|
140
|
+
white-space: nowrap;
|
|
141
|
+
text-overflow: ellipsis;
|
|
142
|
+
border: 1px solid #1989fa;
|
|
143
|
+
border-radius: calc(4px * var(--ipc-player-size-scale, 1));
|
|
144
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { renderToStaticMarkup } from 'react-dom/server';
|
|
3
|
+
jest.mock('@ray-js/ray', () => {
|
|
4
|
+
const React = require('react');
|
|
5
|
+
return {
|
|
6
|
+
Image: _ref => {
|
|
7
|
+
let {
|
|
8
|
+
className,
|
|
9
|
+
src
|
|
10
|
+
} = _ref;
|
|
11
|
+
return /*#__PURE__*/React.createElement("img", {
|
|
12
|
+
alt: "",
|
|
13
|
+
className: className,
|
|
14
|
+
src: src
|
|
15
|
+
});
|
|
16
|
+
},
|
|
17
|
+
Text: _ref2 => {
|
|
18
|
+
let {
|
|
19
|
+
children,
|
|
20
|
+
className
|
|
21
|
+
} = _ref2;
|
|
22
|
+
return /*#__PURE__*/React.createElement("span", {
|
|
23
|
+
className: className
|
|
24
|
+
}, children);
|
|
25
|
+
},
|
|
26
|
+
View: _ref3 => {
|
|
27
|
+
let {
|
|
28
|
+
children,
|
|
29
|
+
className
|
|
30
|
+
} = _ref3;
|
|
31
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
32
|
+
className: className
|
|
33
|
+
}, children);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
});
|
|
37
|
+
jest.mock('../../i18n', () => ({
|
|
38
|
+
__esModule: true,
|
|
39
|
+
default: {
|
|
40
|
+
getLang: key => key,
|
|
41
|
+
formatString: (template, count) => `${template}:${count}`
|
|
42
|
+
}
|
|
43
|
+
}));
|
|
44
|
+
jest.mock('./captureResult.less', () => ({}));
|
|
45
|
+
const {
|
|
46
|
+
CaptureResultToast
|
|
47
|
+
} = require('./captureResult');
|
|
48
|
+
const renderToast = count => renderToStaticMarkup(/*#__PURE__*/React.createElement(CaptureResultToast, {
|
|
49
|
+
brandColor: "#ff592a",
|
|
50
|
+
count: count,
|
|
51
|
+
kind: "screenshot",
|
|
52
|
+
onCheck: () => undefined,
|
|
53
|
+
thumbnailPath: "thingfile://capture.jpg"
|
|
54
|
+
}));
|
|
55
|
+
const countClass = (markup, className) => [...markup.matchAll(/class="([^"]*)"/g)].filter(_ref4 => {
|
|
56
|
+
let [, names] = _ref4;
|
|
57
|
+
return names.split(/\s+/).includes(className);
|
|
58
|
+
}).length;
|
|
59
|
+
describe('CaptureResultToast', () => {
|
|
60
|
+
it('keeps the single-item thumbnail unchanged', () => {
|
|
61
|
+
const markup = renderToast(1);
|
|
62
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-backdrop')).toBe(0);
|
|
63
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image-front')).toBe(0);
|
|
64
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image')).toBe(1);
|
|
65
|
+
});
|
|
66
|
+
it('renders both backdrops for two captured items', () => {
|
|
67
|
+
const markup = renderToast(2);
|
|
68
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-backdrop')).toBe(2);
|
|
69
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image-back')).toBe(1);
|
|
70
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image-middle')).toBe(1);
|
|
71
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image-front')).toBe(1);
|
|
72
|
+
});
|
|
73
|
+
it('caps the backdrop count at two', () => {
|
|
74
|
+
const markup = renderToast(4);
|
|
75
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-backdrop')).toBe(2);
|
|
76
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image-back')).toBe(1);
|
|
77
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image-middle')).toBe(1);
|
|
78
|
+
expect(countClass(markup, 'ipc-player-plugin-capture-result-image-front')).toBe(1);
|
|
79
|
+
});
|
|
80
|
+
});
|
package/lib/widgets/index.d.ts
CHANGED
package/lib/widgets/index.js
CHANGED
|
@@ -4,6 +4,7 @@ import clsx from 'clsx';
|
|
|
4
4
|
import { useStore } from '../../ctx/store';
|
|
5
5
|
import { UIEventContext } from '../../ui/context';
|
|
6
6
|
import { widgetLabs, widgetClick, pauseTimeToHideAllComponent, startTimeToHideAllComponent } from '../../ui/constant';
|
|
7
|
+
import { IntercomMode } from '../../interface';
|
|
7
8
|
import './muted.less';
|
|
8
9
|
export const Muted = props => {
|
|
9
10
|
const {
|
|
@@ -17,13 +18,21 @@ export const Muted = props => {
|
|
|
17
18
|
} = useContext(UIEventContext);
|
|
18
19
|
const event = propsEvent !== null && propsEvent !== void 0 ? propsEvent : ctxEvent;
|
|
19
20
|
const {
|
|
20
|
-
isMuted
|
|
21
|
+
isMuted,
|
|
22
|
+
intercom,
|
|
23
|
+
intercomMode
|
|
21
24
|
} = useStore({
|
|
22
|
-
isMuted: mute
|
|
25
|
+
isMuted: mute,
|
|
26
|
+
intercom: props.intercom,
|
|
27
|
+
intercomMode: props.intercomMode
|
|
23
28
|
});
|
|
29
|
+
const disabled = intercom && intercomMode === IntercomMode.OneWay;
|
|
24
30
|
return /*#__PURE__*/React.createElement(View, {
|
|
25
|
-
className: clsx(className
|
|
31
|
+
className: clsx(className, {
|
|
32
|
+
'ipc-player-plugin-muted-disabled': disabled
|
|
33
|
+
}),
|
|
26
34
|
onClick: () => {
|
|
35
|
+
if (disabled) return;
|
|
27
36
|
event.emit(widgetClick, {
|
|
28
37
|
widgetId: widgetLabs.MUTED
|
|
29
38
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { act, renderHook } from '@testing-library/react-hooks/dom';
|
|
2
|
+
import { atom, getDefaultStore } from 'jotai';
|
|
3
|
+
import { IntercomMode } from '../../interface';
|
|
4
|
+
import { Muted } from './muted';
|
|
5
|
+
jest.mock('@ray-js/ray', () => ({
|
|
6
|
+
View: 'div',
|
|
7
|
+
Text: 'span'
|
|
8
|
+
}));
|
|
9
|
+
jest.mock('@ray-js/ray-ipc-utils/lib/interface', () => ({
|
|
10
|
+
IntercomMode: {
|
|
11
|
+
OneWay: 'OneWay',
|
|
12
|
+
TwoWay: 'TwoWay'
|
|
13
|
+
}
|
|
14
|
+
}));
|
|
15
|
+
jest.mock('./muted.less', () => ({}));
|
|
16
|
+
const createProps = function () {
|
|
17
|
+
let talking = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
|
18
|
+
let mode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : IntercomMode.OneWay;
|
|
19
|
+
let muted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
|
|
20
|
+
return {
|
|
21
|
+
mute: atom(muted),
|
|
22
|
+
intercom: atom(talking),
|
|
23
|
+
intercomMode: atom(mode),
|
|
24
|
+
setMute: jest.fn(),
|
|
25
|
+
event: {
|
|
26
|
+
emit: jest.fn()
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
it('blocks speaker changes and control events during half-duplex talk', () => {
|
|
31
|
+
const props = createProps(true);
|
|
32
|
+
const {
|
|
33
|
+
result,
|
|
34
|
+
unmount
|
|
35
|
+
} = renderHook(() => Muted(props));
|
|
36
|
+
act(() => result.current.props.onClick());
|
|
37
|
+
expect(props.setMute).not.toHaveBeenCalled();
|
|
38
|
+
expect(props.event.emit).not.toHaveBeenCalled();
|
|
39
|
+
unmount();
|
|
40
|
+
});
|
|
41
|
+
it.each([[false, IntercomMode.OneWay, true, false], [false, IntercomMode.OneWay, false, true], [true, IntercomMode.TwoWay, true, false], [true, IntercomMode.TwoWay, false, true]])('keeps speaker switching when talking=%s, mode=%s, muted=%s', (talking, mode, muted, target) => {
|
|
42
|
+
const props = createProps(talking, mode, muted);
|
|
43
|
+
const {
|
|
44
|
+
result,
|
|
45
|
+
unmount
|
|
46
|
+
} = renderHook(() => Muted(props));
|
|
47
|
+
act(() => result.current.props.onClick());
|
|
48
|
+
expect(props.setMute).toHaveBeenCalledTimes(1);
|
|
49
|
+
expect(props.setMute).toHaveBeenCalledWith(target);
|
|
50
|
+
unmount();
|
|
51
|
+
});
|
|
52
|
+
it('uses shared talk state after remount and unlocks when talk ends', () => {
|
|
53
|
+
const props = createProps();
|
|
54
|
+
const store = getDefaultStore();
|
|
55
|
+
const first = renderHook(() => Muted(props));
|
|
56
|
+
act(() => store.set(props.intercom, true));
|
|
57
|
+
act(() => first.result.current.props.onClick());
|
|
58
|
+
expect(props.setMute).not.toHaveBeenCalled();
|
|
59
|
+
first.unmount();
|
|
60
|
+
const second = renderHook(() => Muted(props));
|
|
61
|
+
act(() => second.result.current.props.onClick());
|
|
62
|
+
expect(props.setMute).not.toHaveBeenCalled();
|
|
63
|
+
act(() => store.set(props.intercom, false));
|
|
64
|
+
act(() => second.result.current.props.onClick());
|
|
65
|
+
expect(props.setMute).toHaveBeenCalledWith(false);
|
|
66
|
+
second.unmount();
|
|
67
|
+
});
|
|
68
|
+
it('unlocks when active talk changes to full-duplex mode', () => {
|
|
69
|
+
const props = createProps(true);
|
|
70
|
+
const {
|
|
71
|
+
result,
|
|
72
|
+
unmount
|
|
73
|
+
} = renderHook(() => Muted(props));
|
|
74
|
+
act(() => getDefaultStore().set(props.intercomMode, IntercomMode.TwoWay));
|
|
75
|
+
act(() => result.current.props.onClick());
|
|
76
|
+
expect(props.setMute).toHaveBeenCalledWith(false);
|
|
77
|
+
unmount();
|
|
78
|
+
});
|