From aeb2d2d0233a12b8675786fc1d83353a9a944155 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 13:56:43 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |   74 +++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index e77f217..3e975be 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -613,54 +613,66 @@
     return row + '-' + bay + '-' + lev;
 }
 
-export const updateMapStatusInRealTime = (data) => {
+export const updateMapStatusInRealTime = (data, curFloorGetter) => {
+    const curFloor = curFloorGetter();
+    if (isNullOfUndefined(curFloor)) { return; }
     const mapVo = JSON.parse(data);
-    // shuttle
+    // shuttleVo
     for (const shuttleVo of mapVo.shuttleVos) {
-
-        const shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleVo.shuttleNo);
-        if (!shuttle && !shuttleVo.curLocNo) { continue; }
-        const { row, bay, lev } = parseLocNo(shuttleVo.curLocNo);
-        const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
-        if (!shelf) { continue; }
-
-        drawPreTravelPath(shuttleVo.preTravelPath)
-
-        new TWEEDLE.Tween(shuttle?.position).easing(TWEEDLE.Easing.Linear.None).to({
-            x: shelf.position.x,
-            y: shelf.position.y
-        }, 1000).onUpdate(() => {
-            updateEffect(shuttle);
-        }).start();
+        // path
+        drawPreTravelPath(shuttleVo.preTravelPath, shuttleVo.shuttleNo, curFloor);
+        // shuttle
+        showShuttle(shuttleVo.shuttleNo, shuttleVo.curLocNo, curFloor);
     }
 }
 
-
-export const drawPreTravelPath = (path) => {
+export const drawPreTravelPath = (path, shuttleNo, curFloor) => {
     if (!mapContainer) {
         return;
     }
+    const pathLineName = 'preTravelPath-' + shuttleNo;
+    let pathLine = mapContainer.getChildByName(pathLineName);
+    if (pathLine) mapContainer.removeChild(pathLine);
 
-    let graphics = mapContainer.getChildByName('preTravelPath');
-    if (graphics) mapContainer.removeChild(graphics);
-
-    graphics = new PIXI.Graphics();
-    graphics.name = 'preTravelPath';
-    graphics.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
-    graphics.zIndex = 9999;
+    pathLine = new PIXI.Graphics();
+    pathLine.name = pathLineName;
+    pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
+    pathLine.zIndex = 9999;
+    let firstNode = true;
     for (let i = 0; i < path.length; i++) {
         const { row, bay, lev } = parseLocNo(path[i]);
+        if (Number(lev) !== curFloor) { continue }
         const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
 
-        if (!shelf) continue;
+        if (!shelf) { continue };
         let position = shelf.position;
         let x = position.x;
         let y = position.y;
-        if (i === 0) {
-            graphics.moveTo(x, y);
+        if (firstNode) {
+            pathLine.moveTo(x, y);
+            firstNode = false;
         } else {
-            graphics.lineTo(x, y);
+            pathLine.lineTo(x, y);
         }
     }
-    mapContainer.addChild(graphics);
+    mapContainer.addChild(pathLine);
+}
+
+export const showShuttle = (shuttleNo, curLocNo, curFloor) => {
+    if (!curLocNo) { return }
+    const { row, bay, lev } = parseLocNo(curLocNo);
+    if (Number(lev) !== curFloor) { return }
+
+    const shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleNo);
+    if (!shuttle) { return }
+
+    const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
+    if (!shelf) { return }
+
+    new TWEEDLE.Tween(shuttle?.position).easing(TWEEDLE.Easing.Linear.None).to({
+        x: shelf.position.x,
+        y: shelf.position.y
+    }, 1000).onUpdate(() => {
+        updateEffect(shuttle);
+    }).start();
 }
\ No newline at end of file

--
Gitblit v1.9.1