diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-10-17 11:23:02 +0900 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-10-17 11:36:55 +0900 |
| commit | 05c304a8bb54bac4cbb7118be9add82f6daa1151 (patch) | |
| tree | 2b1f31f361119dba0e698a6137cceca85634e82e | |
| parent | 812e65bc6a96fdb6d9d384a9e7679795f528146c (diff) | |
| download | trackermap-server-05c304a8bb54bac4cbb7118be9add82f6daa1151.tar.gz trackermap-server-05c304a8bb54bac4cbb7118be9add82f6daa1151.tar.bz2 trackermap-server-05c304a8bb54bac4cbb7118be9add82f6daa1151.zip | |
Support new message type
| -rw-r--r-- | src/main/java/org/traccar/protocol/WatchProtocolDecoder.java | 3 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java b/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java index 3f2156dc2..0647afdee 100644 --- a/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java @@ -249,8 +249,7 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder { } } - } else if (type.equals("UD") || type.equals("UD2") || type.equals("UD3") - || type.equals("AL") || type.equals("WT")) { + } else if (type.startsWith("UD") || type.equals("AL") || type.equals("WT")) { Position position = decodePosition(deviceSession, buf.toString(StandardCharsets.US_ASCII)); diff --git a/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java index c3f27f0a7..c5753dc4d 100644 --- a/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java @@ -16,6 +16,9 @@ public class WatchProtocolDecoderTest extends ProtocolTest { WatchProtocolDecoder decoder = new WatchProtocolDecoder(null); verifyPosition(decoder, buffer( + "[3G*2104134718*00A1*UD_WCDMA,161019,134938,A,43.373367,N,71.157615,W,22.0,350.206,279.717,17,28,79,0,0,00000000,1,1,310,410,23999,132013696,28,1,Home2,60:45:cb:cb:34:68,-93,8.263865]")); + + verifyPosition(decoder, buffer( "[ZJ*014111001332708*0075*0064*AL,040418,052156,A,22.536207,N,113.938673,E,0,0,0,5,100,82,1000,50,00100000,1,255,460,0,9340,3663,35]")); verifyPosition(decoder, buffer( |