From f96797d6e3ecaa1d3cd415321c791765cdcc01ba Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Tue, 23 Jan 2024 09:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E7=BD=AE=E5=BA=94?=
 =?UTF-8?q?=E7=AD=94=E5=99=A8=E6=8A=A5=E6=96=87bug=EF=BC=9B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=BD=AC=E5=8F=91=E5=88=97=E8=BD=A6=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=BB=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bj-rtss-message                                            | 2 +-
 ts/simulation/wayside/memory/wayside_memory_transponder.go | 3 ++-
 ts/simulation/wayside/memory/wayside_simulation.go         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bj-rtss-message b/bj-rtss-message
index 126ba5a..3a30efc 160000
--- a/bj-rtss-message
+++ b/bj-rtss-message
@@ -1 +1 @@
-Subproject commit 126ba5a7619f6c55f893683dd5a0a86a30b25bec
+Subproject commit 3a30efc9fe949cd5ab9898073f00a093716f279e
diff --git a/ts/simulation/wayside/memory/wayside_memory_transponder.go b/ts/simulation/wayside/memory/wayside_memory_transponder.go
index bcef42d..fa6ba65 100644
--- a/ts/simulation/wayside/memory/wayside_memory_transponder.go
+++ b/ts/simulation/wayside/memory/wayside_memory_transponder.go
@@ -165,7 +165,8 @@ func BaliseTelegramReset(simulation *VerifySimulation, req *dto.BaliseReqDto) er
 func baliseTelegramReset(simulation *VerifySimulation, balise *repository.Transponder) error {
 	entry, _ := entity.GetEntityByUid(simulation.World, balise.Id())
 	component.BaliseFixedTelegramType.SetValue(entry, component.BaliseState{
-		Telegram: balise.FixedTelegram(),
+		Telegram:     balise.FixedTelegram(),
+		UserTelegram: balise.FixedUserTelegram(),
 	})
 	return nil
 }
diff --git a/ts/simulation/wayside/memory/wayside_simulation.go b/ts/simulation/wayside/memory/wayside_simulation.go
index 9e95558..6d0c898 100644
--- a/ts/simulation/wayside/memory/wayside_simulation.go
+++ b/ts/simulation/wayside/memory/wayside_simulation.go
@@ -381,7 +381,7 @@ func (s *VerifySimulation) HandleSemiPhysicalTrainControlMsg(b []byte) {
 	s.Memory.Status.TrainStateMap.Range(func(_, value any) bool {
 		train := value.(*state_proto.TrainState)
 		if !train.Show { // 下线列车
-			return false
+			return true
 		}
 		trainId, err := strconv.Atoi(train.Id)
 		if err != nil {