From 0617722410f21916ae96d40d30e0778e2239217d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 26 四月 2024 12:55:04 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/index.jsx |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 891d9e2..7c039da 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import * as PIXI from 'pixi.js';
+import * as TWEEDLE from 'tweedle.js';
 import { FormattedMessage, useIntl, useModel } from '@umijs/max';
 import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented } from 'antd';
 const { Header, Content } = Layout;
@@ -8,13 +8,13 @@
     FileAddOutlined,
     CompressOutlined,
     SettingOutlined,
-    CloseOutlined
 } from '@ant-design/icons';
 import './index.css'
 import { createStyles } from 'antd-style';
 import Edit from './components/device';
 import Settings from './components/settings'
 import * as Utils from './utils'
+import WebSocketClient from './websocket'
 import Player from './player';
 import MapSearch from './header/search';
 import MapFloor from './header/floor';
@@ -60,7 +60,7 @@
     SETTINGS_MODEL: "3",
 })
 
-let player;
+let player, websocket;
 
 const Map = () => {
     const intl = useIntl();
@@ -85,9 +85,12 @@
     const [dataFetched, setDataFetched] = React.useState(false);
     const [curSprite, setCurSPrite] = React.useState(null);
     const prevCurSpriteRef = React.useRef();
-    const hasFloor = true;
-    // const [hasFloor, setHasFloor] = React.useState(true);
-    const [curFloor, setCurFloor] = React.useState(1);
+    const [floorList, setFloorList] = React.useState([]);
+    const [curFloor, setCurFloor] = React.useState(() => {
+        const storedValue = localStorage.getItem('curFloor');
+        return storedValue !== null ? JSON.parse(storedValue) : null;
+    });
+    const curFloorRef = React.useRef(curFloor);
     const [batchSprites, setBatchSprites] = React.useState([]);
     const [batchDrawerVisible, setBatchDrawerVisible] = React.useState(false);
 
@@ -101,6 +104,12 @@
             Utils.syncMapContainer(player.mapContainer);
             Utils.syncNotify(notify);
 
+            websocket = new WebSocketClient('/ws/map/websocket');
+            websocket.connect();
+            websocket.onMessage = (data) => {
+                Utils.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
+            }
+
             const handleResize = () => {
                 setWindowSize({
                     width: window.innerWidth,
@@ -109,7 +118,11 @@
             };
             window.addEventListener('resize', handleResize);
 
-            await Utils.fetchMapData(curFloor);
+            const mapFloorData = await Utils.fetchMapFloor();
+            setFloorList(mapFloorData);
+            let defaultFloor = curFloor || mapFloorData?.[0]?.value;
+            setCurFloor(defaultFloor);
+            await Utils.fetchMapData(defaultFloor);
             setDataFetched(true);
             setModel(MapModel.OBSERVER_MODEL)
             setTimeout(() => {
@@ -118,6 +131,13 @@
             }, 200)
         }
         initialize();
+
+        return () => {
+            websocket.onMessage = (data) => {}
+            if (websocket) {
+                websocket.close();
+            }
+        }
     }, []);
 
     // resize
@@ -242,10 +262,12 @@
 
     // watch curFloor
     React.useEffect(() => {
+        curFloorRef.current = curFloor;
         if (!mapContainer && !dataFetched) {
             return;
         }
         switchFloor(curFloor);
+        localStorage.setItem('curFloor', JSON.stringify(curFloor));
     }, [curFloor]);
 
     // watch spriteBySettings
@@ -274,6 +296,7 @@
         if (batchSprites?.length > 0) {
             setBatchDrawerVisible(true)
         } else {
+            player.clearSelectedSprites();
             setBatchDrawerVisible(false)
         }
     }, [batchSprites])
@@ -290,6 +313,7 @@
                                     model={model}
                                     setModel={setModel}
                                     ModelEnum={MapModel}
+                                    curFloor={curFloor}
                                     curSprite={curSprite}
                                     setCurSPrite={setCurSPrite}
                                     setSpriteBySettings={setSpriteBySettings}
@@ -362,8 +386,9 @@
                 <Content ref={contentRef} className={styles.content}>
                     <div ref={mapRef} />
 
-                    {hasFloor && (
+                    {floorList.length > 0 && (
                         <MapFloor
+                            floorList={floorList}
                             curFloor={curFloor}
                             setCurFloor={setCurFloor}
                         />
@@ -422,6 +447,7 @@
             <MapDrawer
                 open={drawerVisible}
                 curSprite={curSprite}
+                curFloor={curFloor}
                 refCurr={mapRef.current}
                 onCancel={() => {
                     setCurSPrite(null);
@@ -433,6 +459,8 @@
                 open={batchDrawerVisible}
                 batchSprites={batchSprites}
                 refCurr={mapRef.current}
+                model={model}
+                ModelEnum={MapModel}
                 onCancel={() => {
                     setBatchSprites([]);
                     setBatchDrawerVisible(false);

--
Gitblit v1.9.1