@ray-js/ipc-player-integration 0.0.70 → 0.0.71-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 (120) hide show
  1. package/README.md +6 -0
  2. package/lib/ctx/ctx.js +12 -17
  3. package/lib/ctx/ctx.test.js +54 -19
  4. package/lib/ctx/intercom.test.d.ts +1 -0
  5. package/lib/ctx/intercom.test.js +85 -0
  6. package/lib/index.d.ts +4 -0
  7. package/lib/index.js +3 -1
  8. package/lib/renderer/capabilities.d.ts +8 -0
  9. package/lib/renderer/capabilities.js +19 -0
  10. package/lib/renderer/context.d.ts +5 -0
  11. package/lib/renderer/context.js +6 -0
  12. package/lib/renderer/directionControl.d.ts +6 -0
  13. package/lib/renderer/directionControl.js +3 -0
  14. package/lib/renderer/font-manifest.json +9 -0
  15. package/lib/renderer/font.less +5 -0
  16. package/lib/renderer/glyphs.d.ts +1 -0
  17. package/lib/renderer/glyphs.js +256 -0
  18. package/lib/renderer/index.module.less +48 -0
  19. package/lib/renderer/overlay.d.ts +6 -0
  20. package/lib/renderer/overlay.js +18 -0
  21. package/lib/renderer/ptzZoom.d.ts +6 -0
  22. package/lib/renderer/ptzZoom.js +3 -0
  23. package/lib/renderer/text.d.ts +4 -0
  24. package/lib/renderer/text.js +32 -0
  25. package/lib/renderer/text.module.less +4 -0
  26. package/lib/renderer/viewport.d.ts +7 -0
  27. package/lib/renderer/viewport.js +24 -0
  28. package/lib/res/lynx-signal/index.d.ts +1 -0
  29. package/lib/res/lynx-signal/index.js +22 -0
  30. package/lib/res/lynx-signal/signalFour0.png +0 -0
  31. package/lib/res/lynx-signal/signalFour1.png +0 -0
  32. package/lib/res/lynx-signal/signalFour2.png +0 -0
  33. package/lib/res/lynx-signal/signalFour3.png +0 -0
  34. package/lib/res/lynx-signal/signalFour4.png +0 -0
  35. package/lib/res/lynx-signal/signalThree0.png +0 -0
  36. package/lib/res/lynx-signal/signalThree1.png +0 -0
  37. package/lib/res/lynx-signal/signalThree2.png +0 -0
  38. package/lib/res/lynx-signal/signalThree3.png +0 -0
  39. package/lib/res/player-charging.png +0 -0
  40. package/lib/res/player-more-arrow.png +0 -0
  41. package/lib/res/player-solar.png +0 -0
  42. package/lib/ui/bottomLeftContent.js +121 -53
  43. package/lib/ui/bottomRightContent.js +10 -5
  44. package/lib/ui/scrollHintArrow.d.ts +23 -0
  45. package/lib/ui/scrollHintArrow.js +83 -0
  46. package/lib/ui/topLeftContent.js +4 -2
  47. package/lib/ui/topRightContent.js +4 -2
  48. package/lib/ui/ui.d.ts +5 -0
  49. package/lib/ui/ui.js +46 -23
  50. package/lib/widgets/battery/battery.js +7 -5
  51. package/lib/widgets/battery/batteryFull.js +7 -5
  52. package/lib/widgets/battery/statusIcon.d.ts +6 -0
  53. package/lib/widgets/battery/statusIcon.js +36 -0
  54. package/lib/widgets/battery/statusIcon.less +24 -0
  55. package/lib/widgets/captureResult/captureResult.js +2 -1
  56. package/lib/widgets/captureToast/captureToast.d.ts +10 -0
  57. package/lib/widgets/captureToast/captureToast.js +58 -0
  58. package/lib/widgets/floodlight/floodlight.js +2 -1
  59. package/lib/widgets/flowLowTip/flowLowTip.js +2 -1
  60. package/lib/widgets/fullScreen/fullScreen.js +2 -1
  61. package/lib/widgets/fullScreen/fullTravelRouteControl.d.ts +1 -1
  62. package/lib/widgets/fullScreen/fullTravelRouteControl.js +1 -1
  63. package/lib/widgets/fullScreen/verticalScreen.js +2 -1
  64. package/lib/widgets/moveInteractiveControl/controlButton.js +2 -1
  65. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.js +16 -5
  66. package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.less +24 -4
  67. package/lib/widgets/multiCamera/landscapeTip.js +8 -2
  68. package/lib/widgets/multiCamera/moveablePtzControl.js +5 -3
  69. package/lib/widgets/multiCamera/multiPtz.js +2 -1
  70. package/lib/widgets/multiCamera/ptzMoveableTip.js +8 -2
  71. package/lib/widgets/multiCamera/switchLayout.js +2 -1
  72. package/lib/widgets/multiCamera/tileMultiPtz.js +2 -1
  73. package/lib/widgets/multiCamera/tileSwitchLayout.js +2 -1
  74. package/lib/widgets/multiCamera/tileTip.js +8 -2
  75. package/lib/widgets/muted/muted.js +2 -1
  76. package/lib/widgets/muted/muted.test.js +66 -52
  77. package/lib/widgets/ptz/ptz.js +2 -1
  78. package/lib/widgets/ptz/ptzControl.js +4 -3
  79. package/lib/widgets/ptzControlTip/ptzControlTip.js +9 -4
  80. package/lib/widgets/ptzControlTip/ptzControlTip.less +6 -0
  81. package/lib/widgets/realTimeMagnification/realTimeMagnification.js +2 -1
  82. package/lib/widgets/recordVideo/recordVideo.js +47 -169
  83. package/lib/widgets/recordVideo/recordVideo.lifecycle.test.js +4 -2
  84. package/lib/widgets/recordVideo/recordVideo.test.js +169 -2
  85. package/lib/widgets/recordVideo/recordVideoTimer.d.ts +3 -0
  86. package/lib/widgets/recordVideo/recordVideoTimer.js +26 -0
  87. package/lib/widgets/resolution/fullResolutionControl.js +29 -19
  88. package/lib/widgets/resolution/resolution.js +3 -2
  89. package/lib/widgets/screenshot/screenshot.js +48 -122
  90. package/lib/widgets/screenshot/screenshot.permissions.test.d.ts +1 -0
  91. package/lib/widgets/screenshot/screenshot.permissions.test.js +137 -0
  92. package/lib/widgets/screenshot/screenshot.test.js +108 -113
  93. package/lib/widgets/signal4G/signal4G.js +4 -1
  94. package/lib/widgets/siren/siren.js +2 -1
  95. package/lib/widgets/tempHumidity/tempHumidity.js +2 -1
  96. package/lib/widgets/toggleVerticalFull/toggleVerticalFull.js +2 -1
  97. package/lib/widgets/trialBadge/index.js +8 -3
  98. package/lib/widgets/trialBadge/index.less +24 -0
  99. package/lib/widgets/tryExperience/tryExperience.js +2 -1
  100. package/lib/widgets/videoBitKBP/videoBitKBP.js +2 -1
  101. package/lib/widgets/voiceIntercom/voiceIntercom.js +57 -81
  102. package/lib/widgets/voiceIntercom/voiceIntercom.less +35 -0
  103. package/lib/widgets/voiceIntercom/voiceIntercom.test.d.ts +1 -0
  104. package/lib/widgets/voiceIntercom/voiceIntercom.test.js +135 -0
  105. package/lib/widgets/zoomTurntable/lynxDockLayout.d.ts +6 -0
  106. package/lib/widgets/zoomTurntable/lynxDockLayout.js +30 -0
  107. package/lib/widgets/zoomTurntable/turntable/index.d.ts +5 -7
  108. package/lib/widgets/zoomTurntable/turntable/index.js +3 -1
  109. package/lib/widgets/zoomTurntable/turntable/lynx.d.ts +5 -0
  110. package/lib/widgets/zoomTurntable/turntable/lynx.js +273 -0
  111. package/lib/widgets/zoomTurntable/turntable/lynx.less +9 -0
  112. package/lib/widgets/zoomTurntable/turntable/lynxModel.d.ts +37 -0
  113. package/lib/widgets/zoomTurntable/turntable/lynxModel.js +122 -0
  114. package/lib/widgets/zoomTurntable/turntable/lynxPaint.d.ts +3 -0
  115. package/lib/widgets/zoomTurntable/turntable/lynxPaint.js +36 -0
  116. package/lib/widgets/zoomTurntable/zoomTurntableDock.d.ts +5 -3
  117. package/lib/widgets/zoomTurntable/zoomTurntableDock.js +4 -4
  118. package/lib/widgets/zoomTurntable/zoomTurntableEntry.js +32 -19
  119. package/lib/widgets/zoomTurntable/zoomTurntableTip.js +17 -3
  120. package/package.json +15 -7
