Support AT07 protocol

2 files changed, 37 insertions, 14 deletions

diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index ed4c1409a..cd7f684b8 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2019 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.
@@ -150,10 +150,14 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
             .number("(dddd)")                    // adc 4
             .groupEnd("?")
             .number("(dddd)")                    // temperature 1
-            .number("(dddd)")                    // temperature 2
+            .number("(dddd)?")                   // temperature 2
             .groupEnd("?")
             .number("(xxxx)")                    // lac
             .number("(xxxx)")                    // cid
+            .groupBegin()
+            .number("(dd)")                      // mcc
+            .number("(ddd)")                     // mnc
+            .groupEnd("?")
             .number("(dd)")                      // satellites
             .number("(dd)")                      // gsm (rssi)
             .number("(ddd)")                     // course
@@ -337,29 +341,43 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
         position.set(Position.KEY_ALARM, BitUtil.check(status, 32 - 18) ? Position.ALARM_LOW_BATTERY : null);
         position.set(Position.KEY_ALARM, BitUtil.check(status, 32 - 22) ? Position.ALARM_JAMMING : null);
 
-        position.setValid(BitUtil.check(status, 32 - 20));
 
         position.setTime(parser.nextDateTime());
 
-        position.set(Position.KEY_BATTERY, parser.nextDouble(0) * 0.1);
-        position.set(Position.KEY_POWER, parser.nextDouble(0));
+        position.set(Position.KEY_BATTERY, parser.nextDouble() * 0.1);
+        position.set(Position.KEY_POWER, parser.nextDouble());
 
         position.set(Position.PREFIX_ADC + 1, parser.next());
         position.set(Position.PREFIX_ADC + 2, parser.next());
         position.set(Position.PREFIX_ADC + 3, parser.next());
         position.set(Position.PREFIX_ADC + 4, parser.next());
         position.set(Position.PREFIX_TEMP + 1, parser.next());
-        position.set(Position.PREFIX_TEMP + 2, parser.next());
 
-        CellTower cellTower = CellTower.fromLacCid(parser.nextHexInt(0), parser.nextHexInt(0));
-        position.set(Position.KEY_SATELLITES, parser.nextInt(0));
-        cellTower.setSignalStrength(parser.nextInt(0));
+        if (parser.hasNext()) {
+            position.set(Position.PREFIX_TEMP + 2, parser.next());
+            position.setValid(BitUtil.check(status, 32 - 20));
+        } else {
+            position.setValid(BitUtil.check(status, 32 - 18));
+        }
+
+        int lac = parser.nextHexInt();
+        int cid = parser.nextHexInt();
+        CellTower cellTower;
+        if (parser.hasNext(2)) {
+            int mnc = parser.nextInt();
+            int mcc = parser.nextInt();
+            cellTower = CellTower.from(mcc, mnc, lac, cid);
+        } else {
+            cellTower = CellTower.fromLacCid(lac, cid);
+        }
+        position.set(Position.KEY_SATELLITES, parser.nextInt());
+        cellTower.setSignalStrength(parser.nextInt());
         position.setNetwork(new Network(cellTower));
 
-        position.setCourse(parser.nextDouble(0));
-        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
-        position.set(Position.KEY_HDOP, parser.nextDouble(0));
-        position.set(Position.KEY_ODOMETER, parser.nextInt(0) * 1000);
+        position.setCourse(parser.nextDouble());
+        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+        position.set(Position.KEY_HDOP, parser.nextDouble());
+        position.set(Position.KEY_ODOMETER, parser.nextInt() * 1000);
 
         position.setLatitude(parser.nextCoordinate());
         position.setLongitude(parser.nextCoordinate());
diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java
index c9990acdf..287c54968 100644
--- a/test/org/traccar/protocol/TotemProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TotemProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class TotemProtocolDecoderTest extends ProtocolTest {
         TotemProtocolDecoder decoder = new TotemProtocolDecoder(null);
 
         verifyPosition(decoder, text(
+                "$$0113AA862010037348253|588040001901220851494212000000753AE901655121700100000.800000002632.6084S02803.3289E29497E"),
+                position("2019-01-22 08:51:49.000", true, -26.54347, 28.05548));
+
+        verifyPosition(decoder, text(
                 "$$011602867119025755430|50099800180420045019401400000000000000B8797D110816811201.500002132615.7037S02801.8099E056149"));
 
         verifyPosition(decoder, text(
@@ -32,7 +36,8 @@ public class TotemProtocolDecoderTest extends ProtocolTest {
                 "$$0128AA864244026065291|18001800140916020524401100000000000000000000000027BA0E57063100000001.200000002237.8119N11403.5075E05202D"));
 
         verifyPosition(decoder, text(
-                "$$0128AA867965024919124|10010800160223032415401203270321032103270189000027BA0E4E001800200001.000000002237.7581N11403.5088E000957"));
+                "$$0128AA867965024919124|10010800160223032415401203270321032103270189000027BA0E4E001800200001.000000002237.7581N11403.5088E000957"),
+                position("2016-02-23 03:24:15.000", false, 22.62930, 114.05848));
 
         verifyPosition(decoder, text(
                 "$$0108AA863835024426319|18004000160216160756411100007DCD0000111000000000.800000000316.3519N10228.5086E126522"));