From 74b92c940e34c922b53e07b115f176a5df83078a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 12 十月 2024 10:29:35 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 1839aef..2e50171 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -26,8 +26,10 @@
import Device from "./Device";
import Settings from "./settings";
import * as Http from './http';
+import WebSocketClient from './websocket'
let player;
+let websocket;
const Map = () => {
const notify = useNotification();
@@ -58,8 +60,13 @@
Tool.setMapContainer(player.mapContainer);
Tool.setThemeMode(themeMode);
Http.setNotify(notify);
+ // websocket = new WebSocketClient('/ws/map/websocket');
await Http.fetchMapData(0);
+ // websocket.connect();
+ // websocket.onMessage = (data) => {
+ // Tool.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
+ // }
}
initialize();
@@ -74,13 +81,22 @@
handleResize();
window.addEventListener('resize', handleResize);
- notify('Welcome to Rcs', 'info');
+ notify.info('Welcome to Rcs');
return () => {
+ if (websocket) {
+ websocket.onMessage = () => { }
+ websocket.close();
+ }
player.destroy();
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
};
+ }, [])
+
+ useEffect(() => {
+ player.setTheme(themeMode);
+ Tool.setThemeMode(themeMode);
}, [themeMode])
const switchMode = (mode) => {
@@ -94,6 +110,7 @@
switch (mode) {
case MapMode.OBSERVER_MODE:
player.hideGridLines();
+ player.hideStarryBackground();
player.activateMapMultiSelect((selectedSprites, restartFn) => {
console.log(selectedSprites);
@@ -102,6 +119,7 @@
break
case MapMode.MOVABLE_MODE:
player.showGridLines();
+ player.hideStarryBackground();
player.activateMapMultiSelect((selectedSprites, restartFn) => {
Tool.spriteListBeMovable(selectedSprites, () => {
@@ -111,6 +129,7 @@
break
case MapMode.SETTINGS_MODE:
player.hideGridLines();
+ player.showStarryBackground(); // 0x2f68ac
player.activateMapMultiSelect((selectedSprites, restartFn) => {
console.log(selectedSprites);
@@ -186,7 +205,7 @@
padding: '0 16px',
height: '64px',
flexShrink: 0, // keep height
- zIndex: 200
+ zIndex: 200,
}}
>
<TextField
@@ -299,6 +318,7 @@
onCancel={() => {
setInsightVisible(false);
}}
+ width={378}
/>
<Device
@@ -313,8 +333,12 @@
<Settings
open={settingsVisible}
onCancel={() => {
+ setSpriteSettings(null);
setSettingsVisible(false);
}}
+ sprite={spriteSettings}
+ setSpriteSettings={setSpriteSettings}
+ width={570}
/>
</Box>
--
Gitblit v1.9.1