diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-11-25 22:05:43 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-11-25 22:06:41 +1300 |
| commit | 67f512fb2b481ebca78dab2163733ca2c3cef55a (patch) | |
| tree | 04bb23ec5ce1446dcbfbd1dc8ad44e26e627298b | |
| parent | 2c399889e9b61c8e3580c046a70b556e1ab628e3 (diff) | |
| download | traccar-server-67f512fb2b481ebca78dab2163733ca2c3cef55a.tar.gz traccar-server-67f512fb2b481ebca78dab2163733ca2c3cef55a.tar.bz2 traccar-server-67f512fb2b481ebca78dab2163733ca2c3cef55a.zip | |
Implement TK103 alarm messages support
| -rw-r--r-- | src/org/traccar/protocol/Tk103ProtocolDecoder.java | 5 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Tk103ProtocolDecoderTest.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index 6fa4edb06..e8d0d210d 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -154,6 +154,11 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { } position.setDeviceId(getDeviceId()); + int alarm = sentence.indexOf("BO01"); + if (alarm != -1) { + position.set(Event.KEY_ALARM, Integer.parseInt(sentence.substring(alarm + 4, alarm + 5))); + } + DateBuilder dateBuilder = new DateBuilder(); if (parser.next() == null) { dateBuilder.setDate(parser.nextInt(), parser.nextInt(), parser.nextInt()); diff --git a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java index 2bffbcd9a..c05d546ff 100644 --- a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java @@ -10,6 +10,9 @@ public class Tk103ProtocolDecoderTest extends ProtocolDecoderTest { Tk103ProtocolDecoder decoder = new Tk103ProtocolDecoder(new Tk103Protocol()); + verifyPosition(decoder, text( + "(013612345678BO012061830A2934.0133N10627.2544E040.0080331309.6200000000L000770AD")); + verifyAttributes(decoder, text( "(088047194605BZ00,510,010,36e6,932c,43,36e6,766b,36,36e6,7668,32")); |