diff options
| author | ian <ian@DESKTOP-JGEKPVQ> | 2019-10-29 17:46:35 +0000 |
|---|---|---|
| committer | ian <ian@DESKTOP-JGEKPVQ> | 2019-10-29 17:46:35 +0000 |
| commit | ee54c85227835946ddf5012c45fe43119cf93848 (patch) | |
| tree | 13647fe511142e8b8931b9301d1fb808d71d107c | |
| parent | 3e36fcdb303f4c7af2df8e859f8fc6b1c7ba3fd0 (diff) | |
| download | trackermap-server-ee54c85227835946ddf5012c45fe43119cf93848.tar.gz trackermap-server-ee54c85227835946ddf5012c45fe43119cf93848.tar.bz2 trackermap-server-ee54c85227835946ddf5012c45fe43119cf93848.zip | |
Allow negative number in cell data (signal strength?)
| -rw-r--r-- | src/main/java/org/traccar/protocol/H02ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java b/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java index 137689a67..3143a7c43 100644 --- a/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java @@ -223,7 +223,7 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder { .number("(d+),") // mnc .number("d+,") // gsm delay time .number("d+,") // count - .number("((?:d+,d+,d+,)+)") // cells + .number("((?:d+,d+,-?d+,)+)") // cells .number("(dd)(dd)(dd),") // date (ddmmyy) .number("(x{8})") // status .any() diff --git a/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java index 31e4f2dee..45d09a274 100644 --- a/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java @@ -100,6 +100,9 @@ public class H02ProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, buffer( "*HQ,4208150188,NBR,210249,260,6,0,7,1014,50675,37,1014,50633,27,1014,17933,18,1014,17231,15,1014,50632,12,1014,13211,11,1014,17031,10,281216,FFFFFBFF,2#")); + + verifyAttributes(decoder, buffer( + "*HQ,7401004662,NBR,160453,234,10,0,2,21580,27766,-67,21580,27766,-67,291019,FFFFFBFF,6#")); verifyAttributes(decoder, buffer( "*HQ,1600068812,NBR,141335,262,02,255,6,431,17003,26,431,11101,13,431,6353,13,431,22172,13,431,11093,13,431,60861,10,151216,FFFFFBFF#")); |