From 865c6e3fdccc5b59b55501aa58fd921cdb8a1ec1 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 2 Jan 2016 09:24:45 +1300 Subject: Correct date if device sends not full time --- src/org/traccar/protocol/TaipProtocolDecoder.java | 13 ++----------- src/org/traccar/protocol/TramigoProtocolDecoder.java | 4 +++- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'src/org/traccar/protocol') 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 diff --git a/src/org/traccar/protocol/TramigoProtocolDecoder.java b/src/org/traccar/protocol/TramigoProtocolDecoder.java index da34bcdfa..10bab3d6c 100644 --- a/src/org/traccar/protocol/TramigoProtocolDecoder.java +++ b/src/org/traccar/protocol/TramigoProtocolDecoder.java @@ -28,6 +28,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; +import org.traccar.helper.DateUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Event; import org.traccar.model.Position; @@ -126,7 +127,8 @@ public class TramigoProtocolDecoder extends BaseProtocolDecoder { return null; } DateFormat dateFormat = new SimpleDateFormat("HH:mm MMM d yyyy", Locale.ENGLISH); - position.setTime(dateFormat.parse(matcher.group(1) + " " + Calendar.getInstance().get(Calendar.YEAR))); + position.setTime(DateUtil.correctYear( + dateFormat.parse(matcher.group(1) + " " + Calendar.getInstance().get(Calendar.YEAR)))); return position; -- cgit v1.2.3