@ray-js/ipc-player-integration 0.0.63 → 0.0.65-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 (50) hide show
  1. package/lib/ctx/ctx.album.test.d.ts +1 -0
  2. package/lib/ctx/ctx.album.test.js +197 -0
  3. package/lib/ctx/ctx.composition.js +19 -4
  4. package/lib/ctx/ctx.js +103 -55
  5. package/lib/ctx/ports.output.d.ts +1 -0
  6. package/lib/ctx/resolution.d.ts +1 -1
  7. package/lib/ctx/resolution.js +3 -1
  8. package/lib/i18n/index.d.ts +12 -0
  9. package/lib/i18n/strings.d.ts +6 -0
  10. package/lib/i18n/strings.js +6 -0
  11. package/lib/interface.d.ts +19 -3
  12. package/lib/ui/absoluteContent.d.ts +2 -0
  13. package/lib/ui/absoluteContent.js +3 -0
  14. package/lib/ui/bottomLeftContent.js +3 -1
  15. package/lib/ui/ui.d.ts +2 -0
  16. package/lib/ui/ui.js +30 -26
  17. package/lib/utils/captureResult.d.ts +14 -0
  18. package/lib/utils/captureResult.js +70 -0
  19. package/lib/utils/captureResult.test.d.ts +1 -0
  20. package/lib/utils/captureResult.test.js +117 -0
  21. package/lib/utils/fullLinkTracking.d.ts +5 -0
  22. package/lib/utils/fullLinkTracking.js +71 -0
  23. package/lib/utils/navigation.d.ts +2 -1
  24. package/lib/utils/navigation.js +13 -3
  25. package/lib/utils/ttt.js +2 -8
  26. package/lib/widgets/captureResult/captureResult.d.ts +16 -0
  27. package/lib/widgets/captureResult/captureResult.js +85 -0
  28. package/lib/widgets/captureResult/captureResult.less +144 -0
  29. package/lib/widgets/captureResult/captureResult.test.d.ts +1 -0
  30. package/lib/widgets/captureResult/captureResult.test.js +80 -0
  31. package/lib/widgets/captureResult/index.d.ts +2 -0
  32. package/lib/widgets/captureResult/index.js +2 -0
  33. package/lib/widgets/index.d.ts +1 -0
  34. package/lib/widgets/index.js +2 -1
  35. package/lib/widgets/multiCamera/index.less +1 -0
  36. package/lib/widgets/recordVideo/recordVideo.js +53 -52
  37. package/lib/widgets/recordVideo/recordVideo.less +17 -74
  38. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.d.ts +1 -0
  39. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.js +106 -0
  40. package/lib/widgets/recordVideo/recordVideo.test.js +1 -0
  41. package/lib/widgets/screenshot/screenshot.js +66 -44
  42. package/lib/widgets/screenshot/screenshot.less +1 -40
  43. package/lib/widgets/screenshot/screenshot.test.d.ts +1 -0
  44. package/lib/widgets/screenshot/screenshot.test.js +120 -0
  45. package/lib/widgets/trialBadge/index.d.ts +2 -1
  46. package/lib/widgets/trialBadge/index.js +17 -9
  47. package/lib/widgets/trialBadge/useTrialBadge.d.ts +3 -2
  48. package/lib/widgets/trialBadge/useTrialBadge.js +13 -2
  49. package/lib/widgets/tryExperience/tryExperience.js +0 -1
  50. package/package.json +3 -2
