From 1e465fcab874dd5bf60fdff4151a3742b5a755b0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十月 2024 14:21:12 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 131 +++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 60 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 9d35888..c25a681 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,7 +1,6 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import { useTranslate, useRefresh, useSidebarState } from "react-admin";
import {
- TextField,
Select,
MenuItem,
Button,
@@ -19,6 +18,7 @@
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';
@@ -30,7 +30,7 @@
import WebSocketClient from './websocket'
import ConfirmButton from "../page/components/ConfirmButton";
import { FitScreen } from '@mui/icons-material';
-
+import MapSearch from "./header/MapSearch";
let player;
let websocket;
@@ -47,14 +47,15 @@
const [app, setApp] = useState(null);
const [mapContainer, setMapContainer] = useState(null);
- const [mode, setMode] = useState(MapMode.OBSERVER_MODE);
+ const [mode, setMode] = useState(null);
+ const [dataFetched, setDataFetched] = useState(false);
const [insightVisible, setInsightVisible] = useState(false);
const [deviceVisible, setDeviceVisible] = useState(false);
const [settingsVisible, setSettingsVisible] = useState(false);
const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
- const [spriteSettings, setSpriteSettings] = useState(null);
- const prevSpriteSettingsRef = useRef();
+ const [curSprite, setCurSprite] = useState(null);
+ const prevCurSpriteRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
const [curZone, setCurZone] = useState(() => {
@@ -63,6 +64,7 @@
});
const handleResize = () => {
+ if (!contentRef) { return; }
const width = contentRef.current.offsetWidth;
const height = contentRef.current.offsetHeight;
player.resize(width, height);
@@ -79,20 +81,20 @@
Tool.setThemeMode(themeMode);
Http.setNotify(notify);
Http.setMapContainer(player.mapContainer);
- // websocket = new WebSocketClient('/ws/map/websocket');
+ websocket = new WebSocketClient('/ws/map/websocket');
await Http.fetchMapData();
+ websocket.connect();
+ websocket.onMessage = (wsMsg) => {
+ Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
+ }
setTimeout(() => {
player.adaptScreen();
- notify.info('Welcome to Rcs');
+ notify.info(translate('page.map.welcome'));
+ setDataFetched(true);
+ setMode(MAP_MODE.OBSERVER_MODE);
}, 200)
-
- // websocket.connect();
- // websocket.onMessage = (data) => {
- // Tool.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
- // }
-
}
initialize();
@@ -108,6 +110,7 @@
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
+ Tool.isF
};
}, [])
@@ -123,15 +126,16 @@
const switchMode = (mode) => {
Tool.removeSelectedEffect();
+ setInsightVisible(false);
setDeviceVisible(false);
setSettingsVisible(false);
setBatchSelectionVisible(false);
- setSpriteSettings(null);
+ setCurSprite(null);
setBatchSprites([]);
switch (mode) {
- case MapMode.OBSERVER_MODE:
+ case MAP_MODE.OBSERVER_MODE:
player.hideGridLines();
player.hideStarryBackground();
@@ -139,8 +143,11 @@
setBatchSprites(selectedSprites);
});
+ mapContainer.children.forEach(child => {
+ Tool.beInsight(child, setCurSprite);
+ })
break
- case MapMode.MOVABLE_MODE:
+ case MAP_MODE.MOVABLE_MODE:
player.showGridLines();
player.hideStarryBackground();
@@ -154,16 +161,16 @@
Tool.beMovable(child);
})
break
- case MapMode.SETTINGS_MODE:
+ case MAP_MODE.SETTINGS_MODE:
player.hideGridLines();
- player.showStarryBackground(); // 0x2f68ac
+ // player.showStarryBackground(); // 0x2f68ac
player.activateMapMultiSelect((selectedSprites, restartFn) => {
setBatchSprites(selectedSprites);
});
mapContainer.children.forEach(child => {
- Tool.beSettings(child, setSpriteSettings);
+ Tool.beSettings(child, setCurSprite);
})
break
default:
@@ -188,23 +195,29 @@
Tool.beMovable(sprite);
};
- // watch spriteSettings
- useEffect(() => {
+ // watch curSprite
+ React.useEffect(() => {
if (!mapContainer) {
return;
}
- prevSpriteSettingsRef.current = spriteSettings;
- if (spriteSettings && prevSpriteSettings !== spriteSettings) {
+ prevCurSpriteRef.current = curSprite;
+ if (curSprite && prevCurSprite !== curSprite) {
Tool.removeSelectedEffect();
}
- if (spriteSettings) {
- Tool.showSelectedEffect(spriteSettings)
- setSettingsVisible(true);
+ if (curSprite) {
+ if (mode === MAP_MODE.OBSERVER_MODE) {
+ Tool.showSelectedEffect(curSprite)
+ setInsightVisible(true)
+ }
+ if (mode === MAP_MODE.SETTINGS_MODE) {
+ Tool.showSelectedEffect(curSprite)
+ setSettingsVisible(true)
+ }
} else {
Tool.removeSelectedEffect();
}
- }, [spriteSettings, mapContainer])
- const prevSpriteSettings = prevSpriteSettingsRef.current;
+ }, [curSprite]);
+ const prevCurSprite = prevCurSpriteRef.current;
// watch batchSprites
React.useEffect(() => {
@@ -241,42 +254,41 @@
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
- variant="outlined"
- size="small"
- placeholder="鎼滅储..."
- sx={{
- width: '200px',
- backgroundColor: '#fff',
- borderRadius: 1,
- }}
+ <MapSearch
+ mode={mode}
+ setMode={setMode}
+ dataFetched={dataFetched}
+ curZone={curZone}
+ curSprite={curSprite}
+ setCurSprite={setCurSprite}
/>
<Box sx={{ flexGrow: 1 }} />
- {mode === MapMode.OBSERVER_MODE && (
+ {mode === MAP_MODE.OBSERVER_MODE && (
<>
<Button
variant="contained"
color="primary"
sx={{ mr: 2 }}
>
- 鍋滄RCS杩愯浆
+ {translate('page.map.action.startup')}
</Button>
<Button variant="contained" color="primary">
- 绯荤粺鎶ュ憡
+ {translate('page.map.action.monitor')}
</Button>
</>
)}
- {mode === MapMode.MOVABLE_MODE && (
+ {mode === MAP_MODE.MOVABLE_MODE && (
<>
<Button
variant="outlined"
@@ -298,7 +310,6 @@
<Button
variant="contained"
color="primary"
- sx={{ mr: 1 }}
onClick={() => setDeviceVisible(!deviceVisible)}
>
{translate('page.map.devices.title')}
@@ -306,7 +317,7 @@
</>
)}
- {mode === MapMode.SETTINGS_MODE && (
+ {mode === MAP_MODE.SETTINGS_MODE && (
<>
<Button
variant="outlined"
@@ -328,7 +339,7 @@
)}
<Select
- value={mode}
+ value={mode ?? ''}
onChange={(event) => {
setMode(event.target.value);
}}
@@ -336,13 +347,14 @@
size="small"
sx={{
ml: 2,
- backgroundColor: '#fff',
+ 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>
</Box>
{/* content */}
@@ -413,9 +425,11 @@
<Insight
open={insightVisible}
onCancel={() => {
+ setCurSprite(null);
setInsightVisible(false);
}}
- width={378}
+ sprite={curSprite}
+ width={570}
/>
<Device
@@ -430,19 +444,22 @@
<Settings
open={settingsVisible}
onCancel={() => {
- setSpriteSettings(null);
+ setCurSprite(null);
setSettingsVisible(false);
}}
- sprite={spriteSettings}
- setSpriteSettings={setSpriteSettings}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
width={570}
/>
<Batch
open={batchSelectionVisible}
onCancel={() => {
+ setBatchSprites([]);
setBatchSelectionVisible(false);
}}
+ batchSprites={batchSprites}
+ mode={mode}
width={570}
/>
@@ -457,11 +474,5 @@
</NotificationProvider>
)
}
-
-export const MapMode = Object.freeze({
- OBSERVER_MODE: "1",
- MOVABLE_MODE: "2",
- SETTINGS_MODE: "3",
-})
export default MapPage;
--
Gitblit v1.9.1