package/lib/ui/ui.js CHANGED
@@ -6,12 +6,17 @@ import "core-js/modules/esnext.iterator.find.js";
6
6
  import "core-js/modules/esnext.iterator.map.js";
7
7
  import "core-js/modules/esnext.iterator.some.js";
8
8
  import React, { useContext, useState, useRef, useMemo, useEffect, useImperativeHandle } from 'react';
9
- import { View, CoverView, getSystemInfoSync, usePageEvent, setNavigationBarBack, setPageOrientation, getCurrentPages } from '@ray-js/ray';
9
+ import { View, getSystemInfoSync, usePageEvent, setNavigationBarBack, setPageOrientation, getCurrentPages } from '@ray-js/ray';
10
10
  import { unstable_batchedUpdates as batchedUpdates } from '@ray-core/ray';
11
11
  import clsx from 'clsx';
12
12
  import IPCPlayer from '@ray-js/ray-ipc-player';
13
13
  import { ipcTTTOperatorLog } from '@ray-js/ray-ipc-utils';
14
14
  import { ClarityType } from '@ray-js/ray-ipc-utils/lib/interface';
15
+ import { getPlayerOverlayHost } from '../renderer/overlay';
16
+ import { PlayerRenderModeContext, PlayerControlVisibilityContext } from '../renderer/context';
17
+ import lynxStyles from '../renderer/index.module.less';
18
+ import { getPlayerViewport } from '../renderer/viewport';
19
+ import { LynxPlayerAdaptersContext } from '../renderer/capabilities';
15
20
  import { PlayState, PlayerStreamStatus, MultiCameraScreenMode } from '../interface';
16
21
  import { useCtx } from '../ctx/ctx.composition';
17
22
  import { useStore, updateAtom } from '../ctx/store';
