diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-18 02:20:02 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-18 02:20:02 +1200 |
| commit | ca074b8dea7209293baf8513dfcf36e8d504f69b (patch) | |
| tree | cf98f56710f294701cdbd425ac8707e457126b5a | |
| parent | efaeab48fc6256f39625683a1f7c09745bac9f6f (diff) | |
| download | trackermap-server-ca074b8dea7209293baf8513dfcf36e8d504f69b.tar.gz trackermap-server-ca074b8dea7209293baf8513dfcf36e8d504f69b.tar.bz2 trackermap-server-ca074b8dea7209293baf8513dfcf36e8d504f69b.zip | |
Add new Watch message type
| -rw-r--r-- | src/org/traccar/protocol/WatchProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/WatchProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/org/traccar/protocol/WatchProtocolDecoder.java index 9d64776c3..dbd5072e7 100644 --- a/src/org/traccar/protocol/WatchProtocolDecoder.java +++ b/src/org/traccar/protocol/WatchProtocolDecoder.java @@ -166,7 +166,7 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder { } } - } else if (type.equals("UD") || type.equals("UD2") || type.equals("AL")) { + } else if (type.equals("UD") || type.equals("UD2") || type.equals("UD3") || type.equals("AL")) { if (type.equals("AL")) { sendResponse(channel, manufacturer, id, "AL"); diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java index 5a67d8013..9f402cef2 100644 --- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class WatchProtocolDecoderTest extends ProtocolTest { WatchProtocolDecoder decoder = new WatchProtocolDecoder(new WatchProtocol()); verifyPosition(decoder, text( + "[3G*8308406279*00CC*UD3,170417,190930,V,54.739618,N,25.273213,E,0.0,323.53,175.1,6,51,83,0,0,00000000,1,1,246,01,200,13242758,51,3,TEO-189835,00:8c:54:58:1d:64,-84,Cgates_7137,78:54:2e:e3:71:37,-85,ASUS,9c:5c:8e:b8:d4:78,-93]")); + + verifyPosition(decoder, text( "[SG*9051004074*0058*AL,120117,145602,V,40.058413,N,76.336618,W,11.519,188,99,00,01,80,0,50,00000000,0,1,0,0,,10]")); verifyPosition(decoder, text( |