From cef84b3bdff4625965eac92b6550ed04936d6b23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 15 十月 2024 16:12:34 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 11179da..cd0d328 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -31,7 +31,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;
@@ -49,6 +49,7 @@
const [mapContainer, setMapContainer] = useState(null);
const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
+ const [dataFetched, setDataFetched] = useState(false);
const [insightVisible, setInsightVisible] = useState(false);
const [deviceVisible, setDeviceVisible] = useState(false);
const [settingsVisible, setSettingsVisible] = useState(false);
@@ -80,20 +81,18 @@
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));
+ }
+ setDataFetched(true);
setTimeout(() => {
player.adaptScreen();
notify.info(translate('page.map.welcome'));
}, 200)
-
- // websocket.connect();
- // websocket.onMessage = (data) => {
- // Tool.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
- // }
-
}
initialize();
@@ -157,7 +156,7 @@
break
case MAP_MODE.SETTINGS_MODE:
player.hideGridLines();
- player.showStarryBackground(); // 0x2f68ac
+ // player.showStarryBackground(); // 0x2f68ac
player.activateMapMultiSelect((selectedSprites, restartFn) => {
setBatchSprites(selectedSprites);
@@ -251,15 +250,12 @@
boxShadow: theme.shadows[1],
}}
>
- <TextField
- variant="outlined"
- size="small"
- placeholder="鎼滅储..."
- sx={{
- width: '200px',
- backgroundColor: theme.palette.background.paper,
- borderRadius: 1,
- }}
+ <MapSearch
+ mode={mode}
+ setMode={setMode}
+ dataFetched={dataFetched}
+ curZone={curZone}
+ setSpriteSettings={setSpriteSettings}
/>
<Box sx={{ flexGrow: 1 }} />
--
Gitblit v1.9.1