From 0130b9093bca894268493d27173e8ecac02c0179 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 7 Jul 2019 12:38:28 -0700
Subject: Decode OBD data

---
 .../traccar/protocol/HuaShengProtocolDecoder.java  | 32 +++++++++++++++++++---
 .../protocol/HuaShengProtocolDecoderTest.java      |  3 ++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
index 8a937a194..9449e2d5c 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -83,7 +83,7 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
                 int subtype = buf.readUnsignedShort();
                 int length = buf.readUnsignedShort() - 4;
                 if (subtype == 0x0003) {
-                    String imei = buf.readSlice(length).toString(StandardCharsets.US_ASCII);
+                    String imei = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
                     DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, imei);
                     if (deviceSession != null && channel != null) {
                         ByteBuf content = Unpooled.buffer();
@@ -117,7 +117,7 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
             position.set(Position.KEY_IGNITION, BitUtil.check(status, 14));
             position.set(Position.KEY_EVENT, buf.readUnsignedShort());
 
-            String time = buf.readSlice(12).toString(StandardCharsets.US_ASCII);
+            String time = buf.readCharSequence(12, StandardCharsets.US_ASCII).toString();
 
             DateBuilder dateBuilder = new DateBuilder()
                     .setYear(Integer.parseInt(time.substring(0, 2)))
@@ -138,9 +138,33 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
             position.set(Position.KEY_ODOMETER, buf.readUnsignedShort() * 1000);
 
             while (buf.readableBytes() > 4) {
-                buf.readUnsignedShort(); // subtype
+                int subtype = buf.readUnsignedShort();
                 int length = buf.readUnsignedShort() - 4;
-                buf.skipBytes(length);
+                switch (subtype) {
+                    case 0x0001:
+                        position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedByte() - 40);
+                        position.set(Position.KEY_RPM, buf.readUnsignedShort());
+                        position.set("averageSpeed", buf.readUnsignedByte());
+                        buf.readUnsignedShort(); // interval fuel consumption
+                        position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShort() * 0.01);
+                        position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedShort());
+                        position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
+                        position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.4);
+                        buf.readUnsignedInt(); // trip id
+                        break;
+                    case 0x0005:
+                        position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+                        position.set(Position.KEY_HDOP, buf.readUnsignedByte());
+                        buf.readUnsignedInt(); // run time
+                        break;
+                    case 0x0009:
+                        position.set(
+                                Position.KEY_VIN, buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
+                        break;
+                    default:
+                        buf.skipBytes(length);
+                        break;
+                }
             }
 
             sendResponse(channel, MSG_POSITION_RSP, index, null);
diff --git a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
index 319d34e4c..6033bc744 100644
--- a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
@@ -16,6 +16,9 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(
                 "c000000077aa0200000000000e000100143347315f48312e315f56312e30372e54000300133335353835353035303434303635380004000b3531323030303000050005010006000400070004000800050000090018383936313032353431343533333239313833360d000a000f796573696e7465726e6574c0"));
 
+        verifyPosition(decoder, binary(
+                "c000000060aa000000000000fa8000000031393037303431363434323700e9900affd61c1b00000000003a000000010015ffffff0000000000000004c2ffffffffff0005000a0d080000ca6a000900155741555a5a5a344730454e313133373233c0"));
+
         verifyPosition(decoder, binary(
                 "c00000004baa0000000000000f8000000031363130323030373236333600e6d4f9ffcc78c700000022003600000001001500000000000000000000059bffffffffff0005000a040300000253c0"));
 
-- 
cgit v1.2.3