diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-05-28 23:14:29 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 23:14:29 +1200 |
| commit | 744af6b29ad3566e001495c18be8551159c2cc2d (patch) | |
| tree | 02ea751892ea076c909b7c816786e1a1b18e2c29 /src/org/traccar/protocol/GoSafeProtocolDecoder.java | |
| parent | f5af779ccd3e61570df72a487cbf01dbe50b0c3f (diff) | |
| parent | 0c364770d90c47721744d6c7ef43f5f69c34fb1d (diff) | |
| download | trackermap-server-744af6b29ad3566e001495c18be8551159c2cc2d.tar.gz trackermap-server-744af6b29ad3566e001495c18be8551159c2cc2d.tar.bz2 trackermap-server-744af6b29ad3566e001495c18be8551159c2cc2d.zip | |
Merge pull request #3894 from Abyss777/engineHours_gl200_gosafe
Store engine hours in GL200 and GoSafe in milliseconds
Diffstat (limited to 'src/org/traccar/protocol/GoSafeProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/GoSafeProtocolDecoder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/org/traccar/protocol/GoSafeProtocolDecoder.java index 0fa1934da..ae00ad71a 100644 --- a/src/org/traccar/protocol/GoSafeProtocolDecoder.java +++ b/src/org/traccar/protocol/GoSafeProtocolDecoder.java @@ -107,8 +107,9 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder { } if (index < values.length) { String[] hours = values[index].split("-"); - position.set(Position.KEY_HOURS, Integer.parseInt(hours[0]) - + Integer.parseInt(hours[0]) / 60.0 + Integer.parseInt(hours[0]) / 3600.0); + position.set(Position.KEY_HOURS, (Integer.parseInt(hours[0]) * 3600 + + (hours.length > 1 ? Integer.parseInt(hours[1]) * 60 : 0) + + (hours.length > 2 ? Integer.parseInt(hours[2]) : 0)) * 1000); } break; case "ADC": |