Merge branch 'master' into master

1 files changed, 53 insertions, 7 deletions

diff --git a/src/org/traccar/protocol/Vt200ProtocolDecoder.java b/src/org/traccar/protocol/Vt200ProtocolDecoder.java
index b9af11b43..2ae24efbb 100644
--- a/src/org/traccar/protocol/Vt200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Vt200ProtocolDecoder.java
@@ -27,6 +27,8 @@ import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
+import java.util.Arrays;
+import java.util.Date;
 
 public class Vt200ProtocolDecoder extends BaseProtocolDecoder {
 
@@ -40,6 +42,13 @@ public class Vt200ProtocolDecoder extends BaseProtocolDecoder {
         return degrees + minutes * 0.0001 / 60;
     }
 
+    protected Date decodeDate(ChannelBuffer buf) {
+        DateBuilder dateBuilder = new DateBuilder()
+                .setDateReverse(BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2))
+                .setTime(BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2));
+        return dateBuilder.getDate();
+    }
+
     @Override
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -57,7 +66,7 @@ public class Vt200ProtocolDecoder extends BaseProtocolDecoder {
         int type = buf.readUnsignedShort();
         buf.readUnsignedShort(); // length
 
-        if (type == 0x2084) {
+        if (type == 0x2086 || type == 0x2084 || type == 0x2082) {
 
             Position position = new Position();
             position.setProtocol(getProtocolName());
@@ -66,12 +75,7 @@ public class Vt200ProtocolDecoder extends BaseProtocolDecoder {
             buf.readUnsignedByte(); // data type
             buf.readUnsignedShort(); // trip id
 
-            DateBuilder dateBuilder = new DateBuilder();
-            dateBuilder.setDateReverse(
-                    BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2));
-            dateBuilder.setTime(
-                    BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2), BcdUtil.readInteger(buf, 2));
-            position.setTime(dateBuilder.getDate());
+            position.setTime(decodeDate(buf));
 
             position.setLatitude(decodeCoordinate(BcdUtil.readInteger(buf, 8)));
             position.setLongitude(decodeCoordinate(BcdUtil.readInteger(buf, 9)));
@@ -97,6 +101,48 @@ public class Vt200ProtocolDecoder extends BaseProtocolDecoder {
 
             return position;
 
+        } else if (type == 0x3088) {
+
+            Position position = new Position();
+            position.setProtocol(getProtocolName());
+            position.setDeviceId(deviceSession.getDeviceId());
+
+            getLastLocation(position, null);
+
+            buf.readUnsignedShort(); // trip id
+            buf.skipBytes(8); // imei
+            buf.skipBytes(8); // imsi
+
+            position.set("tripStart", decodeDate(buf).getTime());
+            position.set("tripEnd", decodeDate(buf).getTime());
+            position.set("drivingTime", buf.readUnsignedShort());
+
+            position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedInt());
+            position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedInt());
+
+            position.set("maxSpeed", UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+            position.set("maxRpm", buf.readUnsignedShort());
+            position.set("maxTemp", buf.readUnsignedByte() - 40);
+            position.set("hardAccelerationCount", buf.readUnsignedByte());
+            position.set("hardBrakingCount", buf.readUnsignedByte());
+
+            for (String speedType : Arrays.asList("over", "high", "normal", "low")) {
+                position.set(speedType + "SpeedTime", buf.readUnsignedShort());
+                position.set(speedType + "SpeedDistance", buf.readUnsignedInt());
+                position.set(speedType + "SpeedFuel", buf.readUnsignedInt());
+            }
+
+            position.set("idleTime", buf.readUnsignedShort());
+            position.set("idleFuel", buf.readUnsignedInt());
+
+            position.set("hardCorneringCount", buf.readUnsignedByte());
+            position.set("overspeedCount", buf.readUnsignedByte());
+            position.set("overheatCount", buf.readUnsignedShort());
+            position.set("laneChangeCount", buf.readUnsignedByte());
+            position.set("emergencyRefueling", buf.readUnsignedByte());
+
+            return position;
+
         }
 
         return null;