机器人控制界面 添加键盘 控件 控制页面方向盘

This commit is contained in:
mmc
2026-10-12 15:36:40 +08:00
parent 5d8b9559d0
commit d30f52af4e
3 changed files with 349 additions and 14 deletions

View File

@@ -50,6 +50,7 @@ import { useLocation } from 'react-router-dom';
import XboxController from './XboxController';
import RobotFeatureButtons from './RobotFeatureButtons';
import DPadControl from './DPadControl';
import ReverseCameraOverlay from './ReverseCameraOverlay';
import DroneVideoPlayer from './DroneVideoPlayer';
import CesiumMap from '../Map.jsx';
import { useSelector } from 'react-redux';
@@ -118,6 +119,7 @@ export default function DeviceStatusPage() {
});
const [mowerView, setMowerView] = useState('front');
const [steerXY, setSteerXY] = useState({ x: 0, y: 0 });
const [uavState, setUavState] = useState<any>(null);
const [points, setPoints] = useState([]);
const [clearNavLine, setClearNavLine] = useState(0);
@@ -632,6 +634,10 @@ export default function DeviceStatusPage() {
const handleGamepadUpdate = useCallback((state) => {
console.log('Gamepad state updated:', state);
// 记录方向盘 xy 坐标,用于倒车影像叠加层
if (state?.axes) {
setSteerXY({ x: state.axes[0] || 0, y: state.axes[1] || 0 });
}
controllerRef.current?.sendGamepad(state);
}, []);
@@ -1268,6 +1274,11 @@ export default function DeviceStatusPage() {
)
)}
{/* 倒车影像叠加层:根据方向盘 xy 显示转向辅助线 */}
{/*{isVideoPlaying && (*/}
<ReverseCameraOverlay x={steerXY.x} y={steerXY.y} visible={true} />
{/*//)}*/}
{/* 视频未加载 / 停止播放的占位 */}
{!isVideoPlaying && (
<div style={{
@@ -1417,11 +1428,31 @@ export default function DeviceStatusPage() {
style={{ borderRadius: 12, background: '#0f172a', flex: 1, minHeight: 0 }}
styles={{
header: { color: '#fff' },
body: { padding: 12, display: 'flex', flexDirection: 'row', gap: 12, height: 'calc(100% - 57px)', overflow: 'hidden' },
body: {
padding: 12,
display: 'flex',
flexDirection: 'row',
flexWrap: 'wrap', // ✅ 新增:空间不足自动换行
gap: 12,
height: 'calc(100% - 57px)',
overflow: 'auto', // ✅ 改成 auto,换行后内容不会被截断
alignItems: 'center', // 垂直居中,换行后美观
justifyContent: 'center',
},
}}
>
{/* Xbox 手柄 - 左侧,缩小显示 */}
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', flex: '0 0 auto', transform: 'scale(0.82)', transformOrigin: 'left center' }}>
<div
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
flex: '0 0 auto',
minWidth: 320, // ✅ 限制最小宽度,小于这个宽度就会换行
transform: 'scale(0.82)',
transformOrigin: 'left center',
}}
>
<XboxController
onGamepadUpdate={handleGamepadUpdate}
handleControlModal={handleControlModal}
@@ -1431,28 +1462,29 @@ export default function DeviceStatusPage() {
/>
</div>
{/* 方向盘 + 滑块 - 右侧,居中不挤压 */}
<div style={{ flex: '1 1 auto', minWidth: 0, display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center' }}>
{/*<p style={{ color: '#94a3b8', fontSize: 12, fontWeight: 600, marginBottom: 12, textAlign: 'center' }}>
{t('devices.dpad.title')}
</p>*/}
{/* 方向盘 + 滑块 - 右侧 */}
<div
style={{
flex: '1 1 auto',
//minWidth: 300, // ✅ 最小宽度,触发换行阈值,可按需调整
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
}}
>
<DPadControl
onGamepadUpdate={(state) => {
handleGamepadUpdate(state);
//console.log('[DeviceStatusPage] DPad state:', {
// buttons: state.buttons.map((b, i) => ({ idx: i, pressed: b })).filter(b => b.pressed),
// axes: state.axes,
// ts: state.ts,
//});
}}
onSpeedChange={(speed) => {
//console.log(`[DeviceStatusPage] Speed slider: ${Math.round(speed * 100)}%`);
}}
//disabled={!isControlled}
/>
</div>
</Card>
{/* 功能按钮 单独一个面板 */}
<Card
title={