From f7198adaf371e08a72a837d417b29531c117c6ba Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 29 Apr 2015 13:41:15 +1200 Subject: Store other data in position --- src/org/traccar/protocol/Xt013ProtocolDecoder.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/org/traccar/protocol/Xt013ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Xt013ProtocolDecoder.java b/src/org/traccar/protocol/Xt013ProtocolDecoder.java index e471ea349..c1e1c3e65 100644 --- a/src/org/traccar/protocol/Xt013ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xt013ProtocolDecoder.java @@ -18,14 +18,10 @@ package org.traccar.protocol; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.traccar.BaseProtocolDecoder; -import org.traccar.database.DataManager; -import org.traccar.helper.Log; -import org.traccar.model.ExtendedInfoFormatter; import org.traccar.model.Position; import java.text.ParseException; import java.util.Calendar; -import java.util.Properties; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -73,7 +69,7 @@ public class Xt013ProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + position.setProtocol(getProtocol()); Integer index = 1; @@ -103,12 +99,10 @@ public class Xt013ProtocolDecoder extends BaseProtocolDecoder { position.setValid(parser.group(index++).equals("F")); // Other - extendedInfo.set("gps", parser.group(index++)); - extendedInfo.set("gsm", parser.group(index++)); - extendedInfo.set("battery", parser.group(index++)); - extendedInfo.set("charging", parser.group(index++)); - - position.setExtendedInfo(extendedInfo.toString()); + position.set("gps", parser.group(index++)); + position.set("gsm", parser.group(index++)); + position.set("battery", parser.group(index++)); + position.set("charging", parser.group(index++)); return position; } -- cgit v1.2.3