联锁系统逻辑完善
This commit is contained in:
parent
5362e24d92
commit
69aa300fed
@ -85,7 +85,7 @@ public class CiLogic {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 进路延续保护办理判断
|
// 进路延续保护办理判断
|
||||||
if (route.isSettingOverlap()) {
|
if ((route.isSetting() || route.isLock() || route.isNormalUnlock()) && route.isSettingOverlap()) {
|
||||||
this.ciService.checkAndTrySettingOverlap(simulation, route.getOverlap());
|
this.ciService.checkAndTrySettingOverlap(simulation, route.getOverlap());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -227,6 +227,7 @@ public class Signal extends DelayUnlockDevice {
|
|||||||
@Override
|
@Override
|
||||||
public void reset() {
|
public void reset() {
|
||||||
super.reset();
|
super.reset();
|
||||||
|
this.changeToCbtcMode();
|
||||||
this.lockedRoute = null;
|
this.lockedRoute = null;
|
||||||
this.level = LEVEL_Close;
|
this.level = LEVEL_Close;
|
||||||
this.blockade = false;
|
this.blockade = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user