diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-06-10 22:36:07 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-06-10 22:36:07 -0700 |
| commit | 0c7617fb36cd13a5649f62bb021689a833de89db (patch) | |
| tree | 5e7ca4d3cb1e14acbc0d27420ad4192c7da5d792 | |
| parent | a796c0317dc8c0598adb757eb6a77358c90767c3 (diff) | |
| download | traccar-server-0c7617fb36cd13a5649f62bb021689a833de89db.tar.gz traccar-server-0c7617fb36cd13a5649f62bb021689a833de89db.tar.bz2 traccar-server-0c7617fb36cd13a5649f62bb021689a833de89db.zip | |
Fix device id decoding
| -rw-r--r-- | src/main/java/org/traccar/protocol/CalAmpProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/CalAmpProtocolDecoderTest.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/CalAmpProtocolDecoder.java b/src/main/java/org/traccar/protocol/CalAmpProtocolDecoder.java index 31416d7f1..dad0ae774 100644 --- a/src/main/java/org/traccar/protocol/CalAmpProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/CalAmpProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2019 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. @@ -153,7 +153,7 @@ public class CalAmpProtocolDecoder extends BaseProtocolDecoder { int content = buf.readUnsignedByte(); if (BitUtil.check(content, 0)) { - String id = ByteBufUtil.hexDump(buf.readSlice(buf.readUnsignedByte())); + String id = ByteBufUtil.hexDump(buf.readSlice(buf.readUnsignedByte())).replace("f", ""); getDeviceSession(channel, remoteAddress, id); } diff --git a/src/test/java/org/traccar/protocol/CalAmpProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CalAmpProtocolDecoderTest.java index 5ed3f5dc8..7640484d4 100644 --- a/src/test/java/org/traccar/protocol/CalAmpProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/CalAmpProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class CalAmpProtocolDecoderTest extends ProtocolTest { CalAmpProtocolDecoder decoder = new CalAmpProtocolDecoder(null); verifyPosition(decoder, binary( + "8308352648068863398f01070102039c5cfc4dcd5cfc4dcd19913f5dcce1291e000033fa0000005801110800019aff9d6f0e13003e0b02000000000000000000")); + + verifyPosition(decoder, binary( "83051633033459010101028afd59ae7c1459ae7c140b06bbce2c01520e0000d916000001b900450900005affa50f091f00260d040000000f24000001b90000000000003714")); verifyPosition(decoder, binary( |