diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2020-07-12 10:34:23 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2020-07-12 10:34:23 -0700 |
| commit | f4855e513e121b59e923af0da8d129007349c639 (patch) | |
| tree | 68558f554e0f18320e93de6bc80c59004e6953f3 | |
| parent | 4f6e68ad5a14b128258e68fd819406dbea585d7f (diff) | |
| download | trackermap-server-f4855e513e121b59e923af0da8d129007349c639.tar.gz trackermap-server-f4855e513e121b59e923af0da8d129007349c639.tar.bz2 trackermap-server-f4855e513e121b59e923af0da8d129007349c639.zip | |
Fix ICCID decoding
| -rw-r--r-- | src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java index 859d850d1..c0e9541a4 100644 --- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -887,7 +887,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { } else if (subType == 0x0a) { buf.skipBytes(8); // imei buf.skipBytes(8); // imsi - position.set(Position.KEY_ICCID, ByteBufUtil.hexDump(buf.readSlice(8))); + position.set(Position.KEY_ICCID, ByteBufUtil.hexDump(buf.readSlice(10)).replaceAll("f", "")); return position; } else if (subType == 0x0d) { if (buf.getByte(buf.readerIndex()) != '!') { diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java index 3e022765e..46d6a6dab 100644 --- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java @@ -17,6 +17,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest { verifyNull(decoder, binary( "78780D01086471700328358100093F040D0A")); + verifyAttribute(decoder, binary( + "79790020940a035985708236675805200502187214018966051912408052452f000355560d0a"), + Position.KEY_ICCID, "8966051912408052452"); + verifyPosition(decoder, binary( "7878252612030C063816C3026C10540C38C9700144030901CC002866000EEE0C06040302000DA2DB0D0A")); |