@@ -102,6 +107,7 @@ const SCALE_MATCH_EPS = 0.01;
102
107
  const BOTTOM_RIGHT_SAFE_GAP = 4;
103
108
  export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
104
109
  const {
110
+ renderMode = 'webview',
105
111
  className,
106
112
  devId,
107
113
  style,
@@ -126,6 +132,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
126
132
  previewEnabled = undefined,
127
133
  onPreviewEnabledChange
128
134
  } = props;
135
+ const OverlayView = getPlayerOverlayHost(renderMode);
129
136
  const {
130
137
  event
131
138
  } = useContext(UIEventContext);
@@ -1105,23 +1112,33 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1105
1112
  return false;
1106
1113
  });
1107
1114
  const playerContainerHeight = screenType === 'vertical' ? (style === null || style === void 0 ? void 0 : style.height) || '100%' : '100vh';
1108
- const bottomHideState = isVerticalFullLayout && screenType === 'vertical' ? false : componentHideState;
1109
- return /*#__PURE__*/React.createElement(UIEventContext.Provider, {
1115
+ const isVerticalFullMode = isVerticalFullLayout && screenType === 'vertical';
1116
+ const bottomHideState = isVerticalFullMode ? false : componentHideState;
1117
+ const lynxVerticalFull = renderMode === 'lynx' && isVerticalFullMode;
1118
+ const viewport = getPlayerViewport(renderMode, isVerticalFullMode, playerContainerHeight);
1119
+ return /*#__PURE__*/React.createElement(PlayerRenderModeContext.Provider, {
1120
+ value: renderMode
1121
+ }, /*#__PURE__*/React.createElement(LynxPlayerAdaptersContext.Provider, {
1122
+ value: props.lynxAdapters || {}
1123
+ }, /*#__PURE__*/React.createElement(UIEventContext.Provider, {
1110
1124
  value: {
1111
1125
  event: eventRef.current,
1112
1126
  componentHideState,
1113
1127
  refreshElement
1114
1128
  }
1115
1129
  }, /*#__PURE__*/React.createElement(View, {
1116
- className: clsx('ipc-player-content', isSmallScreen && 'ipc-player-content-small-screen', className),
1130
+ className: clsx('ipc-player-content', renderMode === 'lynx' && lynxStyles.root, isSmallScreen && 'ipc-player-content-small-screen', className),
1117
1131
  style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultCSSVariable), CSSVariable), style), {}, {
1118
1132
  height: playerContainerHeight
1119
- })
1133
+ }, lynxVerticalFull ? {
1134
+ backgroundColor: '#000'
1135
+ } : {})
1120
1136
  }, /*#__PURE__*/React.createElement(View, {
1121
- style: {
1122
- height: isVerticalFullLayout && screenType === 'vertical' ? `calc(${playerContainerHeight} - 48px)` : playerContainerHeight
1123
- }
1124
- }, /*#__PURE__*/React.createElement(IPCPlayer, {
1137
+ className: lynxVerticalFull ? lynxStyles.verticalViewport : undefined,
1138
+ style: viewport.style
1139
+ }, /*#__PURE__*/React.createElement(IPCPlayer, _extends({}, renderMode === 'lynx' ? {
1140
+ renderMode: 'lynx'
1141
+ } : {}, {
1125
1142
  defaultMute: mute,
1126
1143
  devId: devId,
1127
1144
  onlineStatus: deviceOnline,
@@ -1143,7 +1160,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1143
1160
  onCameraNotifyWeakNetwork: data => {
1144
1161
  console.log(`onCameraNotifyWeakNetwork: ${JSON.stringify(data)}`);
1145
1162
  },
1146
- clarity: decodeClarityDic[resolution],
1163
+ clarity: decodeClarityDic[String(resolution).toUpperCase()] || decodeClarityDic.HD,
1147
1164
  onZoomChange: onZoomChange
1148
1165
  // objectFit={
1149
1166
  // screenType === 'vertical'
@@ -1157,7 +1174,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1157
1174
  // scaleMultiple={0}
1158
1175
  ,
1159
1176
  awakeStatus: awakeStatus,
1160
- objectFit: "fillCrop",
1177
+ objectFit: viewport.objectFit,
1161
1178
  scaleMultiple: scaleMultiple
1162
1179
  // 安卓横屏问题
1163
1180
  // ptzControllable={screenType === 'vertical'}
@@ -1237,9 +1254,11 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1237
1254
  limitFlow: limitFlow,
1238
1255
  autoWakeUp: autoWakeUp,
1239
1256
  extend: _objectSpread(_objectSpread({
1240
- backgroundColor: '#262626'
1257
+ backgroundColor: viewport.backgroundColor
1241
1258
  }, instance.multiCameraCtx.extendProps), extend)
1242
- })), showTopContent && /*#__PURE__*/React.createElement(View, {
1259
+ }))), /*#__PURE__*/React.createElement(PlayerControlVisibilityContext.Provider, {
1260
+ value: !componentHideState && !refreshElement
1261
+ }, showTopContent && /*#__PURE__*/React.createElement(View, {
1243
1262
  className: clsx('ipc-player-top-content', {
1244
1263
  'ipc-player-top-content-hide': componentHideState,
1245
1264
  'ipc-player-top-content-show': !componentHideState
@@ -1253,18 +1272,19 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1253
1272
  ctx: instance
1254
1273
  }, renderTopRightContent, !hasVisibleBitrateWidget && /*#__PURE__*/React.createElement(AutoClarityOnly, {
1255
1274
  instance: instance
1256
- })))), /*#__PURE__*/React.createElement(StandaloneAutoClarity, {
1257
- instance: instance,
1258
- show: !showTopContent || componentHideState || !playerReady
1259
- }), /*#__PURE__*/React.createElement(View, {
1275
+ })))), /*#__PURE__*/React.createElement(View, {
1260
1276
  className: clsx('ipc-player-bottom-content', {
1261
1277
  'ipc-player-bottom-content-hide': bottomHideState,
1262
1278
  'ipc-player-bottom-content-show': !bottomHideState,
1263
- 'ipc-player-bottom-content-full': isVerticalFullLayout && screenType === 'vertical'
1279
+ 'ipc-player-bottom-content-full': isVerticalFullMode
1264
1280
  }),
1265
- style: {
1281
+ style: _objectSpread({
1266
1282
  height: screenType === 'vertical' ? '48px' : '72px'
1267
- }
1283
+ }, lynxVerticalFull ? {
1284
+ paddingBottom: 0
1285
+ } : {})
1286
+ }, /*#__PURE__*/React.createElement(PlayerControlVisibilityContext.Provider, {
1287
+ value: !bottomHideState && !refreshElement
1268
1288
  }, /*#__PURE__*/React.createElement(UIEventContext.Provider, {
1269
1289
  value: {
1270
1290
  event: eventRef.current,
@@ -1278,7 +1298,10 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1278
1298
  ctx: instance,
1279
1299
  width: bottomRightStyleWidth,
1280
1300
  onWidthChange: handleBottomRightWidthChange
1281
- }, renderBottomRightContent))), (() => {
1301
+ }, renderBottomRightContent))))), /*#__PURE__*/React.createElement(StandaloneAutoClarity, {
1302
+ instance: instance,
1303
+ show: !showTopContent || componentHideState || !playerReady
1304
+ }), (() => {
1282
1305
  if (!absoluteContent || !(absoluteContent !== null && absoluteContent !== void 0 && absoluteContent.length)) return null;
1283
1306
  return absoluteContent.map(item => {
1284
1307
  if (!shouldRenderContent(item, {
@@ -1293,7 +1316,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1293
1316
  if (item.absoluteNoCoverView) {
1294
1317
  return /*#__PURE__*/React.createElement(item.content, contentProps);
1295
1318
  }
1296
- return /*#__PURE__*/React.createElement(CoverView, {
1319
+ return /*#__PURE__*/React.createElement(OverlayView, {
1297
1320
  key: item.id,
1298
1321
  style: _objectSpread({
1299
1322
  position: 'absolute'
@@ -1304,5 +1327,5 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
1304
1327
  className: clsx('absolute-item-container')
1305
1328
  })));
1306
1329
  });
1307
- })()));
1330
+ })()))));
1308
1331
  });
