From 988bed827dc6a2c18b53ada0bcc548ef28be7457 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 29 Jul 2021 15:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E7=94=A8=E8=BD=A6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95ATO=E9=A9=BE=E9=A9=B6=EF=BC=88zc=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=9C=AA=E9=94=81=E9=97=AD=E8=BF=9B=E8=B7=AF=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=EF=BC=89=E3=80=81=E4=B8=8D=E5=81=9C=E7=AB=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java   | 10 +++++-----
 .../simulation/cbtc/data/vr/VirtualRealityTrain.java   |  1 +
 .../rtss/simulation/cbtc/robot/RobotLogicLoop.java     |  7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
index b3be427ec..531d0d638 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
@@ -120,11 +120,11 @@ public class ZCLogicLoop {
         if (switchEnd != null)
             return List.of(switchEnd);
         // 检查列车当前所在进路是否锁闭
-        MovementAuthority.End end1 = this.checkRouteLock(simulation, section, tailSection, right, train);
-        if (Objects.nonNull(end1)) {
-            endList.add(end1);
-            return endList;
-        }
+//        MovementAuthority.End end1 = this.checkRouteLock(simulation, section, tailSection, right, train);
+//        if (Objects.nonNull(end1)) {
+//            endList.add(end1);
+//            return endList;
+//        }
 //        // 检查车头区段是否故障
 //        if (headPosition.getSection().isFault()) {
 //            endList.add(new MovementAuthority.End(headPosition.getSection(), MovementAuthority.EndType.FAULT_SECTION));
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java
index 938f3e9ca..d258e4008 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java
@@ -595,6 +595,7 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
         this.signalEB = false;
         this.atpOn = true;
         this.atoOn = true;
+        this.nextParking = true;
     }
 
     public synchronized void updateNextStationPlan(Station nextStation, Section targetSection, boolean nextParking) {
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java
index 632f7e14e..0cb7bdd3d 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java
@@ -102,9 +102,9 @@ public class RobotLogicLoop {
                 atoService.doBreakMax(train);
                 train.setRobotTargetPosition(null);
                 TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber());
-                if (trainInfo.isManual()) {
-                    train.setTarget(null);
-                }
+//                if (trainInfo.isManual()) {
+//                    train.setTarget(null);
+//                }
                 continue;
             }
 //            if (train.isEB()) {
@@ -120,6 +120,7 @@ public class RobotLogicLoop {
                     TrainInfo trainInfo = repository.getSupervisedTrainByGroup(train.getGroupNumber());
                     if (trainInfo.isManual()) {
                         train.setTarget(train.getRobotTargetPosition().getSection());
+                        train.setRobotTargetPosition(null);
                     }
                     break;
                 case CM: