diff options
| author | Anton Tananaev <anton@traccar.org> | 2024-07-10 07:45:25 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2024-07-10 07:45:25 -0700 |
| commit | 12a6b088cc478f1b2aff363534c87ca0a6a27815 (patch) | |
| tree | 138fbfb6fd23d281f3aca828ba45b2ba9f29b8ee /src | |
| parent | b1a8f303c90f087dcefdabfd06c3d312aa1f6212 (diff) | |
| download | trackermap-server-12a6b088cc478f1b2aff363534c87ca0a6a27815.tar.gz trackermap-server-12a6b088cc478f1b2aff363534c87ca0a6a27815.tar.bz2 trackermap-server-12a6b088cc478f1b2aff363534c87ca0a6a27815.zip | |
No response for AP12 result
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/traccar/protocol/TrvProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java b/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java index 2f2b7d8c2..e39b17307 100644 --- a/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java @@ -180,7 +180,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder { channel.writeAndFlush(new NetworkMessage(responseHeader + "," + time + ",0#", remoteAddress)); } else if (type.equals("AP14")) { channel.writeAndFlush(new NetworkMessage(responseHeader + ",0.000,0.000#", remoteAddress)); - } else if (!sentence.substring(responseHeader.length() + 1).matches("^\\d{6}$")) { + } else if (!type.equals("AP12") && !sentence.substring(responseHeader.length() + 1).matches("^\\d{6}$")) { channel.writeAndFlush(new NetworkMessage(responseHeader + "#", remoteAddress)); } } diff --git a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java index 2757064e4..944b684d0 100644 --- a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java @@ -99,6 +99,9 @@ public class TrvProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "TRVYP14220217A5235.7885N00724.1840E000.0130919177.561000050660000200004,262,01,14635,52789,FritzBox7|DC-39-8F-7E-94-73|-89&FritzBox7|24-4E-5D-71-C3-9C|-90&MY_IOT|80-B4-F7-77-9C-7C|-81&MYAP|44-D4-F7-77-9C-7C|-80#")); + verifyNull(decoder, text( + "IWAP12,080835,+491773329827,+491773329826,+49306618438")); + } } |