@@ -1,8 +1,10 @@
1
1
  import React, { useMemo } 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 { useStore } from '../../ctx/store';
5
6
  import { PowerMode } from '../../ports.output';
7
+ import { BatteryStatusIcon } from './statusIcon';
6
8
  import './battery.less';
7
9
  export const createBattery = _ref => {
8
10
  let {
@@ -44,8 +46,8 @@ export const createBattery = _ref => {
44
46
  className: clsx(className)
45
47
  }, /*#__PURE__*/React.createElement(View, {
46
48
  className: "ipc-player-plugin-battery"
47
- }, !isSolar && batteryCharging ? /*#__PURE__*/React.createElement(View, {
48
- className: "icon-panel icon-panel-charging ipc-player-plugin-battery-charging"
49
+ }, !isSolar && batteryCharging ? /*#__PURE__*/React.createElement(BatteryStatusIcon, {
50
+ kind: "charging"
49
51
  }) : /*#__PURE__*/React.createElement(View, {
50
52
  className: "ipc-player-plugin-battery-border"
51
53
  }, /*#__PURE__*/React.createElement(View, {
@@ -58,8 +60,8 @@ export const createBattery = _ref => {
58
60
  backgroundColor: batteryColor
59
61
  },
60
62
  className: "ipc-player-plugin-battery-value-value"
61
- })), isSolar && /*#__PURE__*/React.createElement(View, {
62
- className: "icon-panel icon-panel-solar ipc-player-plugin-battery-solar"
63
+ })), isSolar && /*#__PURE__*/React.createElement(BatteryStatusIcon, {
64
+ kind: "solar"
63
65
  })), /*#__PURE__*/React.createElement(Text, {
64
66
  className: "ipc-player-plugin-battery-text"
65
67
  }, batteryValue, "%")));
@@ -1,8 +1,10 @@
1
1
  import React, { useMemo } 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 { useStore } from '../../ctx/store';
5
6
  import { PowerMode } from '../../ports.output';
7
+ import { BatteryStatusIcon } from './statusIcon';
6
8
  import './battery.less';
