aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-01-31 12:30:22 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-01-31 12:30:22 +1300
commit9c44e3140ed8ae00c9459347ae6f2819affe149c (patch)
treecb9c85c26aca56070d8c9766b1e2b2a0b2139f8a
parent0ee8100a5535f2d44802919a2a7bb3cec1e547af (diff)
downloadtraccar-server-9c44e3140ed8ae00c9459347ae6f2819affe149c.tar.gz
traccar-server-9c44e3140ed8ae00c9459347ae6f2819affe149c.tar.bz2
traccar-server-9c44e3140ed8ae00c9459347ae6f2819affe149c.zip
Handle login message (fix #1035)
-rw-r--r--src/org/traccar/protocol/Xt013ProtocolDecoder.java1
-rw-r--r--test/org/traccar/protocol/Xt013ProtocolDecoderTest.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/Xt013ProtocolDecoder.java b/src/org/traccar/protocol/Xt013ProtocolDecoder.java
index 493955195..85048a93f 100644
--- a/src/org/traccar/protocol/Xt013ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Xt013ProtocolDecoder.java
@@ -37,6 +37,7 @@ public class Xt013ProtocolDecoder extends BaseProtocolDecoder {
}
private static final Pattern pattern = Pattern.compile(
+ "(?:HI,\\d+)?" +
"TK," +
"(\\d+)," + // IMEI
"(\\d{2})(\\d{2})(\\d{2})" + // Date (YYMMDD)
diff --git a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
index db375ad19..32d0c55c2 100644
--- a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
@@ -14,6 +14,9 @@ public class Xt013ProtocolDecoderTest {
verify(decoder.decode(null, null,
"TK,862950021650364,150118113832,+53.267722,+5.767143,0,86,12,0,F,204,08,C94,336C,22,,4.21,1,,,,,,,,"));
+
+ verify(decoder.decode(null, null,
+ "HI,862950021650364TK,862950021650364,150118113832,+53.267722,+5.767143,0,86,12,0,F,204,08,C94,336C,22,,4.21,1,,,,,,,,"));
}