diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-08-20 09:51:21 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-08-20 09:51:21 +1200 |
| commit | c815113b89067b6772f63ff8548b59367145bf46 (patch) | |
| tree | 2aea429a3ecad49e27ff34172cc4822f4fb1b5f5 | |
| parent | d369f6597afb08daeaf71d1d9b4961000249c651 (diff) | |
| download | trackermap-server-c815113b89067b6772f63ff8548b59367145bf46.tar.gz trackermap-server-c815113b89067b6772f63ff8548b59367145bf46.tar.bz2 trackermap-server-c815113b89067b6772f63ff8548b59367145bf46.zip | |
Fix Atrack binary decoding issue
| -rw-r--r-- | debug.xml | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/AtrackProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/AtrackProtocolDecoderTest.java | 3 |
3 files changed, 6 insertions, 1 deletions
@@ -19,4 +19,6 @@ <entry key='database.user'>sa</entry> <entry key='database.password'></entry> + <entry key='atrack.custom'>true</entry> + </properties> diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/org/traccar/protocol/AtrackProtocolDecoder.java index 17b0466b1..1b10f7fa1 100644 --- a/src/org/traccar/protocol/AtrackProtocolDecoder.java +++ b/src/org/traccar/protocol/AtrackProtocolDecoder.java @@ -283,7 +283,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder { buf.skipBytes(6); // maximum g force break; case "ME": - readString(buf); // imei + buf.readLong(); // imei break; case "IA": buf.readUnsignedByte(); // intake air temperature diff --git a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java index 986b764d3..36af35063 100644 --- a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java @@ -35,6 +35,9 @@ public class AtrackProtocolDecoderTest extends ProtocolTest { decoder.setCustom(true); verifyPositions(decoder, binary( + "4050b63b02c401af000144a77a21281d5b79d8ef5b79d8ef5b79d8f0fab84831029f35580056020003144d00080100130000000007d007d00025434925434525434e25475125475325464c254d4c25564e25504425464325454c254554254344254154254d46254d5625425625434d25445425474c25474e254756254c43254d4525524c25525025534125534d255452254941254d5000000000000004bbf41f0900003254314b5233324532384337303631383500000000000053005f3839303132363038383132313532343737353900000000fd078e0085002900011a2e3da1882700687474703a2f2f6d6170732e676f6f676c652e636f6d2f6d6170733f713d34332e3938383331322c2d38382e35383631383920000013ff4e04190023ff13041100a3ffdc0402009affde03fc00a4ffe3040c0093ffab03ee004dffbb04130012ff7a04180010ff6e04100037ff4d0402ffd8000c04140000000144a77a21281d0009470c00131b2b005b79d8f05b79d8f05b79d8f0fab8488e029f356f0043020003144d00080100170000000007d007d00025434925434525434e25475125475325464c254d4c25564e25504425464325454c254554254344254154254d46254d5625425625434d25445425474c25474e254756254c43254d4525524c25525025534125534d255452254941254d5000000000000004bbf41f0900003254314b5233324532384337303631383500000000000052005f3839303132363038383132313532343737353900000000fd09190085002900011a2e3da1882700687474703a2f2f6d6170732e676f6f676c652e636f6d2f6d6170733f713d34332e3938383333352c2d38382e35383630393820000013ff4e04190023ff1304110017ff0c0424000cff30041a00a4ffe3040c0093ffab03ee004dffbb04130012ff7a04180010ff6e04100037ff4d0402ffd8000c04140000000144a77a21281d0009470c00171c2b00")); + + verifyPositions(decoder, binary( "405ad77c01670410000144a77a21281d5b74d2335b74d2335b74d233fabaf3bc02a38d3d010c0200030f8e000701001a0000000007d007d00025434925434525434e25475125475325464c254d4c25564e25504425464325454c254554254344254154254d46254d5625425625434d25445425474c25474e254756254c43254d4525524c25525025534125534d255452254941254d5000000000000004bbf41c0900003254314b523332453238433730363138350000000000004800543839303132363038383132313532343737353900000000ec06a50089002900011a2e3da1882700687474703a2f2f6d6170732e676f6f676c652e636f6d2f6d6170733f713d34342e3237323935372c2d38382e34313132303120000075ff4903fb006fff63040a004dff5d04080030ffa10407003b001304060026000503f9001e002504020078ff6204000073ff7d03f9007aff6903f3ffc0001804040000000144a77a21281d00073f0c001a182400")); verifyPositions(decoder, buffer( |