7
9
  export const createBattery = _ref => {
8
10
  let {
@@ -44,8 +46,8 @@ export const createBattery = _ref => {
44
46
  className: clsx(className)
45
47
  }, /*#__PURE__*/React.createElement(View, {
46
48
  className: "ipc-player-plugin-battery"
47
- }, !isSolar && batteryCharging ? /*#__PURE__*/React.createElement(View, {
48
- className: "icon-panel icon-panel-charging ipc-player-plugin-battery-charging"
49
+ }, !isSolar && batteryCharging ? /*#__PURE__*/React.createElement(BatteryStatusIcon, {
50
+ kind: "charging"
49
51
  }) : /*#__PURE__*/React.createElement(View, {
50
52
  className: "ipc-player-plugin-battery-border"
51
53
  }, /*#__PURE__*/React.createElement(View, {
@@ -58,8 +60,8 @@ export const createBattery = _ref => {
58
60
  backgroundColor: batteryColor
59
61
  },
60
62
  className: "ipc-player-plugin-battery-value-value"
61
- })), isSolar && /*#__PURE__*/React.createElement(View, {
62
- className: "icon-panel icon-panel-solar ipc-player-plugin-battery-solar"
63
+ })), isSolar && /*#__PURE__*/React.createElement(BatteryStatusIcon, {
64
+ kind: "solar"
63
65
  })), /*#__PURE__*/React.createElement(Text, {
64
66
  className: "ipc-player-plugin-battery-text"
65
67
  }, batteryValue, "%")));
@@ -0,0 +1,6 @@
1
+ import React from 'react';
2
+ import './statusIcon.less';
3
+ /** Android needs a real image; geometry is normalized from the stylesheet. */
4
+ export declare function BatteryStatusIcon({ kind }: {
5
+ kind: 'charging' | 'solar';
6
+ }): React.JSX.Element;
@@ -0,0 +1,36 @@
1
+ import React, { useMemo } from 'react';
2
+ import { Image, View, getSystemInfoSync } from '@ray-js/ray';
3
+ import { usePlayerRenderMode } from '../../renderer/context';
4
+ import chargingImage from '../../res/player-charging.png';
5
+ import solarImage from '../../res/player-solar.png';
6
+ import './statusIcon.less';
7
+
8
+ /** Android needs a real image; geometry is normalized from the stylesheet. */
9
+ export function BatteryStatusIcon(_ref) {
10
+ let {
11
+ kind
12
+ } = _ref;
13
+ const renderMode = usePlayerRenderMode();
14
+ const platform = useMemo(() => {
15
+ var _getSystemInfoSync;
16
+ return renderMode === 'lynx' ? (_getSystemInfoSync = getSystemInfoSync()) === null || _getSystemInfoSync === void 0 ? void 0 : _getSystemInfoSync.platform : '';
17
+ }, [renderMode]);
18
+ const className = `icon-panel icon-panel-${kind} ipc-player-plugin-battery-${kind}`;
19
+ if (renderMode !== 'lynx' || platform !== 'android') return /*#__PURE__*/React.createElement(View, {
20
+ className: className
21
+ });
22
+ if (kind === 'solar') {
23
+ return /*#__PURE__*/React.createElement(Image, {
24
+ className: `${className} ipc-player-plugin-battery-solar-image`,
25
+ src: solarImage,
26
+ mode: "aspectFit"
27
+ });
28
+ }
29
+ return /*#__PURE__*/React.createElement(View, {
30
+ className: `${className} ipc-player-plugin-battery-charging-image-wrap`
31
+ }, /*#__PURE__*/React.createElement(Image, {
32
+ className: "ipc-player-plugin-battery-charging-image",
33
+ src: chargingImage,
34
+ mode: "scaleToFill"
35
+ }));
36
+ }
@@ -0,0 +1,24 @@
1
+ .ipc-player-plugin-battery-charging-image-wrap {
2
+ position: relative;
3
+ width: calc(16px * var(--ipc-player-size-scale, 1));
4
+ height: calc(16px * var(--ipc-player-size-scale, 1));
5
+ flex-shrink: 0;
6
+ overflow: hidden;
7
+ background-image: none;
8
+ }
9
+
10
+ .ipc-player-plugin-battery-charging-image {
11
+ position: absolute;
12
+ left: calc(-1px * var(--ipc-player-size-scale, 1));
13
+ top: 0;
14
+ width: calc(18px * var(--ipc-player-size-scale, 1));
15
+ height: calc(19px * var(--ipc-player-size-scale, 1));
16
+ pointer-events: none;
17
+ }
18
+
19
+ .ipc-player-plugin-battery-solar-image {
20
+ width: calc(8px * var(--ipc-player-size-scale, 1));
21
+ height: calc(8px * var(--ipc-player-size-scale, 1));
22
+ background-image: none;
23
+ pointer-events: none;
24
+ }
@@ -1,6 +1,7 @@
1
1
  import React from 'react';
2
- import { Image, Text, View } from '@ray-js/ray';
2
+ import { Image, View } from '@ray-js/ray';
3
3
  import clsx from 'clsx';
4
+ import { PlayerText as Text } from '../../renderer/text';
4
5
  import Strings from '../../i18n';
5
6
  import './captureResult.less';
6
7
  const BACKDROP_LAYERS = ['back', 'middle'];
