急停 发送的模式切换 接收障碍物信息 纵览界面 返航和任务表格数据 优化 状态界面加入人员跟随和 系统模式 还未对接系统模式 任务监控界面加入障碍物
This commit is contained in:
@@ -560,7 +560,6 @@ export default function DeviceStatusPage() {
|
||||
};
|
||||
const handleDetectionReport = (res) => {
|
||||
console.log("获取障碍物信息", res)
|
||||
|
||||
setDeportInfo(res);
|
||||
}
|
||||
useEffect(() => {
|
||||
@@ -679,6 +678,7 @@ export default function DeviceStatusPage() {
|
||||
longitude: lng,
|
||||
latitude: lat,
|
||||
name: device?.deviceAlias || device?.callsign || device?.deviceName || t('devices.device'),
|
||||
color: "red",
|
||||
type: isUAV
|
||||
? 'drone'
|
||||
: device?.productName?.includes(t('constants.mower'))
|
||||
@@ -686,17 +686,17 @@ export default function DeviceStatusPage() {
|
||||
: 'robot',
|
||||
};
|
||||
}, [device, isUAV, runningStatus, uavState, currentDroneData]);
|
||||
const handleControlMode = () => {
|
||||
const handleControlMode = (controlMode: number) => {
|
||||
if (!selectedSn) {
|
||||
messageApi.error(t('devices.selectDevice'));
|
||||
return;
|
||||
}
|
||||
console.log(runningStatus, "现在的控制controlmode")
|
||||
if (runningStatus?.control_mode == 3) {
|
||||
//console.log(runningStatus,controlMode, "现在的控制controlmode")
|
||||
if (controlMode == 3 && runningStatus?.control_mode == 3) {
|
||||
return;
|
||||
}
|
||||
const data = {
|
||||
controlMode: 3,
|
||||
controlMode: controlMode,
|
||||
deviceId: selectedSn
|
||||
}
|
||||
modeChage(data).then(res => {
|
||||
@@ -1242,6 +1242,27 @@ export default function DeviceStatusPage() {
|
||||
: '-'
|
||||
}
|
||||
/>
|
||||
<ConsoleRow
|
||||
icon={<DashboardOutlined />}
|
||||
label={t('devices.systemMode')}
|
||||
value={
|
||||
(runningStatus?.system_mode ?? runningStatus?.systemMode) !== undefined
|
||||
? (() => {
|
||||
const mode = runningStatus?.system_mode ?? runningStatus?.systemMode;
|
||||
switch (mode) {
|
||||
case '2':
|
||||
case 2:
|
||||
return t('devices.autoTask');
|
||||
case '3':
|
||||
case 3:
|
||||
return t('devices.remoteControl');
|
||||
default:
|
||||
return "-";
|
||||
}
|
||||
})()
|
||||
: '-'
|
||||
}
|
||||
/>
|
||||
<ConsoleRow icon={<DashboardOutlined />} label={t('devices.forwardSpeed')} value={(runningStatus?.linear_speed ?? runningStatus?.linearSpeed) !== undefined ? Number(runningStatus?.linear_speed ?? runningStatus?.linearSpeed).toFixed(2) + ' m/s' : '-'} />
|
||||
<ConsoleRow icon={<DashboardOutlined />} label={t('devices.turnSpeed')} value={(runningStatus?.angular_speed ?? runningStatus?.angularSpeed) !== undefined ? Number(runningStatus?.angular_speed ?? runningStatus?.angularSpeed).toFixed(2) + ' rad/s' : '-'} />
|
||||
<ConsoleRow icon={<DashboardOutlined />} label={t('devices.rtLeftMotor')} value={(runningStatus?.left_motor_current ?? runningStatus?.leftCurrent) !== undefined ? Number(runningStatus?.left_motor_current ?? runningStatus?.leftCurrent).toFixed(2) + 'A' : '-'} />
|
||||
@@ -1405,10 +1426,10 @@ export default function DeviceStatusPage() {
|
||||
bodyStyle={{ padding: 10, display: 'flex', alignItems: 'center', gap: 10, overflow: 'hidden' }}
|
||||
>
|
||||
<div style={{ width: 300, flexShrink: 0, transform: 'scale(0.82)', transformOrigin: 'left center' }}>
|
||||
<XboxController onGamepadUpdate={handleGamepadUpdate} onConnectionChange={setIsGamepadConnected} />
|
||||
<XboxController onGamepadUpdate={handleGamepadUpdate} onConnectionChange={setIsGamepadConnected} deviceId={selectedSn} />
|
||||
</div>
|
||||
<div style={{ flex: 1, minWidth: 0, display: 'flex', flexDirection: 'column', gap: 6, overflow: 'auto' }}>
|
||||
{[{ k: t('devices.gamepad.leftStick'), v: t('devices.gamepad.leftStickDesc') }, { k: t('devices.gamepad.rightStick'), v: t('devices.gamepad.rightStickDesc') }, { k: t('devices.gamepad.aKey'), v: t('devices.gamepad.aKeyDesc') }, { k: t('devices.gamepad.bKey'), v: t('devices.gamepad.bKeyDesc') }, { k: t('devices.gamepad.xKey'), v: t('devices.gamepad.xKeyDesc') }, { k: t('devices.gamepad.yKey'), v: t('devices.gamepad.yKeyDesc') }, { k: "LB", v: t("devices.gamepad.lbDesc") }, { k: "RB", v: t("devices.gamepad.rbDesc") }].map((item) => (
|
||||
{[{ k: t('devices.gamepad.leftStick'), v: t('devices.gamepad.leftStickDesc') }, { k: t('devices.gamepad.rightStick'), v: t('devices.gamepad.rightStickDesc') }, { k: t('devices.gamepad.aKey'), v: t('devices.gamepad.aKeyDesc') }, { k: t('devices.gamepad.bKey'), v: t('devices.gamepad.bKeyDesc') }, { k: t('devices.gamepad.xKey'), v: t('devices.gamepad.xKeyDesc') }, { k: t('devices.gamepad.yKey'), v: t('devices.gamepad.yKeyDesc') }, { k: "LB", v: t("devices.gamepad.lbDesc") }, { k: "RB", v: t("devices.gamepad.rbDesc") }, { k: "Stop", v: t("devices.gamepad.Stop") }].map((item) => (
|
||||
<div key={item.k} style={{ display: 'flex', alignItems: 'center', gap: 8, fontSize: 12 }}>
|
||||
<span style={{ minWidth: 52, color: '#8c8c8c', whiteSpace: 'nowrap' }}>{item.k}</span>
|
||||
<span style={{ color: '#262626' }}>{item.v}</span>
|
||||
@@ -1427,7 +1448,7 @@ export default function DeviceStatusPage() {
|
||||
<DPadControl
|
||||
onGamepadUpdate={(state) => { if (blockIfGamepadConnected()) return; handleGamepadUpdate(state); }}
|
||||
onSpeedChange={() => { }}
|
||||
onEmergencyStop={() => sendEmergencyStop(userInfo)}
|
||||
onEmergencyStop={() => sendEmergencyStop(selectedSn)}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ width: '100%', display: 'flex', flexDirection: 'column', gap: 8 }}>
|
||||
@@ -1454,11 +1475,12 @@ export default function DeviceStatusPage() {
|
||||
>
|
||||
<RobotFeatureButtons
|
||||
showEmergencyStop={false}
|
||||
deviceId={selectedSn}
|
||||
activeFeatures={['response', 'obstacleAvoidance', 'lowBatteryReturn', 'tiltProtection', "findCar"]}
|
||||
onToggle={(feature, enabled) => { console.log('[DeviceStatusPage] Feature toggled: ' + feature + ' = ' + enabled); }}
|
||||
sendFindCar={() => handleFindCar()}
|
||||
sendAutoBack={() => handleAutoBack()}
|
||||
sendControlMode={() => handleControlMode()}
|
||||
sendControlMode={(data) => handleControlMode(data)}
|
||||
controlMode={runningStatus?.controlMode}
|
||||
/>
|
||||
</ConsolePanel>
|
||||
|
||||
Reference in New Issue
Block a user