aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2022-02-06 16:32:35 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2022-02-06 16:32:35 -0800
commitf258382b1203fa31d150e0b090fe5afdb01ede6b (patch)
tree9932cd5b68efcb856d9605b92d26eb9ba4667953
parent9de6ffeb75a15422e48ad7d9995b6670b336b3ff (diff)
downloadtrackermap-server-f258382b1203fa31d150e0b090fe5afdb01ede6b.tar.gz
trackermap-server-f258382b1203fa31d150e0b090fe5afdb01ede6b.tar.bz2
trackermap-server-f258382b1203fa31d150e0b090fe5afdb01ede6b.zip
Decode S168 status info
-rw-r--r--src/main/java/org/traccar/protocol/S168ProtocolDecoder.java13
-rw-r--r--src/test/java/org/traccar/protocol/S168ProtocolDecoderTest.java3
2 files changed, 15 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/S168ProtocolDecoder.java b/src/main/java/org/traccar/protocol/S168ProtocolDecoder.java
index 921141698..6d565517b 100644
--- a/src/main/java/org/traccar/protocol/S168ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/S168ProtocolDecoder.java
@@ -95,6 +95,10 @@ public class S168ProtocolDecoder extends BaseProtocolDecoder {
values[index++].replace('-', ':'), Integer.parseInt(values[index++])));
}
break;
+ case "STATUS":
+ position.set(Position.KEY_BATTERY_LEVEL, Integer.parseInt(values[index++]));
+ position.set(Position.KEY_RSSI, Integer.parseInt(values[index++]));
+ break;
default:
break;
}
@@ -103,8 +107,15 @@ public class S168ProtocolDecoder extends BaseProtocolDecoder {
if (network.getCellTowers() != null || network.getWifiAccessPoints() != null) {
position.setNetwork(network);
}
+ if (!position.getAttributes().containsKey(Position.KEY_SATELLITES)) {
+ getLastLocation(position, null);
+ }
- return position.getAttributes().containsKey(Position.KEY_SATELLITES) ? position : null;
+ if (position.getNetwork() != null || !position.getAttributes().isEmpty()) {
+ return position;
+ } else {
+ return null;
+ }
}
}
diff --git a/src/test/java/org/traccar/protocol/S168ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/S168ProtocolDecoderTest.java
index c980e7abc..ec795c9eb 100644
--- a/src/test/java/org/traccar/protocol/S168ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/S168ProtocolDecoderTest.java
@@ -10,6 +10,9 @@ public class S168ProtocolDecoderTest extends ProtocolTest {
var decoder = new S168ProtocolDecoder(null);
+ verifyAttributes(decoder, text(
+ "S168#861118010104168#00ec#0016#SYNC:0093;STATUS:91,51"));
+
verifyPosition(decoder, text(
"S168#861118010104168#0715#0124#LOCA:W;CELL:6,1cc,0,5847,2c54cc1,1d,5847,cc98145,1b,5847,6259d03,e,5847,cc98141,1d,5847,6259e03,27,5847,32113ce,28;GDATA:V,0,220205152238,0.0,0.0,0,0,0;ALERT:0000;STATUS:99,52;WIFI:5,8C-AB-8E-9D-73-18,-56,60-3A-7C-E2-D3-85,-72,62-3A-7C-A2-D3-85,-72,00-00-00-00-00-00,-75,50-70-97-B1-80-1F,-82"));