@ray-js/ipc-player-integration 0.0.58-beta.1 → 0.0.59-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -0
- package/lib/ctx/ctx.composition.js +4 -19
- package/lib/ctx/ctx.js +55 -106
- package/lib/ctx/ports.output.d.ts +0 -1
- package/lib/ctx/resolution.d.ts +1 -1
- package/lib/ctx/resolution.js +1 -9
- package/lib/i18n/index.d.ts +0 -12
- package/lib/i18n/strings.d.ts +0 -6
- package/lib/i18n/strings.js +0 -6
- package/lib/index.d.ts +4 -0
- package/lib/index.js +3 -1
- package/lib/interface.d.ts +3 -16
- package/lib/renderer/capabilities.d.ts +8 -0
- package/lib/renderer/capabilities.js +19 -0
- package/lib/renderer/context.d.ts +5 -0
- package/lib/renderer/context.js +6 -0
- package/lib/renderer/directionControl.d.ts +6 -0
- package/lib/renderer/directionControl.js +3 -0
- package/lib/renderer/font.less +5 -0
- package/lib/renderer/glyphs.d.ts +1 -0
- package/lib/renderer/glyphs.js +256 -0
- package/lib/renderer/index.module.less +48 -0
- package/lib/renderer/ptzZoom.d.ts +6 -0
- package/lib/renderer/ptzZoom.js +3 -0
- package/lib/renderer/text.d.ts +4 -0
- package/lib/renderer/text.js +32 -0
- package/lib/renderer/text.module.less +4 -0
- package/lib/renderer/viewport.d.ts +7 -0
- package/lib/renderer/viewport.js +24 -0
- package/lib/res/lynx-signal/index.d.ts +1 -0
- package/lib/res/lynx-signal/index.js +22 -0
- package/lib/res/lynx-signal/signalFour0.png +0 -0
- package/lib/res/lynx-signal/signalFour1.png +0 -0
- package/lib/res/lynx-signal/signalFour2.png +0 -0
- package/lib/res/lynx-signal/signalFour3.png +0 -0
- package/lib/res/lynx-signal/signalFour4.png +0 -0
- package/lib/res/lynx-signal/signalThree0.png +0 -0
- package/lib/res/lynx-signal/signalThree1.png +0 -0
- package/lib/res/lynx-signal/signalThree2.png +0 -0
- package/lib/res/lynx-signal/signalThree3.png +0 -0
- package/lib/res/player-more-arrow.png +0 -0
- package/lib/ui/bottomLeftContent.js +118 -52
- package/lib/ui/bottomRightContent.js +6 -3
- package/lib/ui/scrollHintArrow.d.ts +23 -0
- package/lib/ui/scrollHintArrow.js +82 -0
- package/lib/ui/ui.d.ts +5 -0
- package/lib/ui/ui.js +60 -45
- package/lib/utils/ttt.js +8 -2
- package/lib/widgets/battery/battery.js +2 -1
- package/lib/widgets/battery/batteryFull.js +2 -1
- package/lib/widgets/floodlight/floodlight.js +2 -1
- package/lib/widgets/flowLowTip/flowLowTip.js +2 -1
- package/lib/widgets/fullScreen/fullScreen.js +2 -1
- package/lib/widgets/fullScreen/fullTravelRouteControl.d.ts +1 -1
- package/lib/widgets/fullScreen/fullTravelRouteControl.js +1 -1
- package/lib/widgets/fullScreen/verticalScreen.js +2 -1
- package/lib/widgets/index.d.ts +0 -1
- package/lib/widgets/index.js +1 -2
- package/lib/widgets/moveInteractiveControl/controlButton.js +2 -1
- package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.js +12 -3
- package/lib/widgets/moveInteractiveControl/moveInteractiveControlUI.less +24 -4
- package/lib/widgets/multiCamera/landscapeTip.js +2 -1
- package/lib/widgets/multiCamera/moveablePtzControl.js +1 -1
- package/lib/widgets/multiCamera/multiPtz.js +2 -1
- package/lib/widgets/multiCamera/ptzMoveableTip.js +2 -1
- package/lib/widgets/multiCamera/switchLayout.js +2 -1
- package/lib/widgets/multiCamera/tileMultiPtz.js +2 -1
- package/lib/widgets/multiCamera/tileSwitchLayout.js +2 -1
- package/lib/widgets/multiCamera/tileTip.js +2 -1
- package/lib/widgets/muted/muted.js +5 -10
- package/lib/widgets/muted/muted.less +1 -5
- package/lib/widgets/ptz/ptz.js +2 -1
- package/lib/widgets/ptz/ptzControl.js +1 -1
- package/lib/widgets/ptzControlTip/ptzControlTip.js +6 -3
- package/lib/widgets/ptzControlTip/ptzControlTip.less +6 -0
- package/lib/widgets/realTimeMagnification/realTimeMagnification.js +2 -1
- package/lib/widgets/recordVideo/recordVideo.js +53 -53
- package/lib/widgets/recordVideo/recordVideo.less +74 -17
- package/lib/widgets/recordVideo/recordVideo.test.js +0 -1
- package/lib/widgets/resolution/fullResolutionControl.js +29 -19
- package/lib/widgets/resolution/resolution.js +3 -2
- package/lib/widgets/screenshot/screenshot.js +45 -66
- package/lib/widgets/screenshot/screenshot.less +40 -1
- package/lib/widgets/signal4G/signal4G.js +4 -1
- package/lib/widgets/siren/siren.js +2 -1
- package/lib/widgets/tempHumidity/tempHumidity.js +2 -1
- package/lib/widgets/toggleVerticalFull/toggleVerticalFull.js +2 -1
- package/lib/widgets/trialBadge/index.js +8 -3
- package/lib/widgets/trialBadge/index.less +24 -0
- package/lib/widgets/tryExperience/tryExperience.js +3 -1
- package/lib/widgets/videoBitKBP/videoBitKBP.js +2 -1
- package/lib/widgets/voiceIntercom/voiceIntercom.js +50 -24
- package/lib/widgets/voiceIntercom/voiceIntercom.less +16 -0
- package/lib/widgets/zoomTurntable/turntable/index.d.ts +5 -7
- package/lib/widgets/zoomTurntable/turntable/index.js +2 -1
- package/lib/widgets/zoomTurntable/zoomTurntableEntry.js +2 -1
- package/lib/widgets/zoomTurntable/zoomTurntableTip.js +2 -1
- package/package.json +15 -8
- package/lib/ctx/ctx.album.test.d.ts +0 -1
- package/lib/ctx/ctx.album.test.js +0 -197
- package/lib/ctx/useAutoClarityConfig.d.ts +0 -8
- package/lib/ctx/useAutoClarityConfig.js +0 -40
- package/lib/ui/absoluteContent.d.ts +0 -2
- package/lib/ui/absoluteContent.js +0 -3
- package/lib/utils/captureResult.d.ts +0 -14
- package/lib/utils/captureResult.js +0 -70
- package/lib/utils/captureResult.test.d.ts +0 -1
- package/lib/utils/captureResult.test.js +0 -117
- package/lib/utils/productAbility.d.ts +0 -6
- package/lib/utils/productAbility.js +0 -20
- package/lib/widgets/captureResult/captureResult.d.ts +0 -16
- package/lib/widgets/captureResult/captureResult.js +0 -85
- package/lib/widgets/captureResult/captureResult.less +0 -144
- package/lib/widgets/captureResult/captureResult.test.d.ts +0 -1
- package/lib/widgets/captureResult/captureResult.test.js +0 -80
- package/lib/widgets/captureResult/index.d.ts +0 -2
- package/lib/widgets/captureResult/index.js +0 -2
- package/lib/widgets/muted/muted.test.d.ts +0 -1
- package/lib/widgets/muted/muted.test.js +0 -81
- package/lib/widgets/recordVideo/recordVideo.lifecycle.test.d.ts +0 -1
- package/lib/widgets/recordVideo/recordVideo.lifecycle.test.js +0 -106
- package/lib/widgets/screenshot/screenshot.test.d.ts +0 -1
- package/lib/widgets/screenshot/screenshot.test.js +0 -120
package/lib/ui/ui.js
CHANGED
|
@@ -12,6 +12,10 @@ 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 { PlayerRenderModeContext, PlayerControlVisibilityContext } from '../renderer/context';
|
|
16
|
+
import lynxStyles from '../renderer/index.module.less';
|
|
17
|
+
import { getPlayerViewport } from '../renderer/viewport';
|
|
18
|
+
import { LynxPlayerAdaptersContext } from '../renderer/capabilities';
|
|
15
19
|
import { PlayState, PlayerStreamStatus, MultiCameraScreenMode } from '../interface';
|
|
16
20
|
import { useCtx } from '../ctx/ctx.composition';
|
|
17
21
|
import { useStore, updateAtom, getDefaultStore } from '../ctx/store';
|
|
@@ -28,9 +32,7 @@ import { Storage } from '../utils/storage';
|
|
|
28
32
|
import './ui.less';
|
|
29
33
|
import { updatePlayerWidgetProps } from '../features';
|
|
30
34
|
import { getNgRawData, getSmartImageQualityState, isLowPhone } from '../utils/ttt';
|
|
31
|
-
import { getCaptureResultSummary } from '../utils/captureResult';
|
|
32
35
|
import { lensCount } from '../widgets/zoomTurntable/lensSkill';
|
|
33
|
-
import { shouldRenderContent } from './absoluteContent';
|
|
34
36
|
const AutoClarityOnly = _ref => {
|
|
35
37
|
let {
|
|
36
38
|
instance
|
|
@@ -101,6 +103,7 @@ const SCALE_MATCH_EPS = 0.01;
|
|
|
101
103
|
const BOTTOM_RIGHT_SAFE_GAP = 4;
|
|
102
104
|
export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
103
105
|
const {
|
|
106
|
+
renderMode = 'webview',
|
|
104
107
|
className,
|
|
105
108
|
devId,
|
|
106
109
|
style,
|
|
@@ -565,6 +568,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
565
568
|
// canOpenSettings: true,
|
|
566
569
|
// };
|
|
567
570
|
const getNgRes = await getNgRawData();
|
|
571
|
+
console.log('res===getSmartImageQualityState', res);
|
|
568
572
|
updatePlayerWidgetProps(instance, 'bottomLeft', 'TryExperience', {
|
|
569
573
|
isPurchase: res.isPurchase,
|
|
570
574
|
buttonState: res.buttonState,
|
|
@@ -687,16 +691,14 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
687
691
|
ipcTTTOperatorLog('hide: 调用停止录制方法');
|
|
688
692
|
setRecording(false, true);
|
|
689
693
|
setIntercom(false, true);
|
|
690
|
-
instance === null || instance === void 0 || instance.
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
}).catch(() => {
|
|
699
|
-
ipcTTTOperatorLog('hide: 调用停止录制方法失败');
|
|
694
|
+
instance === null || instance === void 0 || instance.IPCPlayerInstance.stopRecord({
|
|
695
|
+
saveToAlbum: 1,
|
|
696
|
+
success: () => {
|
|
697
|
+
ipcTTTOperatorLog('hide: 调用停止录制方法成功');
|
|
698
|
+
},
|
|
699
|
+
fail: () => {
|
|
700
|
+
ipcTTTOperatorLog('hide: 调用停止录制方法失败');
|
|
701
|
+
}
|
|
700
702
|
});
|
|
701
703
|
ipcTTTOperatorLog('hide: 调用停止对讲方法');
|
|
702
704
|
instance === null || instance === void 0 || instance.IPCPlayerInstance.stopTalk({
|
|
@@ -1090,22 +1092,31 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1090
1092
|
});
|
|
1091
1093
|
const playerContainerHeight = screenType === 'vertical' ? (style === null || style === void 0 ? void 0 : style.height) || '100%' : '100vh';
|
|
1092
1094
|
const isVerticalFullMode = isVerticalFullLayout && screenType === 'vertical';
|
|
1093
|
-
|
|
1095
|
+
const lynxVerticalFull = renderMode === 'lynx' && isVerticalFullMode;
|
|
1096
|
+
const viewport = getPlayerViewport(renderMode, isVerticalFullMode, playerContainerHeight);
|
|
1097
|
+
return /*#__PURE__*/React.createElement(PlayerRenderModeContext.Provider, {
|
|
1098
|
+
value: renderMode
|
|
1099
|
+
}, /*#__PURE__*/React.createElement(LynxPlayerAdaptersContext.Provider, {
|
|
1100
|
+
value: props.lynxAdapters || {}
|
|
1101
|
+
}, /*#__PURE__*/React.createElement(UIEventContext.Provider, {
|
|
1094
1102
|
value: {
|
|
1095
1103
|
event: eventRef.current,
|
|
1096
1104
|
componentHideState,
|
|
1097
1105
|
refreshElement
|
|
1098
1106
|
}
|
|
1099
1107
|
}, /*#__PURE__*/React.createElement(View, {
|
|
1100
|
-
className: clsx('ipc-player-content', isSmallScreen && 'ipc-player-content-small-screen', className),
|
|
1108
|
+
className: clsx('ipc-player-content', renderMode === 'lynx' && lynxStyles.root, isSmallScreen && 'ipc-player-content-small-screen', className),
|
|
1101
1109
|
style: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultCSSVariable), CSSVariable), style), {}, {
|
|
1102
1110
|
height: playerContainerHeight
|
|
1103
|
-
}
|
|
1111
|
+
}, lynxVerticalFull ? {
|
|
1112
|
+
backgroundColor: '#000'
|
|
1113
|
+
} : {})
|
|
1104
1114
|
}, /*#__PURE__*/React.createElement(View, {
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1115
|
+
className: lynxVerticalFull ? lynxStyles.verticalViewport : undefined,
|
|
1116
|
+
style: viewport.style
|
|
1117
|
+
}, /*#__PURE__*/React.createElement(IPCPlayer, _extends({}, renderMode === 'lynx' ? {
|
|
1118
|
+
renderMode: 'lynx'
|
|
1119
|
+
} : {}, {
|
|
1109
1120
|
defaultMute: mute,
|
|
1110
1121
|
devId: devId,
|
|
1111
1122
|
onlineStatus: deviceOnline,
|
|
@@ -1124,7 +1135,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1124
1135
|
onCameraNotifyWeakNetwork: data => {
|
|
1125
1136
|
console.log(`onCameraNotifyWeakNetwork: ${JSON.stringify(data)}`);
|
|
1126
1137
|
},
|
|
1127
|
-
clarity: decodeClarityDic[resolution],
|
|
1138
|
+
clarity: decodeClarityDic[String(resolution).toUpperCase()] || decodeClarityDic.HD,
|
|
1128
1139
|
onZoomChange: onZoomChange
|
|
1129
1140
|
// objectFit={
|
|
1130
1141
|
// screenType === 'vertical'
|
|
@@ -1138,7 +1149,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1138
1149
|
// scaleMultiple={0}
|
|
1139
1150
|
,
|
|
1140
1151
|
awakeStatus: awakeStatus,
|
|
1141
|
-
objectFit:
|
|
1152
|
+
objectFit: viewport.objectFit,
|
|
1142
1153
|
scaleMultiple: scaleMultiple
|
|
1143
1154
|
// 安卓横屏问题
|
|
1144
1155
|
// ptzControllable={screenType === 'vertical'}
|
|
@@ -1158,17 +1169,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1158
1169
|
// 这一下起,自动隐藏倒计时才开始生效
|
|
1159
1170
|
hasUserTappedPlayerRef.current = true;
|
|
1160
1171
|
if (instance.multiCameraCtx.isSupport) {
|
|
1161
|
-
var _instance$
|
|
1162
|
-
const preTapIndex = (_instance$
|
|
1172
|
+
var _instance$multiCamera, _instance$multiCamera2;
|
|
1173
|
+
const preTapIndex = (_instance$multiCamera = (_instance$multiCamera2 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera2 === void 0 ? void 0 : _instance$multiCamera2.index) !== null && _instance$multiCamera !== void 0 ? _instance$multiCamera : prevSelectedIndexRef.current;
|
|
1163
1174
|
const wasHidden = componentHideState;
|
|
1164
1175
|
instance.multiCameraCtx.selectVideoFiredRef.current = false;
|
|
1165
1176
|
if (multiTapTimerRef.current) {
|
|
1166
1177
|
clearTimeout(multiTapTimerRef.current);
|
|
1167
1178
|
}
|
|
1168
1179
|
multiTapTimerRef.current = setTimeout(() => {
|
|
1169
|
-
var _instance$
|
|
1180
|
+
var _instance$multiCamera3, _instance$multiCamera4;
|
|
1170
1181
|
const selectFired = !!instance.multiCameraCtx.selectVideoFiredRef.current;
|
|
1171
|
-
const currentIndex = (_instance$
|
|
1182
|
+
const currentIndex = (_instance$multiCamera3 = (_instance$multiCamera4 = instance.multiCameraCtx.selectedLenInfoRef.current) === null || _instance$multiCamera4 === void 0 ? void 0 : _instance$multiCamera4.index) !== null && _instance$multiCamera3 !== void 0 ? _instance$multiCamera3 : preTapIndex;
|
|
1172
1183
|
if (selectFired && currentIndex === preTapIndex) {
|
|
1173
1184
|
if (wasHidden) {
|
|
1174
1185
|
showComponents();
|
|
@@ -1220,9 +1231,11 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1220
1231
|
limitFlow: limitFlow,
|
|
1221
1232
|
autoWakeUp: autoWakeUp,
|
|
1222
1233
|
extend: _objectSpread(_objectSpread({
|
|
1223
|
-
backgroundColor:
|
|
1234
|
+
backgroundColor: viewport.backgroundColor
|
|
1224
1235
|
}, instance.multiCameraCtx.extendProps), extend)
|
|
1225
|
-
})),
|
|
1236
|
+
}))), /*#__PURE__*/React.createElement(PlayerControlVisibilityContext.Provider, {
|
|
1237
|
+
value: !componentHideState && !refreshElement
|
|
1238
|
+
}, showTopContent && /*#__PURE__*/React.createElement(View, {
|
|
1226
1239
|
className: clsx('ipc-player-top-content', {
|
|
1227
1240
|
'ipc-player-top-content-hide': componentHideState,
|
|
1228
1241
|
'ipc-player-top-content-show': !componentHideState
|
|
@@ -1236,18 +1249,17 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1236
1249
|
ctx: instance
|
|
1237
1250
|
}, renderTopRightContent, !hasVisibleBitrateWidget && /*#__PURE__*/React.createElement(AutoClarityOnly, {
|
|
1238
1251
|
instance: instance
|
|
1239
|
-
})))), /*#__PURE__*/React.createElement(
|
|
1240
|
-
instance: instance,
|
|
1241
|
-
show: !showTopContent || componentHideState || !playerReady
|
|
1242
|
-
}), /*#__PURE__*/React.createElement(View, {
|
|
1252
|
+
})))), /*#__PURE__*/React.createElement(View, {
|
|
1243
1253
|
className: clsx('ipc-player-bottom-content', {
|
|
1244
1254
|
'ipc-player-bottom-content-hide': componentHideState,
|
|
1245
1255
|
'ipc-player-bottom-content-show': !componentHideState,
|
|
1246
1256
|
'ipc-player-bottom-content-full': isVerticalFullMode
|
|
1247
1257
|
}),
|
|
1248
|
-
style: {
|
|
1258
|
+
style: _objectSpread({
|
|
1249
1259
|
height: screenType === 'vertical' ? '48px' : '72px'
|
|
1250
|
-
}
|
|
1260
|
+
}, lynxVerticalFull ? {
|
|
1261
|
+
paddingBottom: 0
|
|
1262
|
+
} : {})
|
|
1251
1263
|
}, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BottomLeftContent, {
|
|
1252
1264
|
ctx: instance,
|
|
1253
1265
|
reservedRight: bottomRightReserved
|
|
@@ -1255,19 +1267,19 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1255
1267
|
ctx: instance,
|
|
1256
1268
|
width: bottomRightStyleWidth,
|
|
1257
1269
|
onWidthChange: handleBottomRightWidthChange
|
|
1258
|
-
}, renderBottomRightContent))), (
|
|
1270
|
+
}, renderBottomRightContent)))), /*#__PURE__*/React.createElement(StandaloneAutoClarity, {
|
|
1271
|
+
instance: instance,
|
|
1272
|
+
show: !showTopContent || componentHideState || !playerReady
|
|
1273
|
+
}), (() => {
|
|
1259
1274
|
if (!absoluteContent || !(absoluteContent !== null && absoluteContent !== void 0 && absoluteContent.length)) return null;
|
|
1260
1275
|
return absoluteContent.map(item => {
|
|
1261
|
-
if (
|
|
1262
|
-
playState
|
|
1263
|
-
})) return null;
|
|
1264
|
-
const contentProps = _objectSpread(_objectSpread(_objectSpread({
|
|
1265
|
-
key: item.id
|
|
1266
|
-
}, item.initProps), instance), {}, {
|
|
1267
|
-
IPCPlayerContext: instance.IPCPlayerInstance
|
|
1268
|
-
});
|
|
1276
|
+
if (item.hidden) return null;
|
|
1269
1277
|
if (item.absoluteNoCoverView) {
|
|
1270
|
-
return /*#__PURE__*/React.createElement(item.content,
|
|
1278
|
+
return /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread(_objectSpread({
|
|
1279
|
+
key: item.id
|
|
1280
|
+
}, item.initProps), instance), {}, {
|
|
1281
|
+
IPCPlayerContext: instance.IPCPlayerInstance
|
|
1282
|
+
}));
|
|
1271
1283
|
}
|
|
1272
1284
|
return /*#__PURE__*/React.createElement(CoverView, {
|
|
1273
1285
|
key: item.id,
|
|
@@ -1275,10 +1287,13 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
|
|
|
1275
1287
|
position: 'absolute'
|
|
1276
1288
|
}, item.absolutePosition),
|
|
1277
1289
|
className: item.absoluteContentClassName
|
|
1278
|
-
}, /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread({
|
|
1290
|
+
}, /*#__PURE__*/React.createElement(item.content, _objectSpread(_objectSpread(_objectSpread({
|
|
1291
|
+
key: item.id
|
|
1292
|
+
}, item.initProps), instance), {}, {
|
|
1293
|
+
IPCPlayerContext: instance.IPCPlayerInstance,
|
|
1279
1294
|
// 添加通用变量单独组件类名
|
|
1280
1295
|
className: clsx('absolute-item-container')
|
|
1281
1296
|
})));
|
|
1282
1297
|
});
|
|
1283
|
-
})()));
|
|
1298
|
+
})()))));
|
|
1284
1299
|
});
|
package/lib/utils/ttt.js
CHANGED
|
@@ -37,9 +37,11 @@ export function getAIFrameFeature(devId) {
|
|
|
37
37
|
ty.ipc.getAIFrameFeature({
|
|
38
38
|
devId,
|
|
39
39
|
success: data => {
|
|
40
|
+
console.log('res===getAIFrameFeature data', data);
|
|
40
41
|
resolve(data);
|
|
41
42
|
},
|
|
42
|
-
fail:
|
|
43
|
+
fail: e => {
|
|
44
|
+
console.warn('res===getAIFrameFeature fail', e);
|
|
43
45
|
resolve(null);
|
|
44
46
|
}
|
|
45
47
|
});
|
|
@@ -59,9 +61,11 @@ export function setAIFrameFeature(params) {
|
|
|
59
61
|
try {
|
|
60
62
|
ty.ipc.setAIFrameFeature(_objectSpread(_objectSpread({}, params), {}, {
|
|
61
63
|
success: data => {
|
|
64
|
+
console.log('res===setAIFrameFeature data', data);
|
|
62
65
|
resolve(data);
|
|
63
66
|
},
|
|
64
|
-
fail:
|
|
67
|
+
fail: e => {
|
|
68
|
+
console.warn('res===setAIFrameFeature fail', e);
|
|
65
69
|
resolve(null);
|
|
66
70
|
}
|
|
67
71
|
}));
|
|
@@ -131,6 +135,7 @@ export function notifyOfflineShown(deviceId) {
|
|
|
131
135
|
return false;
|
|
132
136
|
}
|
|
133
137
|
try {
|
|
138
|
+
console.warn('res===notifyOfflineShown', deviceId);
|
|
134
139
|
method({
|
|
135
140
|
deviceId,
|
|
136
141
|
scene: 'preview_mini'
|
|
@@ -241,6 +246,7 @@ export function subscribeClarityChanged(devId, handler) {
|
|
|
241
246
|
try {
|
|
242
247
|
ipc.onClarityChanged(listener);
|
|
243
248
|
} catch (error) {
|
|
249
|
+
console.warn('res===onClarityChanged fail', error);
|
|
244
250
|
return () => undefined;
|
|
245
251
|
}
|
|
246
252
|
return () => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
|
-
import { View
|
|
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';
|
|
6
7
|
import './battery.less';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
|
-
import { View
|
|
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';
|
|
6
7
|
import './battery.less';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { View
|
|
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
|
|
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, useMemo } from 'react';
|
|
3
|
-
import { View, setPageOrientation,
|
|
3
|
+
import { View, setPageOrientation, hideMenuButton, showMenuButton, showStatusBar, hideStatusBar, setNavigationBarBack, getSystemInfoSync } 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 '
|
|
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
|
|
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) {
|
package/lib/widgets/index.d.ts
CHANGED
package/lib/widgets/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { useContext } from 'react';
|
|
2
|
-
import { View
|
|
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';
|
|
@@ -4,6 +4,8 @@ import "core-js/modules/esnext.iterator.map.js";
|
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { View, ScrollView, CoverView } from '@ray-js/ray';
|
|
6
6
|
import clsx from 'clsx';
|
|
7
|
+
import { usePlayerRenderMode } from '../../renderer/context';
|
|
8
|
+
import { PlayerText } from '../../renderer/text';
|
|
7
9
|
import './moveInteractiveControlUI.less';
|
|
8
10
|
const defaultMenu = [{
|
|
9
11
|
key: '0',
|
|
@@ -62,6 +64,7 @@ const defaultCSSVariable = {
|
|
|
62
64
|
'--activeColor': '#FF592A'
|
|
63
65
|
};
|
|
64
66
|
export function MoveInterActiveControlUI(props) {
|
|
67
|
+
const isLynx = usePlayerRenderMode() === 'lynx';
|
|
65
68
|
const {
|
|
66
69
|
contentClsName,
|
|
67
70
|
wrapClsName,
|
|
@@ -80,13 +83,17 @@ export function MoveInterActiveControlUI(props) {
|
|
|
80
83
|
// @ts-ignore
|
|
81
84
|
, {
|
|
82
85
|
style: _objectSpread({}, CSSVariable),
|
|
83
|
-
className: clsx('ipc-player-plugin-active-control-wrap', wrapClsName
|
|
86
|
+
className: clsx('ipc-player-plugin-active-control-wrap', wrapClsName, {
|
|
87
|
+
'ipc-player-plugin-active-control-wrap-lynx': isLynx,
|
|
88
|
+
'ipc-player-plugin-active-control-wrap-webview': !isLynx
|
|
89
|
+
})
|
|
84
90
|
}, /*#__PURE__*/React.createElement(View, {
|
|
85
91
|
className: clsx('ipc-player-plugin-active-control-title')
|
|
86
92
|
}, I18n.t('homeFeatureInteractiveMenuTitle')), /*#__PURE__*/React.createElement(ScrollView, {
|
|
87
93
|
style: {
|
|
88
94
|
flex: 1
|
|
89
95
|
},
|
|
96
|
+
className: isLynx ? 'ipc-player-plugin-active-control-scroll-lynx' : undefined,
|
|
90
97
|
scrollY: true
|
|
91
98
|
}, /*#__PURE__*/React.createElement(View, {
|
|
92
99
|
className: clsx('ipc-player-plugin-active-control', contentClsName)
|
|
@@ -98,9 +105,11 @@ export function MoveInterActiveControlUI(props) {
|
|
|
98
105
|
})
|
|
99
106
|
}, /*#__PURE__*/React.createElement(View, {
|
|
100
107
|
className: clsx('ipc-player-plugin-active-control-item-icon')
|
|
101
|
-
}, /*#__PURE__*/React.createElement(View, {
|
|
108
|
+
}, !isLynx && /*#__PURE__*/React.createElement(View, {
|
|
102
109
|
className: clsx('ipc-player-plugin-active-control-item-icon-mask')
|
|
103
|
-
}), /*#__PURE__*/React.createElement(
|
|
110
|
+
}), isLynx ? /*#__PURE__*/React.createElement(PlayerText, {
|
|
111
|
+
className: clsx('icon-panel', item.iconName, 'ipc-player-plugin-interactive-icon')
|
|
112
|
+
}) : /*#__PURE__*/React.createElement(View, {
|
|
104
113
|
className: clsx('icon-panel', item.iconName, 'ipc-player-plugin-interactive-icon')
|
|
105
114
|
})), /*#__PURE__*/React.createElement(View, {
|
|
106
115
|
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,7 @@
|
|
|
1
1
|
import React, { useState } from 'react';
|
|
2
|
-
import { View, CoverView
|
|
2
|
+
import { View, CoverView } 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 { landscapeTipId } from '../../ui/constant';
|
|
6
7
|
import { PlayState } from '../../interface';
|
|
@@ -7,7 +7,7 @@ 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 '
|
|
10
|
+
import IpcPtzZoom from '../../renderer/ptzZoom';
|
|
11
11
|
import { useStore } from '../../ctx/store';
|
|
12
12
|
import { useMemoizedFn } from '../../hooks';
|
|
13
13
|
import { MultiCameraScreenMode } from '../../interface';
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
|
-
import { View
|
|
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
|
/**
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { useMemo, useState } from 'react';
|
|
2
|
-
import { View, CoverView
|
|
2
|
+
import { View, CoverView } 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 { ptzMoveableTipId } from '../../ui/constant';
|
|
6
7
|
import { PlayState } from '../../interface';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { View } from '@ray-js/ray';
|
|
2
2
|
import clsx from 'clsx';
|
|
3
3
|
import React, { useMemo } from 'react';
|
|
4
|
+
import { PlayerText as Text } from '../../renderer/text';
|
|
4
5
|
import { useStore } from '../../ctx/store';
|
|
5
6
|
import { MultiCameraLayoutStyle, MultiCameraScreenMode } from '../../interface';
|
|
6
7
|
import { multiPrefix } from './constants';
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
|
-
import { View
|
|
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
6
|
import Color from 'color';
|
|
7
|
+
import { PlayerText as Text } from '../../renderer/text';
|
|
7
8
|
import { useStore } from '../../ctx/store';
|
|
8
9
|
import { multiPrefix } from './constants';
|
|
9
10
|
import './index.less';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { View
|
|
1
|
+
import { View } from '@ray-js/ray';
|
|
2
2
|
import React, { useMemo } from 'react';
|
|
3
3
|
import clsx from 'clsx';
|
|
4
|
+
import { PlayerText as Text } from '../../renderer/text';
|
|
4
5
|
import { MultiCameraLayoutStyle } from '../../interface';
|
|
5
6
|
import { multiPrefix } from './constants';
|
|
6
7
|
import { useStore } from '../../ctx/store';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { useState } from 'react';
|
|
2
|
-
import { View, CoverView
|
|
2
|
+
import { View, CoverView } 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 { tileTipId } from '../../ui/constant';
|
|
6
7
|
import { PlayState } from '../../interface';
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { View
|
|
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 { useStore } from '../../ctx/store';
|
|
5
6
|
import { UIEventContext } from '../../ui/context';
|
|
6
7
|
import { widgetLabs, widgetClick, pauseTimeToHideAllComponent, startTimeToHideAllComponent } from '../../ui/constant';
|
|
@@ -17,19 +18,13 @@ 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
|
-
intercom
|
|
21
|
+
isMuted
|
|
22
22
|
} = useStore({
|
|
23
|
-
isMuted: mute
|
|
24
|
-
intercom: props.intercom
|
|
23
|
+
isMuted: mute
|
|
25
24
|
});
|
|
26
|
-
const disabled = intercom;
|
|
27
25
|
return /*#__PURE__*/React.createElement(View, {
|
|
28
|
-
className: clsx(className,
|
|
29
|
-
'ipc-player-plugin-muted-disabled': disabled
|
|
30
|
-
}),
|
|
26
|
+
className: clsx(className),
|
|
31
27
|
onClick: () => {
|
|
32
|
-
if (disabled) return;
|
|
33
28
|
event.emit(widgetClick, {
|
|
34
29
|
widgetId: widgetLabs.MUTED
|
|
35
30
|
});
|
package/lib/widgets/ptz/ptz.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
|
-
import { View
|
|
2
|
+
import { View } from '@ray-js/ray';
|
|
3
3
|
import clsx from 'clsx';
|
|
4
4
|
import React, { useEffect, useState, useContext } from 'react';
|
|
5
5
|
import { useMemoizedFn } from 'ahooks';
|
|
6
|
+
import { PlayerText as Text } from '../../renderer/text';
|
|
6
7
|
import { UIEventContext } from '../../ui/context';
|
|
7
8
|
import { usePtz } from '../../hooks';
|
|
8
9
|
import { useStore } from '../../ctx/store';
|
|
@@ -4,8 +4,8 @@ import { CoverView } from '@ray-js/ray';
|
|
|
4
4
|
import clsx from 'clsx';
|
|
5
5
|
import _find from 'lodash/find';
|
|
6
6
|
import _get from 'lodash/get';
|
|
7
|
-
import IpcPtzZoom from '@ray-js/ipc-ptz-zoom';
|
|
8
7
|
import { getDpIdByCode, publishDps } from '@ray-js/ray-ipc-utils';
|
|
8
|
+
import IpcPtzZoom from '../../renderer/ptzZoom';
|
|
9
9
|
import { Storage } from '../../utils/storage';
|
|
10
10
|
import { useMemoizedFn } from '../../hooks';
|
|
11
11
|
import { useComponentHideState } from '../../ui/hooks';
|