diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-21 03:06:10 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-21 02:06:10 +1300 |
| commit | 7ff14665cb215410e258c2f8c88ae5ca2dbf0ddf (patch) | |
| tree | a1d2e27f26da70bc8f5832518a79e479f9ae7404 | |
| parent | 22fdf5388719120b84ce981807d17d68e87a0c07 (diff) | |
| download | trackermap-server-7ff14665cb215410e258c2f8c88ae5ca2dbf0ddf.tar.gz trackermap-server-7ff14665cb215410e258c2f8c88ae5ca2dbf0ddf.tar.bz2 trackermap-server-7ff14665cb215410e258c2f8c88ae5ca2dbf0ddf.zip | |
Decode GL200 battery percentage
| -rw-r--r-- | src/org/traccar/protocol/Gl200ProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Gl200ProtocolDecoderTest.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index ff500f8f1..769964f33 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -326,7 +326,9 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_BATTERY, parser.nextDouble()); position.set(Position.KEY_CHARGE, parser.nextInt() == 1); - parser.next(); // battery percentage + if (parser.hasNext()) { + position.set(Position.KEY_BATTERY, parser.next() + "%"); + } position.set(Position.PREFIX_TEMP + 1, parser.next()); diff --git a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java index c493d5172..7e6287514 100644 --- a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class Gl200ProtocolDecoderTest extends ProtocolTest { Gl200ProtocolDecoder decoder = new Gl200ProtocolDecoder(new Gl200Protocol()); verifyAttributes(decoder, text( + "+RESP:GTINF,210102,A100004D9EF2AE,,41,,8,99,0,17.7,21,3.58,0,1,1,0,0,20161216135038,4,,,,,20161216135038,00AB$")); + + verifyAttributes(decoder, text( "+RESP:GTSTR,400201,862365030034957,GL500,0,0,2,23.1,5,2,0.2,0,36.0,0.623089,51.582744,20161129174625,0234,0015,03C3,3550,,,,20161129174625,0026$")); verifyNothing(decoder, text( |