diff options
| author | Abdelrahman Mousa <109462679+sherbinator@users.noreply.github.com> | 2023-10-06 15:12:44 +0200 |
|---|---|---|
| committer | Abdelrahman Mousa <109462679+sherbinator@users.noreply.github.com> | 2023-10-06 15:12:44 +0200 |
| commit | 47897420cd24c99a74d8b9d84cc289a3f260d3df (patch) | |
| tree | 882596a6cfcf753fec2af8a1c2c05debb784d994 | |
| parent | 945f5753595b1e413df2b13c1ffa2a6458556ce0 (diff) | |
| download | trackermap-server-47897420cd24c99a74d8b9d84cc289a3f260d3df.tar.gz trackermap-server-47897420cd24c99a74d8b9d84cc289a3f260d3df.tar.bz2 trackermap-server-47897420cd24c99a74d8b9d84cc289a3f260d3df.zip | |
(Refactor-T800X Protocol) messages response for 0x2323
| -rw-r--r-- | src/main/java/org/traccar/protocol/T800xProtocolDecoder.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java index 3353bc57d..ac1108a64 100644 --- a/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java @@ -163,12 +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) { - - if (header == 0x2323) { - sendResponse(channel, header, type, 0x0001, imei, 0); - } else { - sendResponse(channel, header, type, index, imei, 0); - } + var serial = header == 0x2323 ? 0x0001 : index; + sendResponse(channel, header, type, serial, imei, 0); } if (positionType) { @@ -523,12 +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) { - - if (header == 0x2323) { - sendResponse(channel, header, type, 0x0001, imei, alarm); - } else { - sendResponse(channel, header, type, index, imei, alarm); - } + var serial = header == 0x2323 ? 0x0001 : index; + sendResponse(channel, header, type, serial, imei, alarm); } return position; |