完成 手柄和放盘盘控制的时候 辅助线的绘制
This commit is contained in:
@@ -96,10 +96,6 @@ export default function DeviceStatusPage() {
|
||||
const hasRequestedControlRef = useRef(false);
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
|
||||
const [direction, setDirection] = useState<'forward' | 'reverse'>('reverse');
|
||||
const [steer, setSteer] = useState(0);
|
||||
|
||||
|
||||
// 视频播放开关
|
||||
const [isVideoPlaying, setIsVideoPlaying] = useState(false);
|
||||
|
||||
@@ -673,17 +669,17 @@ export default function DeviceStatusPage() {
|
||||
const handleGamepadUpdate = useCallback((state) => {
|
||||
console.log('handleGamepadUpdate called with state:', isControlled);
|
||||
// 无控制权限时:不发送消息,且只发起一次权限申请(避免手柄/方向盘高频更新刷屏)
|
||||
if (!isControlled) {
|
||||
if (!hasRequestedControlRef.current && !connecting) {
|
||||
hasRequestedControlRef.current = true;
|
||||
handleControlModal();
|
||||
}
|
||||
return;
|
||||
}
|
||||
//if (!isControlled) {
|
||||
// //if (!hasRequestedControlRef.current && !connecting) {
|
||||
// // hasRequestedControlRef.current = true;
|
||||
// // handleControlModal();
|
||||
// //}
|
||||
// return;
|
||||
//}
|
||||
console.log('Gamepad state updated:', state);
|
||||
// 记录方向盘 xy 坐标,用于倒车影像叠加层
|
||||
if (state?.axes) {
|
||||
setSteerXY({ x: state.axes[0] || 0, y: state.axes[1] || 0 });
|
||||
setSteerXY({ x: state.axes[2] || 0, y: state.axes[1] || 0 });
|
||||
}
|
||||
controllerRef.current?.sendGamepad(state);
|
||||
}, [isControlled, connecting]);
|
||||
@@ -974,32 +970,6 @@ export default function DeviceStatusPage() {
|
||||
</div>
|
||||
|
||||
|
||||
{/*<div style={{ marginBottom: 16 }}>
|
||||
<button onClick={() => setDirection('reverse')} style={{ marginRight: 8 }}>倒车</button>
|
||||
<button onClick={() => setDirection('forward')}>前进</button>
|
||||
<div style={{ marginTop: 8 }}>
|
||||
方向盘转角:{steer}°
|
||||
<br />
|
||||
<input
|
||||
type="range"
|
||||
min={-45}
|
||||
max={45}
|
||||
value={steer}
|
||||
onChange={(e) => setSteer(Number(e.target.value))}
|
||||
/>
|
||||
<p>左滑:左转(负数)|右滑:右转(正数)</p>
|
||||
</div>
|
||||
</div>
|
||||
<CarReverseGuideLine
|
||||
direction="reverse"
|
||||
steer={steer}
|
||||
width={640}
|
||||
height={480}
|
||||
bottomGap={280} // 车尾端两条线间距
|
||||
topGap={100} // 远端顶部两条线间距
|
||||
/>*/}
|
||||
|
||||
|
||||
<div style={{ padding: 0 }}>
|
||||
{contextHolder}
|
||||
|
||||
@@ -1347,7 +1317,11 @@ export default function DeviceStatusPage() {
|
||||
<div style={{ position: 'relative', width: '100%', height: '100%' }}>
|
||||
{/*<AgrtcRoomRobot CHANNEL={device?.serialNumber || ''} />*/}
|
||||
<AgrtcRoomRobot CHANNEL={"41-thream03"} />
|
||||
|
||||
<CarReverseGuideLine
|
||||
direction="forward"
|
||||
steer={steerXY.x * 45}
|
||||
visible={isVideoPlaying}
|
||||
/>
|
||||
</div>
|
||||
) : (
|
||||
<div style={{ position: 'relative', width: '100%', height: '100%' }}>
|
||||
@@ -1363,19 +1337,17 @@ export default function DeviceStatusPage() {
|
||||
error={error}
|
||||
ready={ready}
|
||||
/>
|
||||
{mowerView === 'back' && (
|
||||
<CarReverseGuideLine
|
||||
direction="reverse"
|
||||
steer={steerXY.x * 45}
|
||||
visible={isVideoPlaying}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
)}
|
||||
|
||||
{/* 倒车影像叠加层:根据方向盘 xy 显示转向辅助线 */}
|
||||
{/*{isVideoPlaying && (*/}
|
||||
{/*<CarReverseGuideLine direction={direction} steer={steer} />*/}
|
||||
|
||||
|
||||
{/*<ReverseCameraOverlay x={steerXY.x} y={steerXY.y} visible={true} />*/}
|
||||
{/*//)}*/}
|
||||
|
||||
{/* 视频未加载 / 停止播放的占位 */}
|
||||
{!isVideoPlaying && (
|
||||
<div style={{
|
||||
width: '100%', height: '100%',
|
||||
@@ -1532,7 +1504,7 @@ export default function DeviceStatusPage() {
|
||||
{/* 权限状态标签 */}
|
||||
<Tag
|
||||
icon={connecting ? <LoadingOutlined /> : (isControlled ? <UnlockOutlined /> : <LockOutlined />)}
|
||||
color={connecting ? 'gold' : (isControlled ? 'green' : 'default')}
|
||||
color={connecting ? 'gold' : (isControlled ? 'green' : 'red')}
|
||||
style={{ margin: 0, fontSize: 12 }}
|
||||
>
|
||||
{connecting
|
||||
|
||||
Reference in New Issue
Block a user