diff options
author | Anton Tananaev <anton@traccar.org> | 2023-07-17 21:00:44 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2023-07-17 21:00:44 -0700 |
commit | 3642b952086355f5f2a52f7dc9b2cdfea4c02e31 (patch) | |
tree | 1d2aec72cf6d5f26be38a2dbaf3f733a73a1feda | |
parent | 74d73a9dc28fc608117c04da4652d43f633a72c5 (diff) | |
download | trackermap-server-3642b952086355f5f2a52f7dc9b2cdfea4c02e31.tar.gz trackermap-server-3642b952086355f5f2a52f7dc9b2cdfea4c02e31.tar.bz2 trackermap-server-3642b952086355f5f2a52f7dc9b2cdfea4c02e31.zip |
Handle HS-5000 cell id
-rw-r--r-- | src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java | 2 | ||||
-rw-r--r-- | src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java index 2fb7c6e92..1ad27be5f 100644 --- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java @@ -284,7 +284,7 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder { String[] values = cell.split("@"); network.addCellTower(CellTower.from( Integer.parseInt(values[0]), Integer.parseInt(values[1]), - Integer.parseInt(values[2], 16), Integer.parseInt(values[3], 16))); + Integer.parseInt(values[2], 16), Long.parseLong(values[3], 16))); } break; case 0x0021: diff --git a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java index fe4b077c6..a54fa53c6 100644 --- a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java @@ -32,6 +32,9 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest { Position.KEY_HOURS, 58.7); verifyNotNull(decoder, binary( + "c0000000b1aa000000000000050000000031393730303130313134303200000000000000000000000000000000000100180000000000000000000000000000000000c57e000005000a1a000000c569000900155756575a5a5a43445a4e57313139313534000f00133836393733313035313339393231300010000c302e30303030303000110008000000000014000bf800002800000000150006000000200016353035403031403040313337313931363831c0")); + + verifyNotNull(decoder, binary( "c000000077aa00000000000070020000003230303132373035313635330000000000000000000000000000000000010015ffffffff000000000000019dffffffffff0005000a1f00000e455a00200019313238354031406666666540386233663930634030000f0013333536373236313038313335343530c0")); verifyPosition(decoder, binary( |