@@ -0,0 +1,106 @@
1
+ import "core-js/modules/esnext.iterator.constructor.js";
2
+ import "core-js/modules/esnext.iterator.filter.js";
3
+ import "core-js/modules/esnext.iterator.map.js";
4
+ import React, { useState } from 'react';
5
+ import ReactDOM from 'react-dom';
6
+ import { act, Simulate } from 'react-dom/test-utils';
7
+ import { atom, getDefaultStore } from 'jotai';
8
+ import { PlayState } from '../../interface';
9
+ import { RecordVideo } from './recordVideo';
10
+ jest.mock('@ray-js/ray', () => ({
11
+ View: 'div',
12
+ Text: 'span',
13
+ Image: 'img',
14
+ getSystemInfoSync: () => ({
15
+ platform: 'android'
16
+ })
17
+ }));
18
+ jest.mock('@ray-js/ray-ipc-utils', () => ({
19
+ goToIpcPageNativeRoute: jest.fn()
20
+ }));
21
+ jest.mock('@ray-js/ray-ipc-utils/lib/interface', () => ({}));
22
+ jest.mock('../../utils/device', () => ({
23
+ getDeviceInfo: jest.fn()
24
+ }));
25
+ jest.mock('../../i18n', () => ({
26
+ __esModule: true,
27
+ default: {
28
+ getLang: key => key
29
+ }
30
+ }));
31
+ jest.mock('./recordVideo.less', () => ({}));
32
+ jest.mock('../captureResult/captureResult.less', () => ({}));
33
+ describe('RecordVideo', () => {
34
+ let container;
35
+ beforeEach(() => {
36
+ jest.useFakeTimers('modern');
37
+ container = document.createElement('div');
38
+ document.body.appendChild(container);
39
+ });
40
+ afterEach(() => {
41
+ act(() => ReactDOM.unmountComponentAtNode(container));
42
+ container.remove();
43
+ jest.clearAllTimers();
44
+ jest.useRealTimers();
45
+ });
46
+ it.each([false, true])('removes the recording timer after stop (remounted: %s)', async remount => {
47
+ var _container$querySelec, _container$querySelec2;
48
+ const store = getDefaultStore();
49
+ const recording = atom(false);
50
+ const recordingDisabled = atom(false);
51
+ const screenType = atom('vertical');
52
+ const setRecording = jest.fn(async value => {
53
+ store.set(recording, value);
54
+ return value ? true : {
55
+ tempImagePath: 'thingfile://record.jpg'
56
+ };
57
+ });
58
+ function Harness(_ref) {
59
+ let {
60
+ widgetKey
61
+ } = _ref;
62
+ const [contents, setContents] = useState([]);
63
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(RecordVideo, {
64
+ key: widgetKey,
65
+ devId: 'device',
66
+ recording,
67
+ recordingDisabled,
68
+ screenType,
69
+ brandColor: atom('#ff592a'),
70
+ playState: atom(PlayState.PLAYING),
71
+ setRecording,
72
+ setRecordingDisabled: value => store.set(recordingDisabled, value),
73
+ addContent: (_type, content) => setContents(items => [...items, content]),
74
+ deleteContent: (_type, id) => setContents(items => items.filter(item => item.id !== id))
75
+ }), contents.map(item => /*#__PURE__*/React.createElement(item.content, {
76
+ key: item.id
77
+ })));
78
+ }
79
+ const clickRecord = async () => {
80
+ await act(async () => {
81
+ Simulate.click(container.querySelector('.ipc-player-plugin-record-video-icon').parentElement);
82
+ });
83
+ };
84
+ await act(async () => {
85
+ ReactDOM.render(/*#__PURE__*/React.createElement(Harness, {
86
+ widgetKey: 0
87
+ }), container);
88
+ });
89
+ await clickRecord();
90
+ act(() => jest.advanceTimersByTime(3000));
91
+ expect((_container$querySelec = container.querySelector('.ipc-player-plugin-record-video-toast-time')) === null || _container$querySelec === void 0 ? void 0 : _container$querySelec.textContent).toBe('00:03');
92
+ if (remount) {
93
+ await act(async () => {
94
+ store.set(screenType, 'full');
95
+ ReactDOM.render(/*#__PURE__*/React.createElement(Harness, {
96
+ widgetKey: 1
97
+ }), container);
98
+ });
99
+ }
100
+ expect((_container$querySelec2 = container.querySelector('.ipc-player-plugin-record-video-toast-time')) === null || _container$querySelec2 === void 0 ? void 0 : _container$querySelec2.textContent).toBe('00:03');
101
+ await clickRecord();
102
+ expect(setRecording).toHaveBeenLastCalledWith(false);
103
+ expect(container.querySelector('.icon-panel-record-stop')).toBeNull();
104
+ expect(container.querySelector('.ipc-player-plugin-record-video-toast-time')).toBeNull();
105
+ });
106
+ });
@@ -22,6 +22,7 @@ jest.mock('../../i18n', () => ({
22
22
  }
23
23
  }));
24
24
  jest.mock('./recordVideo.less', () => ({}));
