From 7c315b53808a66a2f1faf90930ecffdc85ba455f Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 13 五月 2025 11:34:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 274eee4..6453b18 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -345,7 +345,7 @@
}
long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
if (avoidAbs<51){
- return false;
+ return true;
}
rgvTaskProtocolOther.setAvoid(1);
rgvTaskProtocolOther.setAvoidingTheDestination(avoid);
@@ -365,7 +365,7 @@
}
long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
if (avoidAbs<51){
- return false;
+ return true;
}
rgvTaskProtocolOther.setAvoid(1);
rgvTaskProtocolOther.setAvoidingTheDestination(avoid);
@@ -378,7 +378,7 @@
> avoidDistance) {//鏃犻渶閬胯
return true;
} else {
- if (rgvProtocolOther.getRgvPosDestination() >= rgvProtocolOther.getRgvPos()) {
+ if (rgvProtocolOther.getRgvPosDestination() >= rgvProtocolOther.getRgvPos()-50) {
long avoid = rgvProtocolOther.getRgvPos() - rgvProtocolOther.getCarBodyJiaoMing() - avoidDistance - rgvProtocol.getCarBodyKunPeng();
if (!new TrackRangeUtils().avoidRange(avoid, avoidRange[1])) {
log.error("琛岃蛋瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯� 鑱旂郴绠＄悊鍛橈紒锛侊紒");
@@ -395,6 +395,12 @@
}
return false;
}
+ } else {
+ if ((rgvProtocolOther.getRgvPosDestinationOrPos(true) - rgvProtocolOther.getCarBodyJiaoMing())
+ - (targetPosition + rgvProtocol.getCarBodyKunPeng())
+ > avoidDistance) {//鏃犻渶閬胯
+ return true;
+ }
}
} else {
if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)) {
@@ -410,7 +416,7 @@
}
long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
if (avoidAbs<51){
- return false;
+ return true;
}
rgvTaskProtocolOther.setAvoid(1);
rgvTaskProtocolOther.setAvoidingTheDestination(avoid);
@@ -430,7 +436,7 @@
}
long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
if (avoidAbs<51){
- return false;
+ return true;
}
rgvTaskProtocolOther.setAvoid(1);
rgvTaskProtocolOther.setAvoidingTheDestination(avoid);
@@ -444,7 +450,7 @@
> avoidDistance) {//鏃犻渶閬胯
return true;
} else {
- if (rgvProtocolOther.getRgvPosDestination() <= rgvProtocolOther.getRgvPos()) {
+ if (rgvProtocolOther.getRgvPosDestination() <= rgvProtocolOther.getRgvPos() + 50) {
long avoid = rgvProtocolOther.getRgvPos() + rgvProtocolOther.getCarBodyKunPeng() + avoidDistance + rgvProtocol.getCarBodyJiaoMing();
if (!new TrackRangeUtils().avoidRange(avoid, avoidRange[0])) {
log.error("琛岃蛋瓒呭嚭鑼冨洿锛侊紒锛佷换鍔″紓甯� 鑱旂郴绠＄悊鍛橈紒锛侊紒");
@@ -461,6 +467,12 @@
}
return false;
}
+ } else {
+ if ((rgvProtocolOther.getRgvPosDestinationOrPos(false) - rgvProtocolOther.getCarBodyJiaoMing())
+ - (targetPosition + rgvProtocol.getCarBodyKunPeng())
+ > avoidDistance) {//鏃犻渶閬胯
+ return true;
+ }
}
}
return false;
--
Gitblit v1.9.1