Merge branch 'master' into master

1 files changed, 96 insertions, 15 deletions

diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/org/traccar/protocol/EelinkProtocolDecoder.java
index 0f6551cc3..8d0f8016a 100644
--- a/src/org/traccar/protocol/EelinkProtocolDecoder.java
+++ b/src/org/traccar/protocol/EelinkProtocolDecoder.java
@@ -96,6 +96,22 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
         }
     }
 
+    private void decodeStatus(Position position, int status) {
+        if (BitUtil.check(status, 1)) {
+            position.set(Position.KEY_IGNITION, BitUtil.check(status, 2));
+        }
+        if (BitUtil.check(status, 3)) {
+            position.set(Position.KEY_ARMED, BitUtil.check(status, 4));
+        }
+        if (BitUtil.check(status, 5)) {
+            position.set(Position.KEY_BLOCKED, !BitUtil.check(status, 6));
+        }
+        if (BitUtil.check(status, 7)) {
+            position.set(Position.KEY_CHARGE, BitUtil.check(status, 8));
+        }
+        position.set(Position.KEY_STATUS, status);
+    }
+
     private Position decodeOld(DeviceSession deviceSession, ChannelBuffer buf, int type, int index) {
 
         Position position = new Position();
@@ -115,27 +131,39 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
 
         position.setValid((buf.readUnsignedByte() & 0x01) != 0);
 
-        if (type == MSG_ALARM) {
-            position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));
-        }
-
-        if (buf.readableBytes() >= 2 * 5) {
+        if (type == MSG_GPS) {
 
-            int status = buf.readUnsignedShort();
-            if (BitUtil.check(status, 1)) {
-                position.set(Position.KEY_IGNITION, BitUtil.check(status, 2));
+            if (buf.readableBytes() >= 2) {
+                decodeStatus(position, buf.readUnsignedShort());
             }
-            if (BitUtil.check(status, 7)) {
-                position.set(Position.KEY_CHARGE, BitUtil.check(status, 8));
+
+            if (buf.readableBytes() >= 2 * 4) {
+
+                position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+
+                position.set(Position.KEY_RSSI, buf.readUnsignedShort());
+
+                position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
+                position.set(Position.PREFIX_ADC + 2, buf.readUnsignedShort());
+
             }
-            position.set(Position.KEY_STATUS, status);
 
-            position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+        } else if (type == MSG_ALARM) {
 
-            position.set(Position.KEY_RSSI, buf.readUnsignedShort());
+            position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));
 
-            position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
-            position.set(Position.PREFIX_ADC + 2, buf.readUnsignedShort());
+        } else if (type == MSG_STATE) {
+
+            int statusType = buf.readUnsignedByte();
+
+            position.set(Position.KEY_EVENT, statusType);
+
+            if (statusType == 0x01 || statusType == 0x02 || statusType == 0x03) {
+                buf.readUnsignedInt(); // device time
+                if (buf.readableBytes() >= 2) {
+                    decodeStatus(position, buf.readUnsignedShort());
+                }
+            }
 
         }
 
@@ -189,6 +217,45 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
             buf.skipBytes(7); // bss2
         }
 
+        if (buf.readableBytes() >= 2) {
+            int status = buf.readUnsignedShort();
+            position.setValid(BitUtil.check(status, 0));
+            if (BitUtil.check(status, 1)) {
+                position.set(Position.KEY_IGNITION, BitUtil.check(status, 2));
+            }
+            position.set(Position.KEY_STATUS, status);
+        }
+
+        if (buf.readableBytes() >= 2) {
+            position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+        }
+
+        if (buf.readableBytes() >= 4) {
+            position.set(Position.PREFIX_ADC + 0, buf.readUnsignedShort());
+            position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
+        }
+
+        if (buf.readableBytes() >= 4) {
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+        }
+
+        if (buf.readableBytes() >= 4) {
+            buf.readUnsignedShort(); // gsm counter
+            buf.readUnsignedShort(); // gps counter
+        }
+
+        if (buf.readableBytes() >= 4) {
+            position.set(Position.KEY_STEPS, buf.readUnsignedShort());
+            buf.readUnsignedShort(); // walking time
+        }
+
+        if (buf.readableBytes() >= 12) {
+            position.set(Position.PREFIX_TEMP + 1, buf.readUnsignedShort() / 256.0);
+            position.set("humidity", buf.readUnsignedShort() * 0.1);
+            position.set("illuminance", buf.readUnsignedInt() / 256.0);
+            position.set("co2", buf.readUnsignedInt());
+        }
+
         return position;
     }
 
@@ -212,6 +279,7 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
             getDeviceSession(channel, remoteAddress, ChannelBuffers.hexDump(buf.readBytes(8)).substring(1));
 
         } else {
+
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
             if (deviceSession == null) {
                 return null;
@@ -221,7 +289,20 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
                 return decodeOld(deviceSession, buf, type, index);
             } else if (type >= MSG_NORMAL && type <= MSG_OBD_CODE) {
                 return decodeNew(deviceSession, buf, index);
+            } else if (type == MSG_HEARTBEAT && buf.readableBytes() >= 2) {
+
+                Position position = new Position();
+                position.setDeviceId(deviceSession.getDeviceId());
+                position.setProtocol(getProtocolName());
+
+                getLastLocation(position, null);
+
+                decodeStatus(position, buf.readUnsignedShort());
+
+                return position;
+
             }
+
         }
 
         return null;