Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 96 insertions, 59 deletions

diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/org/traccar/protocol/WatchProtocolDecoder.java
index 86dc9456d..b58c3b6a1 100644
--- a/src/org/traccar/protocol/WatchProtocolDecoder.java
+++ b/src/org/traccar/protocol/WatchProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2018 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.
@@ -48,7 +48,7 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
             .expression("([NS]),")
             .number(" *(-?d+.d+),")              // longitude
             .expression("([EW])?,")
-            .number("(d+.d+),")                  // speed
+            .number("(d+.?d*),")                 // speed
             .number("(d+.?d*),")                 // course
             .number("(d+.?d*),")                 // altitude
             .number("(d+),")                     // satellites
@@ -60,10 +60,15 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
             .expression("(.*)")                  // cell and wifi
             .compile();
 
-    private void sendResponse(Channel channel, String manufacturer, String id, String content) {
+    private void sendResponse(Channel channel, String id, String index, String content) {
         if (channel != null) {
-            channel.write(String.format(
-                    "[%s*%s*%04x*%s]", manufacturer, id, content.length(), content));
+            if (index != null) {
+                channel.write(String.format(
+                        "[%s*%s*%s*%04x*%s]", manufacturer, id, index, content.length(), content));
+            } else {
+                channel.write(String.format(
+                        "[%s*%s*%04x*%s]", manufacturer, id, content.length(), content));
+            }
         }
     }
 
@@ -92,8 +97,38 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
         return null;
     }
 
-    private void decodeTail(Position position, String data) {
-        String[] values = data.split(",");
+    private Position decodePosition(DeviceSession deviceSession, String data) {
+
+        Parser parser = new Parser(PATTERN_POSITION, data);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        Position position = new Position(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
+
+        position.setValid(parser.next().equals("A"));
+        position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
+        position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
+        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
+        position.setCourse(parser.nextDouble(0));
+        position.setAltitude(parser.nextDouble(0));
+
+        position.set(Position.KEY_SATELLITES, parser.nextInt(0));
+        position.set(Position.KEY_RSSI, parser.nextInt(0));
+        position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt(0));
+
+        position.set(Position.KEY_STEPS, parser.nextInt(0));
+
+        int status = parser.nextHexInt(0);
+        position.set(Position.KEY_ALARM, decodeAlarm(status));
+        if (BitUtil.check(status, 4)) {
+            position.set(Position.KEY_MOTION, true);
+        }
+
+        String[] values = parser.next().split(",");
         int index = 0;
 
         Network network = new Network();
@@ -122,6 +157,19 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
         if (network.getCellTowers() != null || network.getWifiAccessPoints() != null) {
             position.setNetwork(network);
         }
+
+        return position;
+    }
+
+    private boolean hasIndex;
+    private String manufacturer;
+
+    public boolean getHasIndex() {
+        return hasIndex;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
     }
 
     @Override
@@ -131,22 +179,34 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
         ChannelBuffer buf = (ChannelBuffer) msg;
 
         buf.skipBytes(1); // header
-        String manufacturer = buf.readBytes(2).toString(StandardCharsets.US_ASCII);
+        manufacturer = buf.readBytes(2).toString(StandardCharsets.US_ASCII);
         buf.skipBytes(1); // delimiter
 
-        String id = buf.readBytes(10).toString(StandardCharsets.US_ASCII);
+        int idIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '*');
+        String id = buf.readBytes(idIndex - buf.readerIndex()).toString(StandardCharsets.US_ASCII);
         DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
         if (deviceSession == null) {
             return null;
         }
 
         buf.skipBytes(1); // delimiter
+
+        String index = null;
+        int contentIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '*');
+        if (contentIndex + 5 < buf.writerIndex() && buf.getByte(contentIndex + 5) == '*'
+                && buf.toString(contentIndex + 1, 4, StandardCharsets.US_ASCII).matches("\\p{XDigit}+")) {
+            int indexLength = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '*') - buf.readerIndex();
+            hasIndex = true;
+            index = buf.readBytes(indexLength).toString(StandardCharsets.US_ASCII);
+            buf.skipBytes(1); // delimiter
+        }
+
         buf.skipBytes(4); // length
         buf.skipBytes(1); // delimiter
 
         buf.writerIndex(buf.writerIndex() - 1); // ignore ending
 