@@ -0,0 +1,10 @@
1
+ import React from 'react';
2
+ import { ComponentConfigProps } from '../../interface';
3
+ type Props = Pick<ComponentConfigProps, 'screenType' | 'brandColor' | 'devId' | 'deleteContent'> & {
4
+ kind: 'screenshot' | 'record';
5
+ imageUrl: string;
6
+ captureId: number;
7
+ count?: number;
8
+ };
9
+ declare const CaptureToast: ({ kind, imageUrl, captureId, count, screenType, brandColor, devId, deleteContent, }: Props) => React.JSX.Element;
10
+ export default CaptureToast;
@@ -0,0 +1,58 @@
1
+ import React, { useEffect } from 'react';
2
+ import { useMemoizedFn } from 'ahooks';
3
+ import { goToIpcPageNativeRoute } from '@ray-js/ray-ipc-utils';
4
+ import { useStore } from '../../ctx/store';
5
+ import { usePlayerOverlayHost } from '../../renderer/overlay';
6
+ import { CaptureResultToast } from '../captureResult/captureResult';
7
+ // This overlay belongs to the player, independently of the remounting toolbar.
8
+ const CaptureToast = _ref => {
9
+ let {
10
+ kind,
11
+ imageUrl,
12
+ captureId,
13
+ count,
14
+ screenType,
15
+ brandColor,
16
+ devId,
17
+ deleteContent
18
+ } = _ref;
19
+ const {
20
+ screenType: screen,
21
+ brandColor: color
22
+ } = useStore({
23
+ screenType,
24
+ brandColor
25
+ });
26
+ const OverlayView = usePlayerOverlayHost();
27
+ const isRecord = kind === 'record';
28
+ const id = isRecord ? 'record_video_SUCCESS_toast_id' : 'plugin-screenshot-toast';
29
+ const prefix = isRecord ? 'ipc-player-plugin-record-success' : 'ipc-player-plugin-screenshot';
30
+ const close = useMemoizedFn(() => deleteContent('absolute', id));
31
+ useEffect(() => {
32
+ const timer = setTimeout(close, 5000);
33
+ return () => clearTimeout(timer);
34
+ }, [captureId, close]);
35
+ const vertical = screen === 'vertical';
36
+ return /*#__PURE__*/React.createElement(OverlayView, {
37
+ className: `${prefix}-toast-wrap`,
38
+ style: {
39
+ position: 'absolute',
40
+ top: vertical ? '12px' : '60px',
41
+ left: vertical ? '16px' : '50%',
42
+ right: vertical ? '16px' : 'auto',
43
+ display: 'flex',
44
+ width: vertical ? 'auto' : '400px',
45
+ marginLeft: vertical ? '0' : '-200px'
46
+ }
47
+ }, /*#__PURE__*/React.createElement(CaptureResultToast, {
48
+ kind: kind,
49
+ count: count,
50
+ brandColor: color,
51
+ thumbnailPath: imageUrl,
52
+ onCheck: () => {
53
+ close();
54
+ goToIpcPageNativeRoute('ipc_album_panel', devId);
55
+ }
56
+ }));
57
+ };
58
+ export default CaptureToast;
@@ -1,6 +1,7 @@
1
- import { View, Text } from '@ray-js/ray';
1
+ import { View } from '@ray-js/ray';
2
2
  import React, { useContext } from 'react';
3
3
  import clsx from 'clsx';
4
+ import { PlayerText as Text } from '../../renderer/text';
4
5
  import { useDpState } from '../../hooks';
5
6
  import { useStore } from '../../ctx/store';
6
7
  import { UIEventContext } from '../../ui/context';
@@ -1,8 +1,9 @@
1
- import { View, Text } from '@ray-js/ray';
1
+ import { View } from '@ray-js/ray';
2
2
  import clsx from 'clsx';
3
3
  import React, { useEffect, useRef, useState } from 'react';
4
4
  import { getServiceUrl } from '@ray-js/ray-ipc-utils';
5
5
  import { useMemoizedFn } from 'ahooks';
6
+ import { PlayerText as Text } from '../../renderer/text';
6
7
  import Strings from '../../i18n';
7
8
  import { useStore } from '../../ctx/store';
8
9
  import { showFlowLowTipId } from '../../ui/constant';
@@ -1,8 +1,9 @@
1
1
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import React, { useContext, useEffect } from 'react';
3
- import { View, setPageOrientation, Text, hideMenuButton, showMenuButton, showStatusBar, hideStatusBar, setNavigationBarBack } from '@ray-js/ray';
3
+ import { View, setPageOrientation, hideMenuButton, showMenuButton, showStatusBar, hideStatusBar, setNavigationBarBack } from '@ray-js/ray';
4
4
  import clsx from 'clsx';
5
5
  import { unstable_batchedUpdates as batchedUpdates } from '@ray-core/ray';
6
+ import { PlayerText as Text } from '../../renderer/text';
6
7
  import { UIEventContext } from '../../ui/context';
7
8
  import { showAllComponent, voiceIntercomId, verticalScreenId, fullTravelRouteControlId, ptzControlId, fullResolutionId, fullSmallIntercomId, pauseTimeToHideAllComponent, widgetLabs, widgetClick } from '../../ui/constant';
8
9
  import { useStore } from '../../ctx/store';
@@ -2,7 +2,7 @@
2
2
  * 全屏状态下要添加的摄像机行进路线控件
3
3
  */
4
4
  import React from 'react';
5
- import RectDirectionControl from '@ray-js/direction-control';
5
+ import RectDirectionControl from '../../renderer/directionControl';
6
6
  import type { ComponentConfigProps } from '../../interface';
7
7
  type RectDirectionControlProps = React.ComponentProps<typeof RectDirectionControl>;
