From f25c5fd5f13d389e3c03547f69e575ce8e55eb87 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Tue, 6 Jul 2021 09:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=8D=A2=E7=AB=AF?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=8D=E5=86=8D=E5=85=B3=E9=97=ADATO?=
 =?UTF-8?q?=EF=BC=9B=E8=BF=9B=E8=B7=AF=E7=9B=B8=E5=85=B3=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java    | 2 +-
 .../cbtc/ATS/operation/handler/DriverOperateHandler.java        | 1 -
 2 files changed, 1 insertion(+), 2 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 78a6023e9..4aded445e 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
@@ -468,7 +468,7 @@ public class ZCLogicLoop {
                 base = pre;
             }
         }
-        if (!lock) {
+        if (!lock && section.getSignalOf(right) == null) {
             // 未锁闭进路中，设置移动授权终点
             return new MovementAuthority.End(section, MovementAuthority.EndType.UNLOCK_SECTION);
         }
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/DriverOperateHandler.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/DriverOperateHandler.java
index 7a61dd922..71343cbfc 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/DriverOperateHandler.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/DriverOperateHandler.java
@@ -169,7 +169,6 @@ public class DriverOperateHandler {
     public void changeHead(Simulation simulation, String groupNumber) {
         VirtualRealityTrain train = simulation.getRepository().getOnlineTrainBy(groupNumber);
         if (train.isStop()) {
-            train.setAtoOn(false);
             this.ATPService.turnDirectionImmediately(train);
         }
     }