aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2023-10-06 17:39:13 -0500
committerGitHub <noreply@github.com>2023-10-06 17:39:13 -0500
commit0a5eb9c2b2c4ea767359645d35439c892f7f0774 (patch)
tree882596a6cfcf753fec2af8a1c2c05debb784d994 /src/main
parent91cfe0412753cadb47a0b892864469a2baf4fe31 (diff)
parent47897420cd24c99a74d8b9d84cc289a3f260d3df (diff)
downloadtrackermap-server-0a5eb9c2b2c4ea767359645d35439c892f7f0774.tar.gz
trackermap-server-0a5eb9c2b2c4ea767359645d35439c892f7f0774.tar.bz2
trackermap-server-0a5eb9c2b2c4ea767359645d35439c892f7f0774.zip
Merge pull request #5192 from sherbinator/master
(Bugfix-T800X Protocol) Fix messages response for 0x2323
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/traccar/protocol/T800xProtocolDecoder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java
index a1093fc32..ac1108a64 100644
--- a/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java
@@ -163,7 +163,8 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder {
boolean positionType = type == MSG_GPS || type == MSG_GPS_2 || type == MSG_ALARM || type == MSG_ALARM_2;
if (!positionType) {
- sendResponse(channel, header, type, index, imei, 0);
+ var serial = header == 0x2323 ? 0x0001 : index;
+ sendResponse(channel, header, type, serial, imei, 0);
}
if (positionType) {
@@ -518,7 +519,8 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder {
boolean acknowledgement = AttributeUtil.lookup(
getCacheManager(), Keys.PROTOCOL_ACK.withPrefix(getProtocolName()), deviceSession.getDeviceId());
if (acknowledgement || type == MSG_ALARM || type == MSG_ALARM_2) {
- sendResponse(channel, header, type, index, imei, alarm);
+ var serial = header == 0x2323 ? 0x0001 : index;
+ sendResponse(channel, header, type, serial, imei, alarm);
}
return position;