From 88e777a2ceb50e34dbe9577237483d8d3cebf346 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 4 May 2015 10:53:27 +1200 Subject: Create other data keys --- src/org/traccar/protocol/Tk103ProtocolDecoder.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/org/traccar/protocol/Tk103ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index 948fd9fd5..7a3a048fe 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -24,6 +24,7 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.traccar.BaseProtocolDecoder; +import org.traccar.model.Event; import org.traccar.model.Position; public class Tk103ProtocolDecoder extends BaseProtocolDecoder { @@ -46,7 +47,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { "(\\d{2})(\\d{2})(\\d{2}),?" + // Time (HHMMSS) "(\\d+\\.?\\d+),?" + // Course "([0-9a-fA-F]{8})?,?" + // State - "(?:L([0-9a-fA-F]+))?\\)?"); // Milage + "(?:L([0-9a-fA-F]+))?\\)?"); // Odometer @Override protected Object decode( @@ -133,10 +134,10 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { // State position.set("state", parser.group(index++)); - // Milage - String milage = parser.group(index++); - if (milage != null) { - position.set("milage", Long.parseLong(milage, 16)); + // Odometer + String odometer = parser.group(index++); + if (odometer != null) { + position.set(Event.KEY_ODOMETER, Long.parseLong(odometer, 16)); } return position; } -- cgit v1.2.3