Merge pull request #4 from traccar/master

upgrade to current master

1 files changed, 104 insertions, 67 deletions

diff --git a/src/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/org/traccar/protocol/Gl200TextProtocolDecoder.java
index 9429cff2f..ff300d429 100644
--- a/src/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 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.
@@ -210,7 +210,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
             .number("(?:[0-9A-Z]{2}xxxx)?,")     // protocol version
             .number("(d{15}|x{14}),")            // imei
             .expression("[^,]*,")                // device name
-            .number("x{8},")                     // mask
+            .number("(x{8}),")                   // mask
             .number("(d+)?,")                    // power
             .number("d{1,2},")                   // report type
             .number("d{1,2},")                   // count
@@ -356,8 +356,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
                     channel.write("+SACK:GTHBD," + protocolVersion + "," + parser.next() + "$", remoteAddress);
                 }
             } else {
-                Position position = new Position();
-                position.setProtocol(getProtocolName());
+                Position position = new Position(getProtocolName());
                 position.setDeviceId(deviceSession.getDeviceId());
                 getLastLocation(position, parser.nextDateTime());
                 position.setValid(false);
@@ -372,8 +371,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
         if (parser.matches()) {
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
             if (deviceSession != null) {
-                Position position = new Position();
-                position.setProtocol(getProtocolName());
+                Position position = new Position(getProtocolName());
                 position.setDeviceId(deviceSession.getDeviceId());
                 return position;
             }
@@ -431,8 +429,8 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         parser.next(); // odometer or external power
 
-        position.set(Position.KEY_BATTERY, parser.nextDouble(0));
-        position.set(Position.KEY_CHARGE, parser.nextInt(0) == 1);
+        position.set(Position.KEY_BATTERY, parser.nextDouble());
+        position.set(Position.KEY_CHARGE, parser.nextInt() == 1);
 
         position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt());
 
@@ -446,7 +444,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         getLastLocation(position, parser.nextDateTime());
 
-        position.set(Position.KEY_INDEX, parser.nextHexInt(0));
+        position.set(Position.KEY_INDEX, parser.nextHexInt());
 
         return position;
     }
@@ -459,8 +457,8 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
         }
 
         position.set("deviceType", parser.next());
-        position.set(Position.KEY_VERSION_FW, parser.nextHexInt(0));
-        position.set(Position.KEY_VERSION_HW, parser.nextHexInt(0));
+        position.set(Position.KEY_VERSION_FW, parser.nextHexInt());
+        position.set(Position.KEY_VERSION_HW, parser.nextHexInt());
 
         getLastLocation(position, parser.nextDateTime());
 
