diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-01-02 09:24:45 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-01-02 09:24:45 +1300 |
| commit | 865c6e3fdccc5b59b55501aa58fd921cdb8a1ec1 (patch) | |
| tree | 6cc58652c2434aa54465ac9ebdb06d3a45dff314 /src/org/traccar/protocol/TaipProtocolDecoder.java | |
| parent | bb61bf04166a539627c8bcaefcf30e241d47a27a (diff) | |
| download | traccar-server-865c6e3fdccc5b59b55501aa58fd921cdb8a1ec1.tar.gz traccar-server-865c6e3fdccc5b59b55501aa58fd921cdb8a1ec1.tar.bz2 traccar-server-865c6e3fdccc5b59b55501aa58fd921cdb8a1ec1.zip | |
Correct date if device sends not full time
Diffstat (limited to 'src/org/traccar/protocol/TaipProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/TaipProtocolDecoder.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java index 565d4a0c7..202b9dd63 100644 --- a/src/org/traccar/protocol/TaipProtocolDecoder.java +++ b/src/org/traccar/protocol/TaipProtocolDecoder.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; import org.traccar.helper.DateBuilder; +import org.traccar.helper.DateUtil; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; @@ -68,17 +69,7 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder { DateBuilder dateBuilder = new DateBuilder(new Date()) .setTime(0, 0, 0, 0) .addMillis(seconds * 1000); - - long millis = dateBuilder.getDate().getTime(); - long diff = System.currentTimeMillis() - millis; - - if (diff > 12 * 60 * 60 * 1000) { - millis += 24 * 60 * 60 * 1000; - } else if (diff < -12 * 60 * 60 * 1000) { - millis -= 24 * 60 * 60 * 1000; - } - - return new Date(millis); + return DateUtil.correctDay(dateBuilder.getDate()); } @Override |