根据不同账号 显示的首页优化 规划界面 悬浮显示 状态信息 全局急停状态统一 割刀 根据新方案对接 两个状态 任务路线 显示为 抽拉式一行一个 xbox组件优化数据发送,重构数据
This commit is contained in:
@@ -77,8 +77,9 @@ import { useTranslation } from 'react-i18next';
|
||||
import { backToRestPointCommand } from '@/api/mapEdit';
|
||||
import CarReverseGuideLine from './CarReverseGuideLine';
|
||||
import mowerImg from '../../assets/images/mower.png';
|
||||
import { sendEmergencyStop } from './emergencyStopControl';
|
||||
import { sendEmergencyStop, syncEmergencyStop } from './emergencyStopControl';
|
||||
const { RangePicker } = DatePicker;
|
||||
|
||||
const { Text } = Typography;
|
||||
const ConsoleBadge = ({ online, text, color }: any) => (
|
||||
<span style={{ display: 'inline-flex', alignItems: 'center', gap: 5, fontSize: 12, color: color || (online ? '#52c41a' : '#8c8c8c'), whiteSpace: 'nowrap' }}>
|
||||
@@ -461,6 +462,11 @@ export default function DeviceStatusPage() {
|
||||
...locationInfo
|
||||
};
|
||||
}, [device, wsDeviceInfo, isUAV, locationInfo]);
|
||||
|
||||
// 实时下发的急停状态同步到共享锁存状态:true=已急停,false=未急停
|
||||
useEffect(() => {
|
||||
syncEmergencyStop(runningStatus?.emergency_stop);
|
||||
}, [runningStatus?.emergency_stop]);
|
||||
// 统一在线状态判断:优先实时数据,兜底接口数据
|
||||
const isDeviceOnline = useMemo(() => {
|
||||
// 1. 优先检查实时数据源(WebSocket 推送的 wsDeviceInfo / locationInfo)
|
||||
@@ -546,6 +552,7 @@ export default function DeviceStatusPage() {
|
||||
lon: robotLon,
|
||||
lat: robotLat,
|
||||
heading: runningStatus?.yaw || wsDeviceInfo?.yaw || locationInfo?.yaw || device?.lastRunningStatus?.heading || 0,
|
||||
status: Object.keys(wsDeviceInfo || {}).length > 0 ? 'online' : 'offline',
|
||||
};
|
||||
}
|
||||
return null;
|
||||
@@ -665,6 +672,12 @@ export default function DeviceStatusPage() {
|
||||
}, [isUAV, device]);
|
||||
const mapDevices = useMemo(() => {
|
||||
if (!device) return null;
|
||||
// 光圈颜色:无实时数据 → 红色;有实时数据 → feStatus 优先(1 工作中=green / 2 空闲=blue),status 兜底
|
||||
const hasRealtime = (wsDeviceInfo && Object.keys(wsDeviceInfo).length > 0) || (locationInfo && Object.keys(locationInfo).length > 0);
|
||||
const rtStatus = String(runningStatus?.feStatus ?? runningStatus?.status ?? '');
|
||||
const deviceColor = hasRealtime
|
||||
? (rtStatus === '1' ? 'green' : 'blue')
|
||||
: 'red';
|
||||
// 优先使用持久化MQTT数据,其次使用uavState
|
||||
const lng = currentDroneData?.longitude ?? uavState?.longitude ?? runningStatus?.longitude ?? device.longitude;
|
||||
const lat = currentDroneData?.latitude ?? uavState?.latitude ?? runningStatus?.latitude ?? device.latitude;
|
||||
@@ -678,14 +691,14 @@ export default function DeviceStatusPage() {
|
||||
longitude: lng,
|
||||
latitude: lat,
|
||||
name: device?.deviceAlias || device?.callsign || device?.deviceName || t('devices.device'),
|
||||
color: "red",
|
||||
color: deviceColor,
|
||||
type: isUAV
|
||||
? 'drone'
|
||||
: device?.productName?.includes(t('constants.mower'))
|
||||
? 'mower'
|
||||
: 'robot',
|
||||
};
|
||||
}, [device, isUAV, runningStatus, uavState, currentDroneData]);
|
||||
}, [device, isUAV, runningStatus, uavState, currentDroneData, wsDeviceInfo, locationInfo]);
|
||||
const handleControlMode = (controlMode: number) => {
|
||||
if (!selectedSn) {
|
||||
messageApi.error(t('devices.selectDevice'));
|
||||
@@ -700,7 +713,7 @@ export default function DeviceStatusPage() {
|
||||
deviceId: selectedSn
|
||||
}
|
||||
modeChage(data).then(res => {
|
||||
if (res.code == 200) {
|
||||
if (res.code == 200 && res?.data) {
|
||||
messageApi.success(t('devices.controlModeSuccess'));
|
||||
} else {
|
||||
messageApi.error(res.msg || t('devices.controlModeFail'));
|
||||
@@ -771,6 +784,63 @@ export default function DeviceStatusPage() {
|
||||
sendSteerFrame(index, true);
|
||||
window.setTimeout(() => sendSteerFrame(index, false), 300);
|
||||
}, [sendSteerFrame]);
|
||||
// 方向盘功能按钮:三组互斥锁存(割刀启动/停止、底盘升/降、点火/熄火)
|
||||
type SteerGroup = 'blade' | 'chassis' | 'power';
|
||||
const EMPTY_STEER_STATE: Record<SteerGroup, string | null> = { blade: null, chassis: null, power: null };
|
||||
const [steerState, setSteerState] = useState<Record<SteerGroup, string | null>>(EMPTY_STEER_STATE);
|
||||
const steerStateRef = useRef(steerState);
|
||||
steerStateRef.current = steerState;
|
||||
|
||||
// 按锁存状态组装遥控帧:割刀统一走 button2(启动=true,停止/未点击=false)
|
||||
const buildSteerButtons = useCallback((s: Record<SteerGroup, string | null>) => {
|
||||
const buttons = new Array(17).fill(false);
|
||||
buttons[2] = s.blade === 'start'; // 割刀:button2
|
||||
buttons[0] = s.chassis === 'up'; // 底盘升起
|
||||
buttons[1] = s.chassis === 'down'; // 底盘下降
|
||||
buttons[4] = s.power === 'ignition'; // 点火
|
||||
buttons[5] = s.power === 'shutdown'; // 熄火
|
||||
return buttons;
|
||||
}, []);
|
||||
|
||||
const sendSteerState = useCallback((next: Record<SteerGroup, string | null>) => {
|
||||
steerStateRef.current = next;
|
||||
setSteerState(next);
|
||||
handleGamepadUpdate({
|
||||
buttons: buildSteerButtons(next),
|
||||
axes: [0, 0, 0, 0],
|
||||
connected: true,
|
||||
ts: Date.now(),
|
||||
});
|
||||
}, [buildSteerButtons, handleGamepadUpdate]);
|
||||
|
||||
// 点击:未激活→激活;再次点击→取消;切换同组另一个按钮时自动互斥
|
||||
const toggleSteerGroup = useCallback((group: SteerGroup, value: string) => {
|
||||
if (blockIfGamepadConnected()) return;
|
||||
const prev = steerStateRef.current;
|
||||
sendSteerState({ ...prev, [group]: prev[group] === value ? null : value } as Record<SteerGroup, string | null>);
|
||||
}, [blockIfGamepadConnected, sendSteerState]);
|
||||
|
||||
// 锁存期间每 100ms 持续发送,保持"按住"语义
|
||||
useEffect(() => {
|
||||
if (steerState.blade === null && steerState.chassis === null && steerState.power === null) return;
|
||||
const id = window.setInterval(() => {
|
||||
const cur = steerStateRef.current;
|
||||
if (cur.blade === null && cur.chassis === null && cur.power === null) return;
|
||||
handleGamepadUpdate({
|
||||
buttons: buildSteerButtons(cur),
|
||||
axes: [0, 0, 0, 0],
|
||||
connected: true,
|
||||
ts: Date.now(),
|
||||
});
|
||||
}, 200);
|
||||
return () => window.clearInterval(id);
|
||||
}, [steerState, buildSteerButtons, handleGamepadUpdate]);
|
||||
|
||||
// 切换设备时清空锁存,避免残留
|
||||
useEffect(() => {
|
||||
steerStateRef.current = EMPTY_STEER_STATE;
|
||||
setSteerState(EMPTY_STEER_STATE);
|
||||
}, [selectedSn]);
|
||||
const handleControlModal = useCallback(() => {
|
||||
console.log('请求控制权限');
|
||||
controllerRef.current?.requestControl();
|
||||
@@ -1270,9 +1340,9 @@ export default function DeviceStatusPage() {
|
||||
<ConsoleRow icon={<DashboardOutlined />} label={t('devices.rtLeftTemp')} value={(runningStatus?.left_motor_temperature ?? runningStatus?.leftMotorTemp) !== undefined ? formatTemperature(Number(runningStatus?.left_motor_temperature ?? runningStatus?.leftMotorTemp), 1).label : '-'} />
|
||||
<ConsoleRow icon={<DashboardOutlined />} label={t('devices.rtRightTemp')} value={(runningStatus?.right_motor_temperature ?? runningStatus?.rightMotorTemp) !== undefined ? formatTemperature(Number(runningStatus?.right_motor_temperature ?? runningStatus?.rightMotorTemp), 1).label : '-'} />
|
||||
<ConsoleRow icon={<DashboardOutlined />} label={t('devices.rtMainTemp')} value={(runningStatus?.main_temperature ?? runningStatus?.chipTemp) !== undefined ? formatTemperature(Number(runningStatus?.main_temperature ?? runningStatus?.chipTemp), 1).label : '-'} />
|
||||
<ConsoleRow icon={<EnvironmentOutlined />} label={t('devices.motionStatus')} value={runningStatus?.motion === 'moving' ? t('devices.motionMoving') : runningStatus?.motion === 'stopped' ? t('devices.motionStopped') : runningStatus?.motion === 'blocked' ? t('devices.motionBlocked') : '-'} />
|
||||
{/*<ConsoleRow icon={<EnvironmentOutlined />} label={t('devices.motionStatus')} value={runningStatus?.motion === 'moving' ? t('devices.motionMoving') : runningStatus?.motion === 'stopped' ? t('devices.motionStopped') : runningStatus?.motion === 'blocked' ? t('devices.motionBlocked') : '-'} />*/}
|
||||
<ConsoleRow icon={<EnvironmentOutlined />} label={t('devices.cutterSpedd')} value={runningStatus?.cutter_speed ?? "-"} />
|
||||
<ConsoleRow icon={<SafetyOutlined />} label={t('devices.rtEmergency')} value={runningStatus?.emergency_stop === true ? t('devices.estopTriggered') : runningStatus?.emergency_stop === false ? t('devices.estopNormal') : '-'} />
|
||||
<ConsoleRow icon={<SafetyOutlined />} label={t('devices.rtEmergency')} value={runningStatus?.emergency_stop == "true" ? t('devices.estopTriggered') : runningStatus?.emergency_stop == "false" ? t('devices.estopNormal') : '-'} />
|
||||
{/*<ConsoleRow icon={<DashboardOutlined />} label={t('devices.rtLeftMeasureRpm')} value={(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed) !== undefined ? Number(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed).toFixed(1) + 'rpm' : '-'} />*/}
|
||||
{/*<ConsoleRow icon={<DashboardOutlined />} label={t('devices.rtRightMeasureRpm')} value={(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed) !== undefined ? Number(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed).toFixed(1) + 'rpm' : '-'} />*/}
|
||||
<ConsoleRow icon={<DashboardOutlined />} label={t('devices.rtLeftMotorRpm')} value={runningStatus?.left_motor_rpm !== undefined ? Number(runningStatus?.left_motor_rpm).toFixed(1) + 'rpm' : '-'} />
|
||||
@@ -1453,16 +1523,16 @@ export default function DeviceStatusPage() {
|
||||
</div>
|
||||
<div style={{ width: '100%', display: 'flex', flexDirection: 'column', gap: 8 }}>
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<SteerButton icon={<PlayCircleOutlined />} label={t('devices.steer.ignition')} color="#22c55e" onPressStart={() => sendSteerFrame(4, true)} onPressEnd={() => sendSteerFrame(4, false)} />
|
||||
<SteerButton icon={<PoweroffOutlined />} label={t('devices.steer.shutdown')} color="#ef4444" onPressStart={() => sendSteerFrame(5, true)} onPressEnd={() => sendSteerFrame(5, false)} />
|
||||
<SteerButton icon={<PlayCircleOutlined />} label={t('devices.steer.ignition')} color="#22c55e" active={steerState.power === 'ignition'} onToggle={() => toggleSteerGroup('power', 'ignition')} />
|
||||
<SteerButton icon={<PoweroffOutlined />} label={t('devices.steer.shutdown')} color="#ef4444" active={steerState.power === 'shutdown'} onToggle={() => toggleSteerGroup('power', 'shutdown')} />
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<SteerButton icon={<ArrowUpOutlined />} label={t('devices.steer.chassisUp')} color="#3b82f6" onPressStart={() => sendSteerFrame(0, true)} onPressEnd={() => sendSteerFrame(0, false)} />
|
||||
<SteerButton icon={<ArrowDownOutlined />} label={t('devices.steer.chassisDown')} color="#3b82f6" onPressStart={() => sendSteerFrame(1, true)} onPressEnd={() => sendSteerFrame(1, false)} />
|
||||
<SteerButton icon={<ArrowUpOutlined />} label={t('devices.steer.chassisUp')} color="#3b82f6" active={steerState.chassis === 'up'} onToggle={() => toggleSteerGroup('chassis', 'up')} />
|
||||
<SteerButton icon={<ArrowDownOutlined />} label={t('devices.steer.chassisDown')} color="#3b82f6" active={steerState.chassis === 'down'} onToggle={() => toggleSteerGroup('chassis', 'down')} />
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<SteerButton icon={<PlusOutlined />} label={t('devices.steer.cutterAccel')} color="#f59e0b" onPressStart={() => sendSteerFrame(2, true)} onPressEnd={() => sendSteerFrame(2, false)} />
|
||||
<SteerButton icon={<MinusOutlined />} label={t('devices.steer.cutterDecel')} color="#f59e0b" onPressStart={() => sendSteerFrame(3, true)} onPressEnd={() => sendSteerFrame(3, false)} />
|
||||
<SteerButton icon={<PlusOutlined />} label={t('devices.steer.cutterAccel')} color="#f59e0b" active={steerState.blade === 'start'} onToggle={() => toggleSteerGroup('blade', 'start')} />
|
||||
<SteerButton icon={<MinusOutlined />} label={t('devices.steer.cutterDecel')} color="#f59e0b" active={steerState.blade === 'stop'} onToggle={() => toggleSteerGroup('blade', 'stop')} />
|
||||
</div>
|
||||
</div>
|
||||
</ConsolePanel>
|
||||
|
||||
Reference in New Issue
Block a user