From bf4a9d88a55a95f54e7c7bf7f397fa6b18258743 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 13:33:57 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 341 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 295 insertions(+), 46 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index decde65..e5ae0b1 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,4 +1,5 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
+import { useTranslate, useRefresh, useSidebarState } from "react-admin";
import {
TextField,
Select,
@@ -8,7 +9,7 @@
SpeedDial,
SpeedDialAction,
useTheme,
- Snackbar,
+ Fab,
} from '@mui/material';
import {
MoreVert as MoreVertIcon,
@@ -18,23 +19,55 @@
Print as PrintIcon,
Share as ShareIcon,
} from '@mui/icons-material';
+import { MAP_MODE } from "./constants";
import Player from './player';
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
+import Insight from "./insight";
+import Device from "./Device";
+import Settings from "./settings";
+import Batch from "./batch";
+import * as Http from './http';
+import WebSocketClient from './websocket'
+import ConfirmButton from "../page/components/ConfirmButton";
+import { FitScreen } from '@mui/icons-material';
+
let player;
+let websocket;
const Map = () => {
+ const notify = useNotification();
+ const [sidebarOpen] = useSidebarState();
+ const translate = useTranslate();
+ const theme = useTheme();
+ const themeMode = theme.palette.mode;
+
const mapRef = useRef();
const contentRef = useRef();
const [app, setApp] = useState(null);
const [mapContainer, setMapContainer] = useState(null);
- const notify = useNotification();
- const [mode, setMode] = useState(MapMode.OBSERVER_MODE);
+ const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
+ const [insightVisible, setInsightVisible] = useState(false);
+ const [deviceVisible, setDeviceVisible] = useState(false);
+ const [settingsVisible, setSettingsVisible] = useState(false);
+ const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
- const theme = useTheme();
- const themeMode = theme.palette.mode;
+ const [spriteSettings, setSpriteSettings] = useState(null);
+ const prevSpriteSettingsRef = useRef();
+ const [batchSprites, setBatchSprites] = useState([]);
+
+ const [curZone, setCurZone] = useState(() => {
+ const storedValue = localStorage.getItem('curZone');
+ return storedValue !== null ? JSON.parse(storedValue) : null;
+ });
+
+ const handleResize = () => {
+ const width = contentRef.current.offsetWidth;
+ const height = contentRef.current.offsetHeight;
+ player.resize(width, height);
+ };
useEffect(() => {
Tool.patchRaLayout('0px');
@@ -44,39 +77,95 @@
setMapContainer(player.mapContainer);
Tool.setApp(player.app);
Tool.setMapContainer(player.mapContainer);
+ Tool.setThemeMode(themeMode);
+ Http.setNotify(notify);
+ Http.setMapContainer(player.mapContainer);
+ // websocket = new WebSocketClient('/ws/map/websocket');
+
+ await Http.fetchMapData();
+
+ setTimeout(() => {
+ player.adaptScreen();
+ notify.info('Welcome to Rcs');
+ }, 200)
+
+ // websocket.connect();
+ // websocket.onMessage = (data) => {
+ // Tool.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
+ // }
}
initialize();
// resize
- const handleResize = () => {
- const width = contentRef.current.offsetWidth;
- const height = contentRef.current.offsetHeight;
-
- player.resize(width, height);
- };
handleResize();
window.addEventListener('resize', handleResize);
- notify('Welcome to Rcs', 'info');
-
return () => {
+ if (websocket) {
+ websocket.onMessage = () => { }
+ websocket.close();
+ }
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
};
+ }, [])
+
+ useEffect(() => {
+ setTimeout(handleResize, 300)
+ }, [sidebarOpen]);
+
+ useEffect(() => {
+ player.setTheme(themeMode);
+ Tool.setThemeMode(themeMode);
}, [themeMode])
const switchMode = (mode) => {
+ Tool.removeSelectedEffect();
+
+ setDeviceVisible(false);
+ setSettingsVisible(false);
+ setBatchSelectionVisible(false);
+
+ setSpriteSettings(null);
+ setBatchSprites([]);
+
switch (mode) {
- case MapMode.OBSERVER_MODE:
- console.log('a');
+ case MAP_MODE.OBSERVER_MODE:
+ player.hideGridLines();
+ player.hideStarryBackground();
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ setBatchSprites(selectedSprites);
+ });
+
break
- case MapMode.MOVABLE_MODE:
- console.log('b');
+ case MAP_MODE.MOVABLE_MODE:
+ player.showGridLines();
+ player.hideStarryBackground();
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ Tool.spriteListBeMovable(selectedSprites, () => {
+ restartFn();
+ });
+ });
+
+ mapContainer.children.forEach(child => {
+ Tool.beMovable(child);
+ })
break
- case MapMode.SETTINGS_MODE:
- console.log('c');
+ case MAP_MODE.SETTINGS_MODE:
+ player.hideGridLines();
+ player.showStarryBackground(); // 0x2f68ac
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ setBatchSprites(selectedSprites);
+ });
+
+ mapContainer.children.forEach(child => {
+ Tool.beSettings(child, setSpriteSettings);
+ })
break
default:
break
@@ -88,7 +177,48 @@
return
}
switchMode(mode);
- }, [mode]);
+ }, [mode, mapContainer]);
+
+ const onDrop = (sprite, type, x, y) => {
+ const { mapX, mapY } = Tool.getRealPosition(x, y);
+ sprite.x = mapX;
+ sprite.y = mapY;
+
+ Tool.initSprite(sprite, type);
+ mapContainer.addChild(sprite);
+ Tool.beMovable(sprite);
+ };
+
+ // watch spriteSettings
+ useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
+ prevSpriteSettingsRef.current = spriteSettings;
+ if (spriteSettings && prevSpriteSettings !== spriteSettings) {
+ Tool.removeSelectedEffect();
+ }
+ if (spriteSettings) {
+ Tool.showSelectedEffect(spriteSettings)
+ setSettingsVisible(true);
+ } else {
+ Tool.removeSelectedEffect();
+ }
+ }, [spriteSettings, mapContainer])
+ const prevSpriteSettings = prevSpriteSettingsRef.current;
+
+ // watch batchSprites
+ React.useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
+ if (batchSprites?.length > 0) {
+ setBatchSelectionVisible(true)
+ } else {
+ player.clearSelectedSprites();
+ setBatchSelectionVisible(false)
+ }
+ }, [batchSprites])
const actions = [
{ icon: <FileCopyIcon />, name: '澶嶅埗' },
@@ -101,20 +231,24 @@
return (
<Box
sx={{
+ width: '100%',
height: '100%',
display: 'flex',
flexDirection: 'column',
}}
>
+ {/* header */}
<Box
sx={{
display: 'flex',
alignItems: 'center',
- backgroundColor: '#f5f5f5',
- color: '#000',
+ backgroundColor: theme.palette.background.default,
+ color: theme.palette.text.primary,
padding: '0 16px',
height: '64px',
flexShrink: 0, // keep height
+ zIndex: 200,
+ boxShadow: theme.shadows[1],
}}
>
<TextField
@@ -123,11 +257,77 @@
placeholder="鎼滅储..."
sx={{
width: '200px',
- backgroundColor: '#fff',
+ backgroundColor: theme.palette.background.paper,
borderRadius: 1,
}}
/>
<Box sx={{ flexGrow: 1 }} />
+
+ {mode === MAP_MODE.OBSERVER_MODE && (
+ <>
+ <Button
+ variant="contained"
+ color="primary"
+ sx={{ mr: 2 }}
+ >
+ {translate('page.map.action.startup')}
+ </Button>
+ <Button variant="contained" color="primary">
+ {translate('page.map.action.monitor')}
+ </Button>
+ </>
+ )}
+
+ {mode === MAP_MODE.MOVABLE_MODE && (
+ <>
+ <Button
+ variant="outlined"
+ sx={{ mr: 2 }}
+ onClick={() => {
+ Tool.clearMapData();
+ }}
+ >
+ {translate('page.map.action.clear')}
+ </Button>
+ <ConfirmButton
+ label="page.map.action.save"
+ variant="contained"
+ sx={{ mr: 2 }}
+ onConfirm={() => {
+ Http.saveMapData(curZone);
+ }}
+ />
+ <Button
+ variant="contained"
+ color="primary"
+ onClick={() => setDeviceVisible(!deviceVisible)}
+ >
+ {translate('page.map.devices.title')}
+ </Button>
+ </>
+ )}
+
+ {mode === MAP_MODE.SETTINGS_MODE && (
+ <>
+ <Button
+ variant="outlined"
+ sx={{ mr: 2 }}
+ onClick={() => {
+ Tool.clearMapData();
+ }}
+ >
+ {translate('page.map.action.clear')}
+ </Button>
+ <ConfirmButton
+ label="page.map.action.save"
+ variant="contained"
+ onConfirm={() => {
+ Http.saveMapData(curZone);
+ }}
+ />
+ </>
+ )}
+
<Select
value={mode}
onChange={(event) => {
@@ -136,26 +336,18 @@
variant="outlined"
size="small"
sx={{
- mr: 2,
- backgroundColor: '#fff',
+ ml: 2,
+ backgroundColor: theme.palette.background.paper,
+ color: theme.palette.text.primary,
borderRadius: 1,
}}
>
- <MenuItem value={MapMode.OBSERVER_MODE}>鐩戞帶妯″紡</MenuItem>
- <MenuItem value={MapMode.MOVABLE_MODE}>缂栬緫妯″紡</MenuItem>
- <MenuItem value={MapMode.SETTINGS_MODE}>閰嶇疆妯″紡</MenuItem>
+ <MenuItem value={MAP_MODE.OBSERVER_MODE}>{translate('page.map.mode.observer')}</MenuItem>
+ <MenuItem value={MAP_MODE.MOVABLE_MODE}>{translate('page.map.mode.movable')}</MenuItem>
+ <MenuItem value={MAP_MODE.SETTINGS_MODE}>{translate('page.map.mode.settings')}</MenuItem>
</Select>
- <Button
- variant="contained"
- color="primary"
- sx={{ mr: 1 }}
- >
- 鍋滄RCS杩愯浆
- </Button>
- <Button variant="contained" color="secondary">
- 妯℃嫙AGV杩愯
- </Button>
</Box>
+ {/* content */}
<Box
sx={{
flexGrow: 1, // fill remaining of map space
@@ -182,7 +374,7 @@
}} />
</Box>
- <SpeedDial
+ {/* <SpeedDial
ariaLabel="SpeedDial 绀轰緥"
sx={{ position: 'absolute', bottom: 16, right: 16 }}
icon={<MoreVertIcon />}
@@ -194,8 +386,71 @@
tooltipTitle={action.name}
/>
))}
- </SpeedDial>
+ </SpeedDial> */}
+
+ <Box
+ sx={{
+ position: 'absolute',
+ left: 35,
+ bottom: 30,
+ display: 'flex',
+ flexDirection: 'column',
+ gap: 1
+ }}
+ >
+ <Fab
+ variant="extended"
+ color="primary"
+ size="medium"
+ onClick={() => {
+ player.adaptScreen();
+ }}
+ >
+ <FitScreen />
+ {translate('page.map.action.adapt')}
+ </Fab>
+ </Box>
</Box>
+
+ <Insight
+ open={insightVisible}
+ onCancel={() => {
+ setInsightVisible(false);
+ }}
+ width={378}
+ />
+
+ <Device
+ open={deviceVisible}
+ onCancel={() => {
+ setDeviceVisible(false);
+ }}
+ onDrop={onDrop}
+ width={378}
+ />
+
+ <Settings
+ open={settingsVisible}
+ onCancel={() => {
+ setSpriteSettings(null);
+ setSettingsVisible(false);
+ }}
+ sprite={spriteSettings}
+ setSpriteSettings={setSpriteSettings}
+ width={570}
+ />
+
+ <Batch
+ open={batchSelectionVisible}
+ onCancel={() => {
+ setBatchSprites([]);
+ setBatchSelectionVisible(false);
+ }}
+ batchSprites={batchSprites}
+ mode={mode}
+ width={570}
+ />
+
</Box>
);
}
@@ -207,11 +462,5 @@
</NotificationProvider>
)
}
-
-export const MapMode = Object.freeze({
- OBSERVER_MODE: "1",
- MOVABLE_MODE: "2",
- SETTINGS_MODE: "3",
-})
export default MapPage;
--
Gitblit v1.9.1