aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2022-01-24 22:13:47 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2022-01-24 22:13:47 -0800
commitfd536f9e0dd33807a3638a0a134dfd97f18a096c (patch)
tree677c230bdfb2ef771dbe2cbc4b069b4879a7c2c3
parent5a854ce946cc49dbb176b5a436a1b1d6673ba096 (diff)
downloadtrackermap-server-fd536f9e0dd33807a3638a0a134dfd97f18a096c.tar.gz
trackermap-server-fd536f9e0dd33807a3638a0a134dfd97f18a096c.tar.bz2
trackermap-server-fd536f9e0dd33807a3638a0a134dfd97f18a096c.zip
Fix DSF22 decoding
-rw-r--r--src/main/java/org/traccar/protocol/Dsf22ProtocolDecoder.java13
-rw-r--r--src/test/java/org/traccar/protocol/Dsf22ProtocolDecoderTest.java5
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/protocol/Dsf22ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Dsf22ProtocolDecoder.java
index d5a9df7bc..3ef960f12 100644
--- a/src/main/java/org/traccar/protocol/Dsf22ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Dsf22ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2021 - 2022 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.
@@ -16,7 +16,6 @@
package org.traccar.protocol;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
@@ -46,7 +45,7 @@ public class Dsf22ProtocolDecoder extends BaseProtocolDecoder {
buf.skipBytes(2); // header
- String id = ByteBufUtil.hexDump(buf.readSlice(2));
+ String id = String.valueOf(buf.readUnsignedShortLE());
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
if (deviceSession == null) {
return null;
@@ -61,12 +60,12 @@ public class Dsf22ProtocolDecoder extends BaseProtocolDecoder {
position.setDeviceId(deviceSession.getDeviceId());
position.setValid(true);
- position.setLatitude(buf.readInt());
- position.setLongitude(buf.readInt());
- position.setTime(new Date(946684800000L + buf.readUnsignedInt()));
+ position.setLatitude(buf.readIntLE() / 10000000.0);
+ position.setLongitude(buf.readIntLE() / 10000000.0);
+ position.setTime(new Date(buf.readUnsignedIntLE() * 1000));
position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
- position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedShort() * 0.001);
+ position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedShortLE() * 0.001);
int status = buf.readUnsignedByte();
position.set(Position.KEY_IGNITION, BitUtil.check(status, 0));
diff --git a/src/test/java/org/traccar/protocol/Dsf22ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Dsf22ProtocolDecoderTest.java
index 96cd78f03..4089c208c 100644
--- a/src/test/java/org/traccar/protocol/Dsf22ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Dsf22ProtocolDecoderTest.java
@@ -1,10 +1,8 @@
package org.traccar.protocol;
-import org.junit.Ignore;
import org.junit.Test;
import org.traccar.ProtocolTest;
-@Ignore
public class Dsf22ProtocolDecoderTest extends ProtocolTest {
@Test
@@ -13,6 +11,9 @@ public class Dsf22ProtocolDecoderTest extends ProtocolTest {
var decoder = new Dsf22ProtocolDecoder(null);
verifyPositions(decoder, binary(
+ "4642a82d01c8f6aa1af1792c0c1411eb61001e0000"));
+
+ verifyPositions(decoder, binary(
"4642000101A8EE5F0ECA5FF421B33F524E32610401"));
verifyPositions(decoder, binary(