-        int contentIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ',');
+        contentIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ',');
         if (contentIndex < 0) {
             contentIndex = buf.writerIndex();
         }
@@ -157,15 +217,18 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
             buf.readerIndex(contentIndex + 1);
         }
 
-        if (type.equals("LK")) {
+        if (type.equals("INIT")) {
+
+            sendResponse(channel, id, index, "INIT,1");
+
+        } else if (type.equals("LK")) {
 
-            sendResponse(channel, manufacturer, id, "LK");
+            sendResponse(channel, id, index, "LK");
 
             if (buf.readable()) {
                 String[] values = buf.toString(StandardCharsets.US_ASCII).split(",");
                 if (values.length >= 3) {
-                    Position position = new Position();
-                    position.setProtocol(getProtocolName());
+                    Position position = new Position(getProtocolName());
                     position.setDeviceId(deviceSession.getDeviceId());
 
                     getLastLocation(position, null);
@@ -179,62 +242,38 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
         } else if (type.equals("UD") || type.equals("UD2") || type.equals("UD3")
                 || type.equals("AL") || type.equals("WT")) {
 
-            if (type.equals("AL")) {
-                sendResponse(channel, manufacturer, id, "AL");
-            }
-
-            Parser parser = new Parser(PATTERN_POSITION, buf.toString(StandardCharsets.US_ASCII));
-            if (!parser.matches()) {
-                return null;
-            }
-
-            Position position = new Position();
-            position.setProtocol(getProtocolName());
-            position.setDeviceId(deviceSession.getDeviceId());
-
-            position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
+            Position position = decodePosition(deviceSession, buf.toString(StandardCharsets.US_ASCII));
 
-            position.setValid(parser.next().equals("A"));
-            position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
-            position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM));
-            position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
-            position.setCourse(parser.nextDouble(0));
-            position.setAltitude(parser.nextDouble(0));
-
-            position.set(Position.KEY_SATELLITES, parser.nextInt(0));
-            position.set(Position.KEY_RSSI, parser.nextInt(0));
-            position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt(0));
-
-            position.set(Position.KEY_STEPS, parser.nextInt(0));
-
-            int status = parser.nextHexInt(0);
-            position.set(Position.KEY_ALARM, decodeAlarm(status));
-            if (BitUtil.check(status, 4)) {
-                position.set(Position.KEY_MOTION, true);
+            if (type.equals("AL")) {
+                if (position != null) {
+                    position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+                }
+                sendResponse(channel, id, index, "AL");
             }
 
-            decodeTail(position, parser.next());
-
             return position;
 
         } else if (type.equals("TKQ")) {
 
-            sendResponse(channel, manufacturer, id, "TKQ");
+            sendResponse(channel, id, index, "TKQ");
 
-        } else if (type.equals("PULSE") || type.equals("heart")) {
+        } else if (type.equals("PULSE") || type.equals("heart") || type.equals("bphrt")) {
 
             if (buf.readable()) {
 
-                Position position = new Position();
-                position.setProtocol(getProtocolName());
+                Position position = new Position(getProtocolName());
                 position.setDeviceId(deviceSession.getDeviceId());
 
                 getLastLocation(position, new Date());
 
-                position.setValid(false);
-                String pulse = buf.toString(StandardCharsets.US_ASCII);
-                position.set("pulse", pulse);
-                position.set(Position.KEY_RESULT, pulse);
+                String[] values = buf.toString(StandardCharsets.US_ASCII).split(",");
+                int valueIndex = 0;
+
+                if (type.equals("bphrt")) {
+                    position.set("pressureHigh", values[valueIndex++]);
+                    position.set("pressureLow", values[valueIndex++]);
+                }
+                position.set("pulse", values[valueIndex]);
 
                 return position;
 
@@ -242,8 +281,7 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
 
         } else if (type.equals("img")) {
 
-            Position position = new Position();
-            position.setProtocol(getProtocolName());
+            Position position = new Position(getProtocolName());
             position.setDeviceId(deviceSession.getDeviceId());
 
             getLastLocation(position, null);
@@ -256,8 +294,7 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
 
         } else if (type.equals("TK")) {
 
-            Position position = new Position();
-            position.setProtocol(getProtocolName());
+            Position position = new Position(getProtocolName());
             position.setDeviceId(deviceSession.getDeviceId());
 
             getLastLocation(position, null);