Commit d48b2923fa1778e294f6925f0d4ad82b0637c416
1 parent
a7f7430c
update...
Showing
1 changed file
with
6 additions
and
1 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
| @@ -96,10 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{ | @@ -96,10 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{ | ||
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | //从站内到另一个站内 | 98 | //从站内到另一个站内 |
| 99 | - if(prev.getInstation() > 0 && gps.getInstation() > 0 | 99 | + if(prev.getInstation() == 1 && gps.getInstation() == 1 |
| 100 | && !prev.getStopNo().equals(gps.getStopNo()) | 100 | && !prev.getStopNo().equals(gps.getStopNo()) |
| 101 | && !prev.getStation().getName().equals(gps.getStation().getName())) | 101 | && !prev.getStation().getName().equals(gps.getStation().getName())) |
| 102 | return true; | 102 | return true; |
| 103 | + | ||
| 104 | + //从场内到站内 | ||
| 105 | + if(prev.getInstation() == 2 && gps.getInstation() == 1){ | ||
| 106 | + return true; | ||
| 107 | + } | ||
| 103 | return false; | 108 | return false; |
| 104 | } | 109 | } |
| 105 | 110 |