8
8
  export type FullTravelRouteControlProps = ComponentConfigProps & {
@@ -6,8 +6,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
6
6
  import React, { useEffect, useContext, useState, useRef } from 'react';
7
7
  import { View } from '@ray-js/ray';
8
8
  import clsx from 'clsx';
9
- import RectDirectionControl from '@ray-js/direction-control';
10
9
  import { useMemoizedFn } from 'ahooks';
10
+ import RectDirectionControl from '../../renderer/directionControl';
11
11
  import { UIEventContext } from '../../ui/context';
12
12
  import { useDpState } from '../../hooks';
13
13
  import { useComponentHideState } from '../../ui/hooks';
@@ -1,6 +1,7 @@
1
1
  import React 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 './verticalScreen.less';
5
6
  const NILL = () => null;
6
7
  export function VerticalScreen(_ref) {
@@ -1,6 +1,7 @@
1
1
  import React, { useContext } 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 { useStore } from '../../ctx/store';
5
6
  import { UIEventContext } from '../../ui/context';
6
7
  import { hideAllComponent, widgetLabs, widgetClick } from '../../ui/constant';
@@ -2,8 +2,11 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
2
  import "core-js/modules/esnext.iterator.constructor.js";
3
3
  import "core-js/modules/esnext.iterator.map.js";
4
4
  import React from 'react';
5
- import { View, ScrollView, CoverView } from '@ray-js/ray';
5
+ import { View, ScrollView } from '@ray-js/ray';
6
6
  import clsx from 'clsx';
7
+ import { usePlayerOverlayHost } from '../../renderer/overlay';
8
+ import { usePlayerRenderMode } from '../../renderer/context';
9
+ import { PlayerText } from '../../renderer/text';
7
10
  import './moveInteractiveControlUI.less';
8
11
  const defaultMenu = [{
9
12
  key: '0',
@@ -62,6 +65,8 @@ const defaultCSSVariable = {
62
65
  '--activeColor': '#FF592A'
63
66
  };
64
67
  export function MoveInterActiveControlUI(props) {
68
+ const OverlayView = usePlayerOverlayHost();
69
+ const isLynx = usePlayerRenderMode() === 'lynx';
65
70
  const {
66
71
  contentClsName,
67
72
  wrapClsName,
@@ -75,18 +80,22 @@ export function MoveInterActiveControlUI(props) {
75
80
  e.origin.stopPropagation();
76
81
  onClick && onClick(item.key);
77
82
  };
78
- const WrapComponent = coverView ? CoverView : View;
83
+ const WrapComponent = coverView ? OverlayView : View;
79
84
  return /*#__PURE__*/React.createElement(WrapComponent
80
85
  // @ts-ignore
81
86
  , {
82
87
  style: _objectSpread({}, CSSVariable),
83
- className: clsx('ipc-player-plugin-active-control-wrap', wrapClsName)
88
+ className: clsx('ipc-player-plugin-active-control-wrap', wrapClsName, {
89
+ 'ipc-player-plugin-active-control-wrap-lynx': isLynx,
90
+ 'ipc-player-plugin-active-control-wrap-webview': !isLynx
91
+ })
84
92
  }, /*#__PURE__*/React.createElement(View, {
85
93
  className: clsx('ipc-player-plugin-active-control-title')
86
94
  }, I18n.t('homeFeatureInteractiveMenuTitle')), /*#__PURE__*/React.createElement(ScrollView, {
87
95
  style: {
88
96
  flex: 1
89
97
  },
98
+ className: isLynx ? 'ipc-player-plugin-active-control-scroll-lynx' : undefined,
90
99
  scrollY: true
91
100
  }, /*#__PURE__*/React.createElement(View, {
92
101
  className: clsx('ipc-player-plugin-active-control', contentClsName)
@@ -98,9 +107,11 @@ export function MoveInterActiveControlUI(props) {
98
107
  })
99
108
  }, /*#__PURE__*/React.createElement(View, {
100
109
  className: clsx('ipc-player-plugin-active-control-item-icon')
101
- }, /*#__PURE__*/React.createElement(View, {
110
+ }, !isLynx && /*#__PURE__*/React.createElement(View, {
102
111
  className: clsx('ipc-player-plugin-active-control-item-icon-mask')
103
- }), /*#__PURE__*/React.createElement(View, {
112
+ }), isLynx ? /*#__PURE__*/React.createElement(PlayerText, {
113
+ className: clsx('icon-panel', item.iconName, 'ipc-player-plugin-interactive-icon')
114
+ }) : /*#__PURE__*/React.createElement(View, {
104
115
  className: clsx('icon-panel', item.iconName, 'ipc-player-plugin-interactive-icon')
105
116
  })), /*#__PURE__*/React.createElement(View, {
106
117
  className: clsx('ipc-player-plugin-active-control-item-title')
@@ -43,8 +43,6 @@
43
43
  }
44
44
  }
45
45
  .ipc-player-plugin-active-control-item-icon {
46
- position: relative;
47
- z-index: 1;
48
46
  width: calc(42px * var(--ipc-player-size-scale, 1));
49
47
  height: calc(42px * var(--ipc-player-size-scale, 1));
50
48
  border-radius: calc(42px * var(--ipc-player-size-scale, 1));
@@ -54,7 +52,6 @@
54
52
  justify-content: center;
55
53
  font-size: calc(16px * var(--ipc-player-size-scale, 1));
56
54
  color: var(--color);
57
- overflow: hidden;
58
55
  .ipc-player-plugin-active-control-item-icon-mask {
59
56
  position: absolute;
60
57
  width: 100%;
@@ -64,6 +61,14 @@
64
61
  opacity: 1;
65
62
  }
66
63
  }
64
+
65
+ .ipc-player-plugin-active-control-wrap-webview {
66
+ .ipc-player-plugin-active-control-item-icon {
67
+ position: relative;
68
+ z-index: 1;
69
+ overflow: hidden;
70
+ }
71
+ }
67
72
  .ipc-player-plugin-active-control-item-title {
68
73
  width: calc(70px * var(--ipc-player-size-scale, 1));
69
74
  white-space: nowrap; /* 防止文本换行 */
@@ -73,4 +78,19 @@
73
78
  }
74
79
  .ipc-player-plugin-interactive-icon {
75
80
  font-size: calc(20px * var(--ipc-player-size-scale, 1));;
76
- }
81
+ }
82
+
83
+ .ipc-player-plugin-active-control-wrap-lynx {
84
+ min-height: 0;
85
+
86
+ .ipc-player-plugin-active-control-scroll-lynx {
87
+ height: 0;
88
+ min-height: 0;
89
+ overflow: hidden;
90
+ }
91
+
92
+ .ipc-player-plugin-active-control-item-icon {
93
+ // The background belongs to the scrolling card, not a separate absolute layer.
94
+ background: var(--iconBgColor);
95
+ }
96
+ }
@@ -1,6 +1,8 @@
1
1
  import React, { useState } from 'react';
2
- import { View, CoverView, Text } from '@ray-js/ray';
2
+ import { View } from '@ray-js/ray';
3
3
  import clsx from 'clsx';
4
+ import { usePlayerOverlayHost, usePlayerOverlayFillStyle } from '../../renderer/overlay';
5
+ import { PlayerText as Text } from '../../renderer/text';
4
6
  import { useStore } from '../../ctx/store';
5
7
  import { landscapeTipId } from '../../ui/constant';
6
8
  import { PlayState } from '../../interface';
@@ -9,6 +11,8 @@ import { multiPrefix } from './constants';
9
11
  import { Storage } from '../../utils/storage';
10
12
  import './index.less';
11
13
  export const LandscapeTip = props => {
14
+ const OverlayView = usePlayerOverlayHost();
15
+ const overlayStyle = usePlayerOverlayFillStyle();
12
16
  const {
13
17
  devId,
14
18
  deleteContent
@@ -27,7 +31,9 @@ export const LandscapeTip = props => {
27
31
  storage.set(landscapeTipId, true);
28
32
  };
29
33
  if (showTipModal && playState === PlayState.PLAYING) {
30
- return /*#__PURE__*/React.createElement(CoverView, null, /*#__PURE__*/React.createElement(View, {
34
+ return /*#__PURE__*/React.createElement(OverlayView, {
35
+ style: overlayStyle
36
+ }, /*#__PURE__*/React.createElement(View, {
31
37
  className: clsx(`${multiPrefix}-tile-tip-content`, `${multiPrefix}-landscape-tip`)
32
38
  }), /*#__PURE__*/React.createElement(Text, {
33
39
  className: clsx(`${multiPrefix}-tile-tip-text`, `${multiPrefix}-landscape-tip`)
@@ -2,12 +2,13 @@ import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
3
  import "core-js/modules/esnext.iterator.constructor.js";
4
4
  import "core-js/modules/esnext.iterator.filter.js";
5
- import { CoverView, View } from '@ray-js/ray';
5
+ import { View } from '@ray-js/ray';
6
6
  import { getDpIdByCode, publishDps } from '@ray-js/ray-ipc-utils';
7
7
  import _find from 'lodash/find';
8
8
  import _get from 'lodash/get';
9
9
  import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
10
- import IpcPtzZoom from '@ray-js/ipc-ptz-zoom';
10
+ import { usePlayerOverlayHost } from '../../renderer/overlay';
11
+ import IpcPtzZoom from '../../renderer/ptzZoom';
11
12
  import { useStore } from '../../ctx/store';
12
13
  import { useMemoizedFn } from '../../hooks';
13
14
  import { MultiCameraScreenMode } from '../../interface';
@@ -59,6 +60,7 @@ const getZoomData = devId => {
59
60
  * 可移动的 PTZ 控制器,目前仅在多目使用
60
61
  */
61
62
  export const MoveablePtzControlItem = props => {
63
+ const OverlayView = usePlayerOverlayHost();
62
64
  const {
63
65
  devId,
64
66
  multiCameraCtx,
@@ -317,7 +319,7 @@ export const MoveablePtzControlItem = props => {
317
319
  }, 1000);
318
320
  }
319
321
  });
320
- return /*#__PURE__*/React.createElement(CoverView, {
322
+ return /*#__PURE__*/React.createElement(OverlayView, {
321
323
  style: {
322
324
  position: 'absolute',
323
325
  zIndex: 89,
@@ -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 from 'react';
5
5
  import { useMemoizedFn } from 'ahooks';
6
+ import { PlayerText as Text } from '../../renderer/text';
6
7
  import { useStore } from '../../ctx/store';
7
8
  import './index.less';
8
9
  /**