机器人任务界面 ws换成全量的 还未测试
This commit is contained in:
@@ -62,8 +62,8 @@ export default function RobotTaskPage() {
|
||||
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||
const { stationId, currentStation } = useSelector((state: RootState) => state.station);
|
||||
const [excuteStatus, setExcuteStatus] = useState("stop"); //"stop" "running" "pause"
|
||||
// 机器人实时位置
|
||||
const [robotRealtimePosition, setRobotRealtimePosition] = useState(null);
|
||||
// 全量设备实时状态(mapPush),实时数据统一从这里取
|
||||
const [realtimeMap, setRealtimeMap] = useState<any>({});
|
||||
const [execute, setExecute] = useState(false); // 是否执行任务
|
||||
const [taskList, setTaskList] = useState([]);
|
||||
const [arrivedPoint, setArrivedPoint] = useState(null);//完成点
|
||||
@@ -266,7 +266,7 @@ export default function RobotTaskPage() {
|
||||
setExecute(true);
|
||||
setExecutingRobot(targetDevice);
|
||||
setClearNavLine(v => v + 1); // 清空地图轨迹
|
||||
if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
|
||||
//if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
|
||||
//setShowVideo(true);
|
||||
};
|
||||
|
||||
@@ -274,10 +274,10 @@ export default function RobotTaskPage() {
|
||||
useEffect(() => {
|
||||
const controller = new DeviceController(userInfo, messageApi);
|
||||
|
||||
controller.onLocationInfoUpdate = setRobotRealtimePosition;
|
||||
// 实时数据统一从全量设备状态(mapPush)获取,不再订阅单机 WS 的实时数据
|
||||
controller.onIsFinished = handleFinish;
|
||||
controller.onIsExecuting = handleRreshTask;
|
||||
controller.handleArrivedPoint = handleFinishEdPoint;
|
||||
|
||||
// 处理路线点回调:taskId必须和当前选中任务一致
|
||||
controller.onRoutePost = (msg) => {
|
||||
console.log('收到 route_post 消息:', msg);
|
||||
@@ -288,7 +288,6 @@ export default function RobotTaskPage() {
|
||||
|
||||
controller.init();
|
||||
|
||||
|
||||
controllerRef.current = controller;
|
||||
return () => {
|
||||
if (controllerRef.current) {
|
||||
@@ -301,6 +300,17 @@ export default function RobotTaskPage() {
|
||||
|
||||
}, []);
|
||||
|
||||
// 全量设备实时状态 WebSocket(mapPush):实时数据统一从这里获取,退出页面断开连接
|
||||
useEffect(() => {
|
||||
if (!userInfo || !stationId || !controllerRef.current) return;
|
||||
const controller = controllerRef.current;
|
||||
controller.siteId = stationId;
|
||||
controller.initMapPush((rtMap: any) => setRealtimeMap(rtMap || {}));
|
||||
return () => {
|
||||
controller.closeMapPush?.();
|
||||
};
|
||||
}, [userInfo, stationId]);
|
||||
|
||||
// 监听任务列表和设备列表变化,自动连接正在执行中的机器人(仅在没有选择任务时)
|
||||
useEffect(() => {
|
||||
if (!taskPoolList || taskPoolList.length == 0) {
|
||||
@@ -338,7 +348,7 @@ export default function RobotTaskPage() {
|
||||
// 切换设备
|
||||
console.log('🔄 检测到正在执行任务的新设备,开始连接', targetDevice);
|
||||
|
||||
if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
|
||||
//if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
|
||||
//setShowVideo(true);
|
||||
|
||||
}, [devices, taskPoolList, executingRobot, runningPoolTask]);
|
||||
@@ -352,6 +362,29 @@ export default function RobotTaskPage() {
|
||||
}, [runningPoolTask, proPoints]);
|
||||
|
||||
|
||||
// 从全量设备状态(mapPush)里匹配当前设备
|
||||
const pickRealtimeRecord = (rtMap: any, d: any) => {
|
||||
for (const key of [d?.serialNumber, d?.device_sn, d?.sn, d?.id, d?.deviceId]) {
|
||||
if (key == null || String(key) === '') continue;
|
||||
const hit = rtMap?.[String(key)];
|
||||
if (hit) return hit;
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
// 全量数据字段名归一(lng/lat/fixStatus → 页面原有字段名)
|
||||
const robotRealtimePosition = useMemo(() => {
|
||||
const rt = pickRealtimeRecord(realtimeMap, executingRobot);
|
||||
if (!rt) return null;
|
||||
return {
|
||||
...rt,
|
||||
longitude: rt.lng,
|
||||
latitude: rt.lat,
|
||||
fix_status: rt.fixStatus,
|
||||
controlMode: rt.controlMode ?? executingRobot?.lastRunningStatus?.controlMode,
|
||||
};
|
||||
}, [realtimeMap, executingRobot]);
|
||||
|
||||
const realtimePosition = useMemo(() => {
|
||||
let lon = robotRealtimePosition?.longitude;
|
||||
let lat = robotRealtimePosition?.latitude;
|
||||
@@ -582,7 +615,7 @@ export default function RobotTaskPage() {
|
||||
setExecute(true);
|
||||
setExecutingRobot(targetDevice);
|
||||
setClearNavLine(v => v + 1); // 清空地图轨迹
|
||||
if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
|
||||
//if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(targetDevice); } else { controllerRef.current?.switchDevice(targetDevice); }
|
||||
//setShowVideo(true);
|
||||
}
|
||||
}
|
||||
@@ -664,7 +697,7 @@ export default function RobotTaskPage() {
|
||||
fetchTaskList();
|
||||
fetchTaskPoolList();
|
||||
fetchTaskHistoryList();
|
||||
if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(selectedRobotForExecute); } else { controllerRef.current?.switchDevice(selectedRobotForExecute); }
|
||||
//if (isFirstConnect.current) { isFirstConnect.current = false; controllerRef.current?.connectDevice(selectedRobotForExecute); } else { controllerRef.current?.switchDevice(selectedRobotForExecute); }
|
||||
//setShowVideo(true); // 连接成功后自动打开视频
|
||||
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user