@@ -468,8 +466,8 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private void decodeLocation(Position position, Parser parser) {
-        int hdop = parser.nextInt(0);
-        position.setValid(hdop > 0);
+        Integer hdop = parser.nextInt();
+        position.setValid(hdop == null || hdop > 0);
         position.set(Position.KEY_HDOP, hdop);
 
         position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
@@ -478,25 +476,27 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         if (parser.hasNext(8)) {
             position.setValid(true);
-            position.setLongitude(parser.nextDouble(0));
-            position.setLatitude(parser.nextDouble(0));
+            position.setLongitude(parser.nextDouble());
+            position.setLatitude(parser.nextDouble());
             position.setTime(parser.nextDateTime());
         } else {
             getLastLocation(position, null);
         }
 
         if (parser.hasNext(6)) {
-            int mcc = parser.nextInt(0);
-            int mnc = parser.nextInt(0);
+            int mcc = parser.nextInt();
+            int mnc = parser.nextInt();
             if (parser.hasNext(2)) {
-                position.setNetwork(new Network(CellTower.from(mcc, mnc, parser.nextInt(0), parser.nextInt(0))));
+                position.setNetwork(new Network(CellTower.from(mcc, mnc, parser.nextInt(), parser.nextInt())));
             }
             if (parser.hasNext(2)) {
-                position.setNetwork(new Network(CellTower.from(mcc, mnc, parser.nextHexInt(0), parser.nextHexInt(0))));
+                position.setNetwork(new Network(CellTower.from(mcc, mnc, parser.nextHexInt(), parser.nextHexInt())));
             }
         }
 
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        if (parser.hasNext()) {
+            position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
+        }
     }
 
     private Object decodeObd(Channel channel, SocketAddress remoteAddress, String sentence) {
@@ -511,16 +511,22 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
         position.set(Position.PREFIX_TEMP + 1, parser.nextInt());
         position.set(Position.KEY_FUEL_CONSUMPTION, parser.next());
         position.set("dtcsClearedDistance", parser.nextInt());
-        position.set("odbConnect", parser.nextInt(0) == 1);
+        if (parser.hasNext()) {
+            position.set("odbConnect", parser.nextInt() == 1);
+        }
         position.set("dtcsNumber", parser.nextInt());
         position.set("dtcsCodes", parser.next());
         position.set(Position.KEY_THROTTLE, parser.nextInt());
         position.set(Position.KEY_FUEL_LEVEL, parser.nextInt());
-        position.set(Position.KEY_OBD_ODOMETER, parser.nextInt(0) * 1000);
+        if (parser.hasNext()) {
+            position.set(Position.KEY_OBD_ODOMETER, parser.nextInt() * 1000);
+        }
 
         decodeLocation(position, parser);
 
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        if (parser.hasNext()) {
+            position.set(Position.KEY_OBD_ODOMETER, (int) (parser.nextDouble() * 1000));
+        }
 
         decodeDeviceTime(position, parser);
 
@@ -528,8 +534,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private Object decodeCan(Channel channel, SocketAddress remoteAddress, String sentence) throws ParseException {
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
+        Position position = new Position(getProtocolName());
 
         int index = 0;
         String[] values = sentence.split(",");
@@ -557,14 +562,14 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
         if (BitUtil.check(reportMask, 3)) {
             position.set("totalFuelConsumption", Double.parseDouble(values[index++]));
         }
-        if (BitUtil.check(reportMask, 5)) {
-            position.set(Position.KEY_RPM, Integer.parseInt(values[index++]));
+        if (BitUtil.check(reportMask, 5) && !values[index++].isEmpty()) {
+            position.set(Position.KEY_RPM, Integer.parseInt(values[index - 1]));
         }
-        if (BitUtil.check(reportMask, 4)) {
-            position.set(Position.KEY_OBD_SPEED, UnitsConverter.knotsFromKph(Integer.parseInt(values[index++])));
+        if (BitUtil.check(reportMask, 4) && !values[index++].isEmpty()) {
+            position.set(Position.KEY_OBD_SPEED, UnitsConverter.knotsFromKph(Integer.parseInt(values[index - 1])));
         }
-        if (BitUtil.check(reportMask, 6)) {
-            position.set(Position.KEY_COOLANT_TEMP, Integer.parseInt(values[index++]));
+        if (BitUtil.check(reportMask, 6) && !values[index++].isEmpty()) {
+            position.set(Position.KEY_COOLANT_TEMP, Integer.parseInt(values[index - 1]));
         }
         if (BitUtil.check(reportMask, 7) && !values[index++].isEmpty()) {
             position.set(Position.KEY_FUEL_CONSUMPTION, Double.parseDouble(values[index - 1].substring(1)));
@@ -652,14 +657,14 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
     private void decodeStatus(Position position, Parser parser) {
         if (parser.hasNext(3)) {
-            int ignition = parser.nextHexInt(0);
+            int ignition = parser.nextHexInt();
             if (BitUtil.check(ignition, 4)) {
                 position.set(Position.KEY_IGNITION, false);
             } else if (BitUtil.check(ignition, 5)) {
                 position.set(Position.KEY_IGNITION, true);
             }
-            position.set(Position.KEY_INPUT, parser.nextHexInt(0));
-            position.set(Position.KEY_OUTPUT, parser.nextHexInt(0));
+            position.set(Position.KEY_INPUT, parser.nextHexInt());
+            position.set(Position.KEY_OUTPUT, parser.nextHexInt());
         }
     }
 
@@ -677,12 +682,11 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
         LinkedList<Position> positions = new LinkedList<>();
 
         String vin = parser.next();
-        int power = parser.nextInt(0);
+        Integer power = parser.nextInt();
 
         Parser itemParser = new Parser(PATTERN_LOCATION, parser.next());
         while (itemParser.find()) {
-            Position position = new Position();
-            position.setProtocol(getProtocolName());
+            Position position = new Position(getProtocolName());
             position.setDeviceId(deviceSession.getDeviceId());
 
             position.set(Position.KEY_VIN, vin);
@@ -696,15 +700,18 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         decodeLocation(position, parser);
 
-        // power value only on some devices
-        if (power > 10) {
-            position.set(Position.KEY_POWER, power);
+        if (power != null && power > 10) {
+            position.set(Position.KEY_POWER, power * 0.001); // only on some devices
         }
 
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        if (parser.hasNext()) {
+            position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
+        }
         position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt());
 
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        if (parser.hasNext()) {
+            position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
+        }
         position.set(Position.KEY_HOURS, parser.next());
         position.set(Position.PREFIX_ADC + 1, parser.next());
         position.set(Position.PREFIX_ADC + 2, parser.next());
@@ -735,14 +742,15 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
+        long mask = parser.nextHexLong();
+
         LinkedList<Position> positions = new LinkedList<>();
 
-        int power = parser.nextInt(0);
+        Integer power = parser.nextInt();
 
         Parser itemParser = new Parser(PATTERN_LOCATION, parser.next());
         while (itemParser.find()) {
-            Position position = new Position();
-            position.setProtocol(getProtocolName());
+            Position position = new Position(getProtocolName());
             position.setDeviceId(deviceSession.getDeviceId());
 
             decodeLocation(position, itemParser);
@@ -754,8 +762,10 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         decodeLocation(position, parser);
 
-        position.set(Position.KEY_POWER, power);
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        if (power != null) {
+            position.set(Position.KEY_POWER, power * 0.001);
+        }
+        position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
         position.set(Position.KEY_HOURS, parser.next());
         position.set(Position.PREFIX_ADC + 1, parser.next());
         position.set(Position.PREFIX_ADC + 2, parser.next());
@@ -765,14 +775,37 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         int index = 0;
         String[] data = parser.next().split(",");
-        if (data.length > 1) {
-            int deviceType = Integer.parseInt(data[index++]);
-            if (deviceType == 2) {
-                int deviceCount = Integer.parseInt(data[index++]);
-                for (int i = 1; i <= deviceCount; i++) {
-                    index++; // id
-                    index++; // type
-                    position.set(Position.PREFIX_TEMP + i, (short) Integer.parseInt(data[index++], 16) * 0.0625);
+
+        index += 1; // device type
+
+        if (BitUtil.check(mask, 0)) {
+            index += 1; // digital fuel sensor data
+        }
+
+        if (BitUtil.check(mask, 1)) {
+            int deviceCount = Integer.parseInt(data[index++]);
+            for (int i = 1; i <= deviceCount; i++) {
+                index += 1; // id
+                index += 1; // type
+                if (!data[index++].isEmpty()) {
+                    position.set(Position.PREFIX_TEMP + i, (short) Integer.parseInt(data[index - 1], 16) * 0.0625);
+                }
+            }
+        }
+
+        if (BitUtil.check(mask, 2)) {
+            index += 1; // can data
+        }
+
+        if (BitUtil.check(mask, 3) || BitUtil.check(mask, 4)) {
+            int deviceCount = Integer.parseInt(data[index++]);
+            for (int i = 1; i <= deviceCount; i++) {
+                index += 1; // type
+                if (BitUtil.check(mask, 3)) {
+                    position.set(Position.KEY_FUEL_LEVEL, Double.parseDouble(data[index++]));
+                }
+                if (BitUtil.check(mask, 4)) {
+                    index += 1; // volume
                 }
             }
         }
@@ -796,7 +829,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
         decodeLocation(position, parser);
 
         position.set(Position.KEY_HOURS, parser.next());
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
 
         decodeDeviceTime(position, parser);
 
@@ -814,7 +847,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         decodeLocation(position, parser);
 
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
 
         decodeDeviceTime(position, parser);
 
@@ -832,7 +865,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         Network network = new Network();
 
-        parser.nextInt(0); // count
+        parser.nextInt(); // count
         Matcher matcher = Pattern.compile("([0-9a-fA-F]{12}),(-?\\d+),,,,").matcher(parser.next());
         while (matcher.find()) {
             String mac = matcher.group(1).replaceAll("(..)", "$1:");
@@ -842,7 +875,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         position.setNetwork(network);
 
-        position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt(0));
+        position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt());
 
         return position;
     }
@@ -880,7 +913,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
-        int reportType = parser.nextInt(0);
+        int reportType = parser.nextInt();
         if (type.equals("NMR")) {
             position.set(Position.KEY_MOTION, reportType == 1);
         } else if (type.equals("SOS")) {
@@ -889,10 +922,14 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         decodeLocation(position, parser);
 
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
-        position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt(0));
+        if (parser.hasNext()) {
+            position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
+        }
+        position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt());
 
-        position.set(Position.KEY_ODOMETER, parser.nextDouble(0) * 1000);
+        if (parser.hasNext()) {
+            position.set(Position.KEY_ODOMETER, parser.nextDouble() * 1000);
+        }
 
         decodeDeviceTime(position, parser);
 
@@ -910,7 +947,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
-        int hdop = parser.nextInt(0);
+        int hdop = parser.nextInt();
         position.setValid(hdop > 0);
         position.set(Position.KEY_HDOP, hdop);
 
@@ -919,8 +956,8 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
         position.setAltitude(parser.nextDouble(0));
 
         if (parser.hasNext(2)) {
-            position.setLongitude(parser.nextDouble(0));
-            position.setLatitude(parser.nextDouble(0));
+            position.setLongitude(parser.nextDouble());
+            position.setLatitude(parser.nextDouble());
         } else {
             getLastLocation(position, null);
         }
@@ -931,7 +968,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
 
         if (parser.hasNext(4)) {
             position.setNetwork(new Network(CellTower.from(
-                    parser.nextInt(0), parser.nextInt(0), parser.nextHexInt(0), parser.nextHexInt(0))));
+                    parser.nextInt(), parser.nextInt(), parser.nextHexInt(), parser.nextHexInt())));
         }
 
         decodeDeviceTime(position, parser);