aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2024-02-08 07:26:52 -0800
committerAnton Tananaev <anton@traccar.org>2024-02-08 07:26:52 -0800
commitfe771851995da97ffa2fb50e21bd437bca208eac (patch)
treeb15e7a6137af7e65003a5bf4a2dfcdea5b0a2f90
parent3f55f474fde34c8110b48cb1ac472671ca5f80fc (diff)
downloadtrackermap-server-fe771851995da97ffa2fb50e21bd437bca208eac.tar.gz
trackermap-server-fe771851995da97ffa2fb50e21bd437bca208eac.tar.bz2
trackermap-server-fe771851995da97ffa2fb50e21bd437bca208eac.zip
Support RST command responses
-rw-r--r--src/main/java/org/traccar/protocol/RstProtocolDecoder.java13
-rw-r--r--src/test/java/org/traccar/protocol/RstProtocolDecoderTest.java4
2 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/RstProtocolDecoder.java b/src/main/java/org/traccar/protocol/RstProtocolDecoder.java
index 2493f0d9f..eafa4d3d7 100644
--- a/src/main/java/org/traccar/protocol/RstProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/RstProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2019 - 2024 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -143,6 +143,17 @@ public class RstProtocolDecoder extends BaseProtocolDecoder {
return position;
+ } else if (type == 134) {
+
+ Position position = new Position(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ getLastLocation(position, null);
+
+ position.set(Position.KEY_RESULT, String.valueOf(type));
+
+ return position;
+
} else {
return null;
diff --git a/src/test/java/org/traccar/protocol/RstProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RstProtocolDecoderTest.java
index fc932fe9e..a750d0311 100644
--- a/src/test/java/org/traccar/protocol/RstProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/RstProtocolDecoderTest.java
@@ -12,6 +12,10 @@ public class RstProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new RstProtocolDecoder(null));
verifyAttribute(decoder, text(
+ "RST;A;RST-MINI-4Gv3;V9.10;009521405;1;134;FIM;"),
+ Position.KEY_RESULT, "134");
+
+ verifyAttribute(decoder, text(
"RST;A;RST-MINIv5;V9.08;009767055;248;55;14-12-2023 19:34:20;14-12-2023 19:34:21;-12.923640;-38.388313;0;14;17;1;4;15;00;B0;00;1A;02;12.18;4.02;65;21;FE;0000;01;C0;001606017031;0002;FIM;"),
Position.KEY_DRIVER_UNIQUE_ID, "001606017031");