aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/H02ProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-05-20 11:18:17 +1200
committerGitHub <noreply@github.com>2017-05-20 11:18:17 +1200
commit6879624fd6290eea9a7f45047ba089ee1435d3ce (patch)
tree5e7de0a5669fb22af0bd3d2b70a5847113d37f80 /src/org/traccar/protocol/H02ProtocolDecoder.java
parentf523e3b995f5f1895cf3dea700be34f4b74dccf9 (diff)
parentab46ebf23066f91369b0d037f273bed1ea814d82 (diff)
downloadtrackermap-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.gz
trackermap-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.bz2
trackermap-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.zip
Merge pull request #3174 from Abyss777/battery_level
Adjust battery and batteryLevel type
Diffstat (limited to 'src/org/traccar/protocol/H02ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/H02ProtocolDecoder.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index fdef2e3c1..800ad0953 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -82,18 +82,18 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
}
- private String decodeBattery(int value) {
+ private Integer decodeBattery(int value) {
switch (value) {
case 6:
- return "100%";
+ return 100;
case 5:
- return "80%";
+ return 80;
case 4:
- return "60%";
+ return 60;
case 3:
- return "20%";
+ return 20;
case 2:
- return "10%";
+ return 10;
default:
return null;
}
@@ -123,7 +123,7 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
position.setTime(dateBuilder.getDate());
double latitude = readCoordinate(buf, false);
- position.set(Position.KEY_BATTERY, decodeBattery(buf.readUnsignedByte()));
+ position.set(Position.KEY_BATTERY_LEVEL, decodeBattery(buf.readUnsignedByte()));
double longitude = readCoordinate(buf, true);
int flags = buf.readUnsignedByte() & 0x0f;