diff options
Diffstat (limited to 'src/org/traccar/protocol/WondexProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/WondexProtocolDecoder.java | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java index 98b75b0d2..cf4a3fedd 100644 --- a/src/org/traccar/protocol/WondexProtocolDecoder.java +++ b/src/org/traccar/protocol/WondexProtocolDecoder.java @@ -16,7 +16,6 @@ package org.traccar.protocol; import java.util.Calendar; -import java.util.Properties; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -25,9 +24,6 @@ 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; public class WondexProtocolDecoder extends BaseProtocolDecoder { @@ -68,7 +64,7 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + position.setProtocol(getProtocol()); int index = 1; // Device identifier @@ -98,28 +94,26 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder { // Satellites int satellites = Integer.valueOf(parser.group(index++)); position.setValid(satellites >= 3); - extendedInfo.set("satellites", satellites); + position.set("satellites", satellites); // Event - extendedInfo.set("event", parser.group(index++)); + position.set("event", parser.group(index++)); // Battery - extendedInfo.set("battery", parser.group(index++)); + position.set("battery", parser.group(index++)); // Milage - extendedInfo.set("milage", parser.group(index++)); + position.set("milage", parser.group(index++)); // Input - extendedInfo.set("input", parser.group(index++)); + position.set("input", parser.group(index++)); // ADC - extendedInfo.set("adc1", parser.group(index++)); - extendedInfo.set("adc2", parser.group(index++)); + position.set("adc1", parser.group(index++)); + position.set("adc2", parser.group(index++)); // Output - extendedInfo.set("output", parser.group(index++)); - - position.setExtendedInfo(extendedInfo.toString()); + position.set("output", parser.group(index++)); return position; } |