25
+ jest.mock('../captureResult/captureResult.less', () => ({}));
25
26
  it('keeps the record control idle when starting is declined', async () => {
26
27
  const addContent = jest.fn();
27
28
  const setRecordingDisabled = jest.fn();
@@ -1,5 +1,5 @@
1
- import React, { useContext, useRef } from 'react';
2
- import { View, Image, Text, getSystemInfoSync } from '@ray-js/ray';
1
+ import React, { useContext, useEffect, useRef } from 'react';
2
+ import { View, Text, 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';
@@ -7,7 +7,9 @@ import Strings from '../../i18n';
7
7
  import { useStore } from '../../ctx/store';
8
8
  import { UIEventContext } from '../../ui/context';
9
9
  import { pauseTimeToHideAllComponent, changeIgnoreHideStopPreview, widgetLabs, widgetClick } from '../../ui/constant';
10
+ import { getCaptureResultSummary } from '../../utils/captureResult';
10
11
  import { ensureAlbumPermission } from '../../utils/authorize/album';
12
+ import { CaptureResultToast } from '../captureResult/captureResult';
11
13
  import './screenshot.less';
12
14
  const CLOSE_TIME = 5000;
13
15
  export function Screenshot(props) {
@@ -35,8 +37,15 @@ export function Screenshot(props) {
35
37
  /** 记录截屏url */
36
38
  const [state, setState] = useSetState({
37
39
  showShot: false,
38
- shotUrl: ''
40
+ shotUrl: '',
41
+ shotCount: 0
39
42
  });
43
+ const snapshotRequestIdRef = useRef(0);
44
+ useEffect(() => {
45
+ return () => {
46
+ snapshotRequestIdRef.current += 1;
47
+ };
48
+ }, []);
40
49
  useUpdateEffect(() => {
41
50
  if (state.showShot && screenType) {
42
51
  showShotToast();
@@ -49,7 +58,8 @@ export function Screenshot(props) {
49
58
  timer.current = setTimeout(() => {
50
59
  setState({
51
60
  showShot: false,
52
- shotUrl: ''
61
+ shotUrl: '',
62
+ shotCount: 0
53
63
  });
54
64
  deleteContent('absolute', 'plugin-screenshot-toast');
55
65
  }, CLOSE_TIME);
@@ -59,7 +69,8 @@ export function Screenshot(props) {
59
69
  const handCheck = () => {
60
70
  setState({
61
71
  showShot: false,
62
- shotUrl: ''
72
+ shotUrl: '',
73
+ shotCount: 0
63
74
  });
64
75
  deleteContent('absolute', 'plugin-screenshot-toast');
65
76
  clearInterval(timer.current);
@@ -81,31 +92,20 @@ export function Screenshot(props) {
81
92
  marginLeft: screenType === 'vertical' ? '0' : '-200px'
82
93
  },
83
94
  content: () => {
84
- return /*#__PURE__*/React.createElement(View, {
85
- className: "ipc-player-plugin-screenshot-toast"
86
- }, /*#__PURE__*/React.createElement(View, {
87
- className: "ipc-player-plugin-screenshot-toast-image-box"
88
- }, /*#__PURE__*/React.createElement(Image, {
89
- className: "ipc-player-plugin-screenshot-toast-image",
90
- src: state.shotUrl
91
- })), /*#__PURE__*/React.createElement(View, {
92
- className: "ipc-player-plugin-screenshot-toast-title"
93
- }, Strings.getLang('ipc_player_screenshot_success_tip')), /*#__PURE__*/React.createElement(View, {
94
- onClick: handCheck,
95
- className: "ipc-player-plugin-screenshot-toast-bottom",
96
- style: {
97
- color: brandColor,
98
- borderColor: brandColor
99
- }
100
- }, Strings.getLang('ipc_player_shot_success_check')));
95
+ return /*#__PURE__*/React.createElement(CaptureResultToast, {
96
+ brandColor: brandColor,
97
+ count: state.shotCount,
98
+ kind: "screenshot",
99
+ onCheck: handCheck,
100
+ thumbnailPath: state.shotUrl
101
+ });
101
102
  }
102
103
  });
103
104
  timeToCloseToast();
104
105
  };
105
106
  const handClick = useMemoizedFn(async () => {
106
- var _props$event, _props$event2;
107
- const ev = (_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event;
108
- ((_props$event2 = props.event) !== null && _props$event2 !== void 0 ? _props$event2 : event).emit(widgetClick, {
107
+ var _props$event;
108
+ ((_props$event = props.event) !== null && _props$event !== void 0 ? _props$event : event).emit(widgetClick, {
109
109
  widgetId: widgetLabs.SCREENSHOT
110
110
  });
111
111
  console.log('截屏!!!');
@@ -119,27 +119,49 @@ export function Screenshot(props) {
119
119
  props.event ? props.event.emit(changeIgnoreHideStopPreview, true) : event.emit(changeIgnoreHideStopPreview, true);
120
120
  }
121
121
  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
+ };
122
135
  const granted = await ensureAlbumPermission();
123
- ev.emit(changeIgnoreHideStopPreview, false);
136
+ setIgnoreHideStopPreview(false);
124
137
  if (!granted) return;
125
- IPCPlayerContext.snapshot({
126
- saveToAlbum,
127
- success: res => {
128
- ev.emit(changeIgnoreHideStopPreview, false);
129
- setState({
130
- showShot: true,
131
- shotUrl: res.tempImagePath
132
- });
133
- },
134
- fail: err => {
135
- ev.emit(changeIgnoreHideStopPreview, false);
136
- const errObj = err.innerError || err || {};
137
- const errMsg = errObj.errorMsg || Strings.getLang('ipc_player_error_screenshot_error_tip');
138
- toast({
139
- title: errMsg
140
- });
141
- }
142
- });
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
+ })();
143
165
  });
144
166
  if (hideScreenShotMenu) return null;
145
167
  return /*#__PURE__*/React.createElement(View, {
@@ -2,46 +2,7 @@
2
2
  color: var(--iconColor);
3
3
  font-size: calc(var(--iconPlayerSize) * var(--ipc-player-size-scale, 1)) !important;
4
4
  }
5
+
5
6
  .ipc-player-plugin-screenshot-toast-wrap {
6
7
  position: absolute;
7
8
  }
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
- }
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,120 @@
1
+ import { act, renderHook } from '@testing-library/react-hooks/dom';
2
+ import { atom } from 'jotai';
3
+ import { authorize, authorizeStatus, getSystemInfoSync, showModal } from '@ray-js/ray';
4
+ import { getDeviceInfo } from '../../utils/device';
5
+ import { Screenshot } from './screenshot';
6
+ jest.mock('@ray-js/ray', () => ({
7
+ View: 'div',
8
+ Text: 'span',
9
+ Image: 'img',
10
+ getSystemInfoSync: jest.fn(),
11
+ authorize: jest.fn(),
12
+ authorizeStatus: jest.fn(),
13
+ showModal: jest.fn(),
14
+ openAppSystemSettingPage: jest.fn()
15
+ }));
16
+ jest.mock('@ray-js/ray-ipc-utils', () => ({
17
+ goToIpcPageNativeRoute: jest.fn()
18
+ }));
19
+ jest.mock('../../utils/device', () => ({
20
+ getDeviceInfo: jest.fn()
21
+ }));
22
+ jest.mock('../../i18n', () => ({
23
+ __esModule: true,
24
+ default: {
25
+ getLang: key => key
26
+ }
27
+ }));
28
+ jest.mock('./screenshot.less', () => ({}));
29
+ jest.mock('../captureResult/captureResult.less', () => ({}));
30
+ beforeEach(() => {
31
+ jest.clearAllMocks();
32
+ getSystemInfoSync.mockReturnValue({
33
+ platform: 'android',
34
+ system: 'android 12'
35
+ });
36
+ authorizeStatus.mockImplementation(_ref => {
37
+ let {
38
+ fail
39
+ } = _ref;
40
+ return fail({
41
+ errorCode: 9004
42
+ });
43
+ });
44
+ authorize.mockImplementation(_ref2 => {
45
+ let {
46
+ fail
47
+ } = _ref2;
48
+ return fail({
49
+ errorCode: 9004
50
+ });
51
+ });
52
+ getDeviceInfo.mockResolvedValue({
53
+ configMetas: {
54
+ tyabimr4v3: {
55
+ total_split_num: 3
56
+ }
57
+ }
58
+ });
59
+ });
60
+ const createProps = () => ({
61
+ IPCPlayerContext: {
62
+ snapshot: jest.fn(_ref3 => {
63
+ let {
64
+ success
65
+ } = _ref3;
66
+ return success({
67
+ tempImagePath: 'thingfile://capture.jpg'
68
+ });
69
+ })
70
+ },
71
+ addContent: jest.fn(),
72
+ deleteContent: jest.fn(),
73
+ saveToAlbum: 0,
74
+ devId: 'camera-1',
75
+ toast: jest.fn(),
76
+ screenType: atom('vertical'),
77
+ brandColor: atom('#000000'),
78
+ multiLens: true,
79
+ event: {
80
+ emit: jest.fn()
81
+ }
82
+ });
83
+ it('keeps multi-lens results when legacy album authorization is unavailable', async () => {
84
+ const props = createProps();
85
+ const {
86
+ result,
87
+ unmount
88
+ } = renderHook(() => Screenshot(props));
89
+ await act(async () => {
90
+ await result.current.props.onClick();
91
+ });
92
+ expect(authorizeStatus).not.toHaveBeenCalled();
93
+ expect(props.IPCPlayerContext.snapshot).toHaveBeenCalledWith(expect.objectContaining({
94
+ saveToAlbum: 0
95
+ }));
96
+ const [, config] = props.addContent.mock.calls[0];
97
+ expect(config.content().props).toEqual(expect.objectContaining({
98
+ count: 3,
99
+ thumbnailPath: 'thingfile://capture_lens1.jpg'
100
+ }));
101
+ unmount();
102
+ });
103
+ it('keeps the permission rejection path before taking a snapshot', async () => {
104
+ getSystemInfoSync.mockReturnValue({
105
+ platform: 'ios',
106
+ system: 'iOS 18'
107
+ });
108
+ const props = createProps();
109
+ const {
110
+ result,
111
+ unmount
112
+ } = renderHook(() => Screenshot(props));
113
+ await act(async () => {
114
+ await result.current.props.onClick();
115
+ });
116
+ expect(props.IPCPlayerContext.snapshot).not.toHaveBeenCalled();
117
+ expect(props.addContent).not.toHaveBeenCalled();
118
+ expect(showModal).toHaveBeenCalledTimes(1);
119
+ unmount();
120
+ });
@@ -2,6 +2,7 @@ import React from 'react';
2
2
  import './index.less';
3
3
  type Props = {
4
4
  className?: string;
5
+ onView?: () => void;
5
6
  /** 主题色(用于「开通」按钮背景)。默认与 player brandColor 一致 */
6
7
  brandColor?: string;
7
8
  /** 试看倒计时初始秒数,来源于 smartImageQualityState.trialRemainingSec */
@@ -11,5 +12,5 @@ type Props = {
11
12
  /** 倒计时归零时触发,本组件保证整个生命周期内只回调一次 */
12
13
  onCountdownEnd?: () => void;
13
14
  };
14
- export declare const TrialBadge: ({ className, brandColor, trialRemainingSec, onSubscribe, onCountdownEnd, }: Props) => React.JSX.Element;
15
+ export declare const TrialBadge: ({ className, onView, brandColor, trialRemainingSec, onSubscribe, onCountdownEnd, }: Props) => React.JSX.Element;
15
16
  export { useTrialBadge } from './useTrialBadge';
@@ -16,11 +16,15 @@ const formatCountdown = seconds => {
16
16
  export const TrialBadge = _ref => {
17
17
  let {
18
18
  className,
19
+ onView,
19
20
  brandColor = FALLBACK_BRAND_COLOR,
20
21
  trialRemainingSec = 0,
21
22
  onSubscribe,
22
23
  onCountdownEnd
23
24
  } = _ref;
25
+ useEffect(() => {
26
+ onView === null || onView === void 0 || onView();
27
+ }, [onView]);
24
28
  const [remainingSec, setRemainingSec] = useState(Math.max(0, Math.floor(trialRemainingSec)));
25
29
  const endedRef = useRef(false);
26
30
  const onCountdownEndRef = useRef(onCountdownEnd);
@@ -77,15 +81,19 @@ export const TrialBadge = _ref => {
77
81
  backgroundColor: brandColor
78
82
  },
79
83
  onClick: () => {
80
- ty.event({
81
- eventId: 'thing_qbwpX5zfbKOSjD4jz1tPv61rqrhGX7iV',
82
- event: {
83
- business_type: 'ipc',
84
- scene_type: 'smart_image_quality',
85
- feat_type: 'go_pay',
86
- biz: 'preview_mini'
87
- }
88
- });
84
+ try {
85
+ ty.event({
86
+ eventId: 'thing_qbwpX5zfbKOSjD4jz1tPv61rqrhGX7iV',
87
+ event: {
88
+ business_type: 'ipc',
89
+ scene_type: 'smart_image_quality',
90
+ feat_type: 'go_pay',
91
+ biz: 'preview_mini'
92
+ }
93
+ });
94
+ } catch (error) {
95
+ console.warn('[IPC] trial subscription tracking failed:', error);
96
+ }
89
97
  onSubscribe === null || onSubscribe === void 0 || onSubscribe();
90
98
  }
91
99
  }, /*#__PURE__*/React.createElement(Text, {
@@ -1,8 +1,9 @@
1
- /// <reference types="react" />
1
+ import type { MutableRefObject } from 'react';
2
2
  import type { EventInstance } from '../../interface';
3
- export declare const useTrialBadge: (event: EventInstance, devId: string, trialRemainingSec: number) => {
3
+ export declare const useTrialBadge: (event: EventInstance, devId: string, trialRemainingSec: number, viewedRef?: MutableRefObject<boolean>) => {
4
4
  showTrialBadge: boolean;
5
5
  setShowTrialBadge: import("react").Dispatch<import("react").SetStateAction<boolean>>;
6
+ handleTrialView: () => void;
6
7
  handleTrialSubscribe: () => Promise<void>;
7
8
  handleCountdownEnd: () => Promise<void>;
8
9
  };
@@ -3,7 +3,10 @@ import { setTrailFinish } from '../../utils/ttt';
3
3
  import { gotoSecurityCloudService2 } from '../../utils';
4
4
  import { trialCountdownEnd } from '../../ui/constant';
5
5
  import Strings from '../../i18n';
6
- export const useTrialBadge = (event, devId, trialRemainingSec) => {
6
+ import { createEntryTracking, reportEntryClick, reportEntryView } from '../../utils/fullLinkTracking';
7
+ export const useTrialBadge = (event, devId, trialRemainingSec, viewedRef) => {
8
+ const localViewedRef = useRef(false);
9
+ const pageViewedRef = viewedRef || localViewedRef;
7
10
  const [showTrialBadge, setShowTrialBadge] = useState(false);
8
11
  const prevTrialSecRef = useRef(trialRemainingSec);
9
12
  useEffect(() => {
@@ -14,9 +17,16 @@ export const useTrialBadge = (event, devId, trialRemainingSec) => {
14
17
  }
15
18
  prevTrialSecRef.current = trialRemainingSec;
16
19
  }, [trialRemainingSec]);
20
+ const handleTrialView = useCallback(() => {
21
+ if (pageViewedRef.current) return;
22
+ pageViewedRef.current = true;
23
+ reportEntryView(devId, createEntryTracking());
24
+ }, [devId, pageViewedRef]);
17
25
  const handleTrialSubscribe = useCallback(async () => {
18
26
  try {
19
- await gotoSecurityCloudService2(devId);
27
+ const tracking = createEntryTracking();
28
+ await reportEntryClick(devId, tracking);
29
+ await gotoSecurityCloudService2(devId, tracking);
20
30
  } catch (error) {
21
31
  ty.showToast({
22
32
  title: Strings.getLang('ipc_player_fetch_error'),
@@ -51,6 +61,7 @@ export const useTrialBadge = (event, devId, trialRemainingSec) => {
51
61
  return {
52
62
  showTrialBadge,
53
63
  setShowTrialBadge,
64
+ handleTrialView,
54
65
  handleTrialSubscribe,
55
66
  handleCountdownEnd
56
67
  };
@@ -77,7 +77,6 @@ export const TryExperience = props => {
77
77
  }
78
78
  }, [buttonState]);
79
79
  const onTryExperience = useCallback(async () => {
80
- console.log('res===onTryExperience', lockRef.current, isLowPhone);
81
80
  if (lockRef.current) return;
82
81
  if (isLowPhone) {
83
82
  showToast({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ray-js/ipc-player-integration",
3
- "version": "0.0.63",
3
+ "version": "0.0.65-beta.0",
4
4
  "description": "IPC 融合播放器",
5
5
  "main": "lib/index",
6
6
  "files": [
@@ -37,7 +37,8 @@
37
37
  "dependencies": {
38
38
  "@ray-js/direction-control": "^0.0.8",
39
39
  "@ray-js/ipc-ptz-zoom": "^0.0.3",
40
- "@ray-js/ray-ipc-player": "^2.1.7",
40
+ "@ray-js/ray-ipc-player": "2.1.7-beta.0",
41
+ "@ray-js/panel-sdk": "^1.13.1",
41
42
  "@ray-js/ray-ipc-utils": "^1.1.16",
42
43
  "@ray-js/svg": "0.2.0",
43
44
  "clsx": "^1.2.1",