From 7fd4327861ee2b36af01ff526742b0704f713ccc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 十一月 2024 15:00:42 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/tool.js |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index aa0c56e..4d61c35 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -9,6 +9,7 @@
     DEVICE_SELECTED_EFFECT_COLOR,
     POINT_ROUTE_DIRECTION,
     DEVICE_SPRITE_TINT_DARK,
+    ANIMATE_DURING_TIME,
 } from './constants';
 import { getRouteList } from './http';
 import PointRoute from "./PointRoute";
@@ -71,11 +72,10 @@
 
 
 export const getRealPosition = (x, y) => {
-    const rect = app.view.getBoundingClientRect();
-    return {
-        mapX: (x - rect.left) / mapContainer.scale.x - mapContainer.x / mapContainer.scale.x,
-        mapY: (y - rect.top) / mapContainer.scale.y - mapContainer.y / mapContainer.scale.y
-    }
+    const globalPoint = new PIXI.Point();
+    app.renderer.plugins.interaction.mapPositionToPoint(globalPoint, x, y);
+    const mapPoint = mapContainer.toLocal(globalPoint);
+    return { mapX: mapPoint.x, mapY: mapPoint.y };
 }
 
 export const generateSprite = (deviceType, texture) => {
@@ -111,8 +111,8 @@
             if (texture) {
                 sprite = new PIXI.Sprite(PIXI.Texture.from(texture, { resourceOptions: { scale: 1 } }));
             }
-            sprite.width = 400;
-            sprite.height = 700;
+            sprite.width = 750;
+            sprite.height = 1300;
             sprite.zIndex = DEVICE_Z_INDEX.AGV;
             break
         case DEVICE_TYPE.POINT:
@@ -348,7 +348,7 @@
 
 function onSpriteMouseOver(event) {
     if (tooltip) {
-        app.stage.removeChild(tooltip);
+        app?.stage.removeChild(tooltip);
     }
     tooltip = createSpriteTooltip(this);// this => sprite
     tooltip.x = event.data.global.x + 10;
@@ -365,7 +365,7 @@
 
 function onSpriteMouseOut() {
     if (tooltip && tooltip.parent) {
-        tooltip.parent.removeChild(tooltip);
+        tooltip.parent?.removeChild(tooltip);
         tooltip = null;
     }
 }
@@ -478,7 +478,7 @@
         effectTicker = null;
     }
     if (effectCircle) {
-        mapContainer.removeChild(effectCircle);
+        mapContainer?.removeChild(effectCircle);
         effectCircle = null;
     }
     selectedSprite = null;
@@ -555,13 +555,16 @@
 
     // diff
     let rotationDifference = targetRotation - currentRotation;
+    if (rotationDifference === 0) {
+        return;
+    }
     rotationDifference = ((rotationDifference + Math.PI) % (2 * Math.PI)) - Math.PI;
 
     // destination
     const endRotation = sprite.rotation + rotationDifference;
 
     new TWEEDLE.Tween(sprite)
-        .to({ rotation: endRotation }, 1000)
+        .to({ rotation: endRotation }, ANIMATE_DURING_TIME)
         .easing(TWEEDLE.Easing.Linear.None)
         .onUpdate(() => {
             // agv
@@ -653,7 +656,7 @@
     }
 }
 
-const agvRotationOffsetDegrees = 0;
+const agvRotationOffsetDegrees = 90;
 const agvRotationOffset = rotationParseNum(agvRotationOffsetDegrees);
 
 const showAgvSprite = (curZone, agvVo, setCurSprite) => {
@@ -680,15 +683,14 @@
         agvSprite.position.set(codeSprite.position.x, codeSprite.position.y);
         agvSprite.rotation = targetRotation + agvRotationOffset;
         mapContainer.addChild(agvSprite);
-        beInsight(agvSprite, setCurSprite);
 
         // agvNo sprite
         const agvText = new PIXI.Text(agvNo.toString(), {
-            fontSize: 60,
+            fontSize: 50,
             fill: 0x000000,
         });
         agvText.anchor.set(0.5, 0.5);
-        agvText.position.set(0, 0);
+        agvText.position.set(0, 5);
         agvSprite.addChild(agvText);
 
         agvSprite.updateTextRotation = () => {
@@ -711,14 +713,16 @@
             agvSprite.data.battery = battery;
         }
 
-        animateRotation(agvSprite, targetRotation, agvRotationOffset);
+        animateRotation(agvSprite, targetRotation + agvRotationOffset, agvRotationOffset);
     }
+
+    beInsight(agvSprite, setCurSprite);
 
     new TWEEDLE.Tween(agvSprite.position)
         .to({
             x: codeSprite.position.x,
             y: codeSprite.position.y
-        }, 1000)
+        }, ANIMATE_DURING_TIME)
         .easing(TWEEDLE.Easing.Linear.None)
         .start();
 }
@@ -736,7 +740,7 @@
     }
     agvPath = new PIXI.Graphics();
     agvPath.name = agvPathName;
-    agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer.scale.x)), 0x2f68ac, 0.8);
+    agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer?.scale.x || 1)), 0x2f68ac, 0.8);
     agvPath.zIndex = DEVICE_Z_INDEX.DYNAMIC_ROUTE;
     // agvPath.blendMode = PIXI.BLEND_MODES.NORMAL;
 

--
Gitblit v1.9.1