From 0e6d97436f58866063736781061c22b1cc4f5e6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 十月 2024 17:11:05 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/MapPage.jsx |   50 +++++++++++++++++---------------------------------
 1 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index cfbd71f..b2a887a 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,
@@ -57,8 +56,6 @@
 
     const [curSprite, setCurSprite] = useState(null);
     const prevCurSpriteRef = useRef();
-    const [spriteSettings, setSpriteSettings] = useState(null);
-    const prevSpriteSettingsRef = useRef();
     const [batchSprites, setBatchSprites] = useState([]);
 
     const [curZone, setCurZone] = useState(() => {
@@ -89,15 +86,14 @@
             await Http.fetchMapData();
             websocket.connect();
             websocket.onMessage = (wsMsg) => {
-                Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), () => {
-                    setDataFetched(true);
-                    setMode(MAP_MODE.OBSERVER_MODE);
-                });
+                Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
             }
 
             setTimeout(() => {
                 player.adaptScreen();
                 notify.info(translate('page.map.welcome'));
+                setDataFetched(true);
+                setMode(MAP_MODE.OBSERVER_MODE);
             }, 200)
         }
         initialize();
@@ -114,6 +110,7 @@
             player.destroy();
             window.removeEventListener('resize', handleResize);
             Tool.patchRaLayout('');
+            Tool.isF
         };
     }, [])
 
@@ -129,11 +126,12 @@
     const switchMode = (mode) => {
         Tool.removeSelectedEffect();
 
+        setInsightVisible(false);
         setDeviceVisible(false);
         setSettingsVisible(false);
         setBatchSelectionVisible(false);
 
-        setSpriteSettings(null);
+        setCurSprite(null);
         setBatchSprites([]);
 
         switch (mode) {
@@ -142,7 +140,7 @@
                 player.hideStarryBackground();
 
                 player.activateMapMultiSelect((selectedSprites, restartFn) => {
-                    setBatchSprites(selectedSprites);
+                    Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
                 });
 
                 mapContainer.children.forEach(child => {
@@ -168,11 +166,11 @@
                 // player.showStarryBackground(); // 0x2f68ac
 
                 player.activateMapMultiSelect((selectedSprites, restartFn) => {
-                    setBatchSprites(selectedSprites);
+                    Tool.multipleSelectEnhancer(selectedSprites, setCurSprite, setBatchSprites);
                 });
 
                 mapContainer.children.forEach(child => {
-                    Tool.beSettings(child, setSpriteSettings);
+                    Tool.beSettings(child, setCurSprite);
                 })
                 break
             default:
@@ -211,29 +209,15 @@
                 Tool.showSelectedEffect(curSprite)
                 setInsightVisible(true)
             }
+            if (mode === MAP_MODE.SETTINGS_MODE) {
+                Tool.showSelectedEffect(curSprite)
+                setSettingsVisible(true)
+            }
         } else {
             Tool.removeSelectedEffect();
         }
     }, [curSprite]);
     const prevCurSprite = prevCurSpriteRef.current;
-
-    // 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(() => {
@@ -284,8 +268,8 @@
                     setMode={setMode}
                     dataFetched={dataFetched}
                     curZone={curZone}
+                    curSprite={curSprite}
                     setCurSprite={setCurSprite}
-                    setSpriteSettings={setSpriteSettings}
                 />
                 <Box sx={{ flexGrow: 1 }} />
 
@@ -460,11 +444,11 @@
             <Settings
                 open={settingsVisible}
                 onCancel={() => {
-                    setSpriteSettings(null);
+                    setCurSprite(null);
                     setSettingsVisible(false);
                 }}
-                sprite={spriteSettings}
-                setSpriteSettings={setSpriteSettings}
+                sprite={curSprite}
+                setSpriteSettings={setCurSprite}
                 width={570}
             />
 

--
Gitblit v1.9.1