From 15d13a99d3215a3208b2c44a07a29a7af9c13de3 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 20 Jun 2012 21:49:08 +0400 Subject: Proper Calendar usage --- src/org/traccar/protocol/Gl100ProtocolDecoder.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/org/traccar/protocol/Gl100ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Gl100ProtocolDecoder.java b/src/org/traccar/protocol/Gl100ProtocolDecoder.java index c28fc65a0..8ac68f6f4 100644 --- a/src/org/traccar/protocol/Gl100ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl100ProtocolDecoder.java @@ -16,14 +16,13 @@ package org.traccar.protocol; import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; -import org.traccar.model.DataManager; import org.traccar.GenericProtocolDecoder; +import org.traccar.model.DataManager; import org.traccar.model.Position; /** @@ -67,7 +66,7 @@ public class Gl100ProtocolDecoder extends GenericProtocolDecoder { throws Exception { String sentence = (String) msg; - + // Send response if (sentence.contains("AT+GTHBD=")) { String response = "+RESP:GTHBD,GPRS ACTIVE,"; @@ -75,7 +74,7 @@ public class Gl100ProtocolDecoder extends GenericProtocolDecoder { response += '\0'; channel.write(response); } - + // Parse message Matcher parser = pattern.matcher(sentence); if (!parser.matches()) { @@ -90,19 +89,19 @@ public class Gl100ProtocolDecoder extends GenericProtocolDecoder { // Get device by IMEI String imei = parser.group(index++); position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); - + // Validity position.setValid(Integer.valueOf(parser.group(index++)) == 0 ? false : true); - + // Position info position.setSpeed(Double.valueOf(parser.group(index++))); position.setCourse(Double.valueOf(parser.group(index++))); position.setAltitude(Double.valueOf(parser.group(index++))); position.setLongitude(Double.valueOf(parser.group(index++))); position.setLatitude(Double.valueOf(parser.group(index++))); - + // Date - Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC")); + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); time.clear(); time.set(Calendar.YEAR, Integer.valueOf(parser.group(index++))); time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); -- cgit v1.2.3