解决了一下 机器转向的问题
This commit is contained in:
@@ -17,6 +17,7 @@ import {
|
||||
} from '@ant-design/icons';
|
||||
|
||||
|
||||
|
||||
import DroneLivePlayer from '../VolcRtcPlayer.jsx';
|
||||
import DroneVideoPlayer from './DroneVideoPlayer';
|
||||
import AgoraTextTest from '../AgoraRtc.tsx';
|
||||
@@ -642,7 +643,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS
|
||||
title: '操作',
|
||||
key: 'action',
|
||||
width: 80,
|
||||
fixed: 'right',
|
||||
//fixed: 'right',
|
||||
render: (_, record) => (
|
||||
<Space size={4}>
|
||||
{/* 编辑按钮绑定弹窗 */}
|
||||
@@ -655,7 +656,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS
|
||||
<Button size="small" type="text" icon={<SettingOutlined />} />
|
||||
</Space>
|
||||
)
|
||||
},]}
|
||||
}]}
|
||||
dataSource={dynamicScheduleList}
|
||||
scroll={{ x: 'max-content', y: 280 }}
|
||||
/>
|
||||
@@ -676,6 +677,7 @@ export default function DeviceOverviewPage({ onViewStatus, selectedSn, onDeviceS
|
||||
</Col>
|
||||
|
||||
<Col xs={24} lg={10}>
|
||||
|
||||
<Card title={<><SettingOutlined style={{ marginRight: 6, }} /> 设备控制面板</>} bordered={false} style={{ borderRadius: 8, marginBottom: 8 }} bodyStyle={{ padding: 12, paddingBottom: 0 }}>
|
||||
<Select
|
||||
style={{ width: "80%", marginBottom: 8 }}
|
||||
|
||||
@@ -76,6 +76,43 @@ export default function DeviceStatusPage({
|
||||
const [devicesAll, setDevicesAll] = useState([]);
|
||||
const [arrivedPoint, setArrivedPoint] = useState(null);//完成点
|
||||
const [isLoopMode, setIsLoopMode] = useState(true);
|
||||
const controllerRef = useRef<DeviceController | null>(null);
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
|
||||
|
||||
const [isControlled, setIsControlled] = useState(false);
|
||||
const [hasControlRight, setHasControlRight] = useState(false);
|
||||
const [connecting, setConnecting] = useState(false);
|
||||
const [wsStatus, setWsStatus] = useState('disconnected');
|
||||
const [wsDeviceInfo, setWsDeviceInfo] = useState({});
|
||||
|
||||
|
||||
// 👇 加上这两个
|
||||
const [queryTimeRange, setQueryTimeRange] = useState([]); // 时间范围
|
||||
const [startTimestamp, setStartTimestamp] = useState(''); // 开始时间戳
|
||||
const [endTimestamp, setEndTimestamp] = useState(''); // 结束时间戳
|
||||
|
||||
const [isModalOpen, setIsModalOpen] = useState(false);
|
||||
const [modalContent, setModalContent] = useState({
|
||||
title: '',
|
||||
content: '',
|
||||
});
|
||||
|
||||
const [mowerView, setMowerView] = useState('front');
|
||||
const [uavState, setUavState] = useState<any>(null);
|
||||
const [points, setPoints] = useState([]);
|
||||
const [clearNavLine, setClearNavLine] = useState(0);
|
||||
const [clearPlanLine, setClearPlanLine] = useState(0);
|
||||
const timerRef = useRef<any>(null);
|
||||
// 打点相关状态
|
||||
const [markedPoints, setMarkedPoints] = useState([]); // 标记的点
|
||||
const [completeFlag, setCompleteFlag] = useState(false); // 是否完成路径规划
|
||||
const [savePath, setSavePath] = useState(null); // 保存的路径数据
|
||||
const [isSaveModalVisible, setIsSaveModalVisible] = useState(false); // 保存模态框可见性
|
||||
const [plotName, setPlotName] = useState(''); // 地块名称
|
||||
const [isSaving, setIsSaving] = useState(false); // 是否正在保存
|
||||
const mapRef = useRef(null); // 地图 ref
|
||||
|
||||
|
||||
// 开关切换回调
|
||||
const handleChange = (checked: boolean) => {
|
||||
@@ -297,43 +334,7 @@ export default function DeviceStatusPage({
|
||||
// 实时位置数据(用于地图)
|
||||
|
||||
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
|
||||
const controllerRef = useRef<DeviceController | null>(null);
|
||||
|
||||
const [isControlled, setIsControlled] = useState(false);
|
||||
const [hasControlRight, setHasControlRight] = useState(false);
|
||||
const [connecting, setConnecting] = useState(false);
|
||||
const [wsStatus, setWsStatus] = useState('disconnected');
|
||||
const [wsDeviceInfo, setWsDeviceInfo] = useState({});
|
||||
const [selectedDrone, setSelectedDrone] = useState(null);
|
||||
const [taskList, setTaskList] = useState([]);
|
||||
|
||||
// 👇 加上这两个
|
||||
const [queryTimeRange, setQueryTimeRange] = useState([]); // 时间范围
|
||||
const [startTimestamp, setStartTimestamp] = useState(''); // 开始时间戳
|
||||
const [endTimestamp, setEndTimestamp] = useState(''); // 结束时间戳
|
||||
|
||||
const [isModalOpen, setIsModalOpen] = useState(false);
|
||||
const [modalContent, setModalContent] = useState({
|
||||
title: '',
|
||||
content: '',
|
||||
});
|
||||
|
||||
const [mowerView, setMowerView] = useState('front');
|
||||
const [uavState, setUavState] = useState<any>(null);
|
||||
const [points, setPoints] = useState([]);
|
||||
const [clearNavLine, setClearNavLine] = useState(0);
|
||||
const [clearPlanLine, setClearPlanLine] = useState(0);
|
||||
const timerRef = useRef<any>(null);
|
||||
// 打点相关状态
|
||||
const [markedPoints, setMarkedPoints] = useState([]); // 标记的点
|
||||
const [completeFlag, setCompleteFlag] = useState(false); // 是否完成路径规划
|
||||
const [savePath, setSavePath] = useState(null); // 保存的路径数据
|
||||
const [isSaveModalVisible, setIsSaveModalVisible] = useState(false); // 保存模态框可见性
|
||||
const [plotName, setPlotName] = useState(''); // 地块名称
|
||||
const [isSaving, setIsSaving] = useState(false); // 是否正在保存
|
||||
const mapRef = useRef(null); // 地图 ref
|
||||
|
||||
const runningStatus = useMemo(() => {
|
||||
// 判断对象是否为空
|
||||
@@ -382,7 +383,8 @@ export default function DeviceStatusPage({
|
||||
return {
|
||||
lon: robotLon,
|
||||
lat: robotLat,
|
||||
heading: runningStatus.pitch || wsDeviceInfo.pitch || 0,
|
||||
//heading: 0
|
||||
heading: runningStatus.yaw || wsDeviceInfo.yaw || 0,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -420,7 +422,11 @@ export default function DeviceStatusPage({
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!device || !controllerRef.current || !device?.serialNumber || isUAV) return;
|
||||
if (!device || !controllerRef.current || !device?.serialNumber || isUAV) {
|
||||
//controllerRef.current?.destroy();
|
||||
//setWsDeviceInfo({});
|
||||
return;
|
||||
}
|
||||
setWsDeviceInfo({});
|
||||
|
||||
controllerRef.current.connectDevice(device);
|
||||
|
||||
Reference in New Issue
Block a user