aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-08 11:22:36 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-08 11:22:36 +1200
commit55e6cc495cb92fd9ca24895c27f73324306c4dd6 (patch)
tree17882cfcae94a97c429bf50a9ee49c8100db8729
parent5f78e9bdec2426de91b3fcf8a3c09c14fc5bf8b9 (diff)
downloadtraccar-server-55e6cc495cb92fd9ca24895c27f73324306c4dd6.tar.gz
traccar-server-55e6cc495cb92fd9ca24895c27f73324306c4dd6.tar.bz2
traccar-server-55e6cc495cb92fd9ca24895c27f73324306c4dd6.zip
Decode TK103 additional status (fix #1353)
-rw-r--r--src/org/traccar/protocol/Tk103ProtocolDecoder.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
index f4a62a99e..3885ee2ef 100644
--- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.Context;
+import org.traccar.helper.BitUtil;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Event;
import org.traccar.model.Position;
@@ -33,7 +34,6 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
super(protocol);
}
- //088048003342 BR00 150807 A 1352.9871 N 10030.9084 E 000.0 110718 000.0 001010000 L00000000
private static final Pattern pattern = Pattern.compile(
"(\\d+)(,)?" + // Device ID
".{4},?" + // Command
@@ -46,7 +46,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
"([EW]),?" +
"(\\d+\\.\\d)(?:\\d*,)?" + // Speed
"(\\d{2})(\\d{2})(\\d{2}),?" + // Time (HHMMSS)
- "(\\d+\\.?\\d),?" + // Course
+ "(\\d+\\.?\\d+),?" + // Course
"([0-9a-fA-F]{8})?,?" + // State
"(?:L([0-9a-fA-F]+))?.*\\)?"); // Odometer
@@ -137,7 +137,14 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(Double.valueOf(parser.group(index++)));
// State
- position.set(Event.KEY_STATUS, parser.group(index++));
+ String status = parser.group(index++);
+ if (status != null) {
+ position.set(Event.KEY_STATUS, status);
+
+ int value = Integer.parseInt(status, 2);
+ position.set(Event.KEY_CHARGE, !BitUtil.check(value, 0));
+ position.set(Event.KEY_IGNITION, BitUtil.check(value, 1));
+ }
// Odometer
String odometer = parser.group(index++);