diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-22 23:16:55 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-22 23:16:55 -0700 |
commit | 08442e5f2c24299b6120a2296a1cfd000a042178 (patch) | |
tree | e9a6523ad993f8ffa3c730b91a4251b02d6867c6 /src/main/java/org/traccar/protocol/StbProtocolDecoder.java | |
parent | b8256eb4140dd0a03b98ae6c3e67fcbc561d0229 (diff) | |
download | traccar-server-08442e5f2c24299b6120a2296a1cfd000a042178.tar.gz traccar-server-08442e5f2c24299b6120a2296a1cfd000a042178.tar.bz2 traccar-server-08442e5f2c24299b6120a2296a1cfd000a042178.zip |
Support additional attributes
Diffstat (limited to 'src/main/java/org/traccar/protocol/StbProtocolDecoder.java')
-rw-r--r-- | src/main/java/org/traccar/protocol/StbProtocolDecoder.java | 59 |
1 files changed, 53 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/protocol/StbProtocolDecoder.java b/src/main/java/org/traccar/protocol/StbProtocolDecoder.java index 4f55bf799..bd151c604 100644 --- a/src/main/java/org/traccar/protocol/StbProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/StbProtocolDecoder.java @@ -26,10 +26,13 @@ import org.traccar.Protocol; import org.traccar.model.Position; import javax.json.Json; +import javax.json.JsonNumber; import javax.json.JsonObject; +import javax.json.JsonString; import javax.json.JsonValue; import java.io.StringReader; import java.net.SocketAddress; +import java.util.Date; public class StbProtocolDecoder extends BaseProtocolDecoder { @@ -87,16 +90,60 @@ public class StbProtocolDecoder extends BaseProtocolDecoder { Position position = new Position(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); - getLastLocation(position, null); - if (type == MSG_PROPERTY) { + int locationType = 0; for (JsonValue property : root.getJsonArray("attrList")) { JsonObject propertyObject = property.asJsonObject(); - String key = "id" + propertyObject.getString("id"); - if (propertyObject.containsKey("doorId")) { - key += "Door" + propertyObject.getString("doorId"); + String id = propertyObject.getString("id"); + switch (id) { + case "01101001": + locationType = propertyObject.getInt("value"); + break; + case "01102001": + position.setLongitude(propertyObject.getJsonNumber("value").doubleValue()); + break; + case "01103001": + position.setLatitude(propertyObject.getJsonNumber("value").doubleValue()); + break; + case "01118001": + position.set(Position.KEY_DEVICE_TEMP, propertyObject.getJsonNumber("value").doubleValue()); + break; + case "01122001": + position.set("batteryControl", propertyObject.getInt("value")); + break; + case "02301001": + position.set("switchCabinetCommand", propertyObject.getInt("value")); + break; + default: + String key = "id" + id; + if (propertyObject.containsKey("doorId")) { + key += "Door" + propertyObject.getString("doorId"); + } + JsonValue value = propertyObject.get("value"); + switch (value.getValueType()) { + case STRING: + position.set(key, ((JsonString) value).getString()); + break; + case NUMBER: + position.set(key, ((JsonNumber) value).doubleValue()); + break; + default: + break; + } + break; + } + } + if (locationType > 0) { + position.setTime(new Date()); + position.setValid(locationType != 5); + if (locationType == 2 || locationType == 4) { + position.setLongitude(-position.getLongitude()); + } + if (locationType == 3 || locationType == 4) { + position.setLatitude(-position.getLatitude()); } - position.set(key, propertyObject.getString("value")); + } else { + getLastLocation(position, null); } } |