diff options
| author | Anton Tananaev <anton@traccar.org> | 2023-03-23 09:38:30 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2023-03-23 09:38:30 -0700 |
| commit | 7c2f9e56ba5f699d22ec2939408357b5a220bacc (patch) | |
| tree | 0268679f8e14a7b76ecf8554d4a73b4427580482 | |
| parent | f73263da4800f86203e1aa425b0b7d3243d4b7c3 (diff) | |
| download | trackermap-server-7c2f9e56ba5f699d22ec2939408357b5a220bacc.tar.gz trackermap-server-7c2f9e56ba5f699d22ec2939408357b5a220bacc.tar.bz2 trackermap-server-7c2f9e56ba5f699d22ec2939408357b5a220bacc.zip | |
Fix Wialon parameter decoding
| -rw-r--r-- | src/main/java/org/traccar/protocol/WialonProtocolDecoder.java | 3 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java index ffa4472ef..4d1b34dba 100644 --- a/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java @@ -63,8 +63,9 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder { .number("(?:NA|(d+));") // outputs .expression("(?:NA|([^;]*));") // adc .expression("(?:NA|([^;]*));") // ibutton - .expression("(?:NA|(.*))") // params + .expression("(?:NA|([^;]*))") // params .groupEnd("?") + .any() .compile(); private void sendResponse(Channel channel, SocketAddress remoteAddress, String type, Integer number) { diff --git a/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java index e67a798ff..b7c422456 100644 --- a/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java @@ -13,6 +13,10 @@ public class WialonProtocolDecoderTest extends ProtocolTest { verifyNull(decoder, text( "#L#2.0;42001300083;;CE45")); + verifyAttribute(decoder, text( + "#D#220323;114150;2234.80479;N;11354.87786;E;0;NA;59;11;NA;NA;NA;;NA;d_battr:1:94,d_csq:1:21,di_light:1:1;E7C9"), + "di_light", 1.0); + verifyAttributes(decoder, text( "#D#NA;NA;5429.681944502211763;N;02654.60403650999069;E;NA;NA;NA;NA;NA;NA;NA;1.0;NA;m1:1:9196679,d1:1:15397,t1:1:20,b1:1:162,fuel1:2:21588.0,pv1:2:35.98,finish:1:1;0x9b0")); |