From a067ab0240b0ac68c97f61fdadb53e7e063c8594 Mon Sep 17 00:00:00 2001 From: namo Date: Mon, 4 Dec 2017 13:48:43 +0300 Subject: flespi protocol remastered to receive data from stream; more parameters are converted into internal representation --- .../traccar/protocol/FlespiProtocolDecoder.java | 278 +++++++++++++++++++-- 1 file changed, 252 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/org/traccar/protocol/FlespiProtocolDecoder.java b/src/org/traccar/protocol/FlespiProtocolDecoder.java index d122df383..71f67b552 100644 --- a/src/org/traccar/protocol/FlespiProtocolDecoder.java +++ b/src/org/traccar/protocol/FlespiProtocolDecoder.java @@ -18,6 +18,10 @@ package org.traccar.protocol; import org.jboss.netty.channel.Channel; import org.jboss.netty.handler.codec.http.HttpRequest; import org.jboss.netty.handler.codec.http.HttpResponseStatus; +import org.jboss.netty.handler.codec.http.multipart.Attribute; +import org.jboss.netty.handler.codec.http.multipart.DefaultHttpDataFactory; +import org.jboss.netty.handler.codec.http.multipart.HttpPostRequestDecoder; +import org.jboss.netty.handler.codec.http.multipart.InterfaceHttpData; import org.traccar.BaseHttpProtocolDecoder; import org.traccar.DeviceSession; import org.traccar.model.Position; @@ -27,12 +31,15 @@ import javax.json.JsonArray; 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.nio.charset.StandardCharsets; import java.util.Date; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Iterator; public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { @@ -45,8 +52,16 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { HttpRequest request = (HttpRequest) msg; - JsonArray result = Json.createReader(new StringReader(request.getContent().toString(StandardCharsets.UTF_8))) - .readArray(); + HttpPostRequestDecoder decoder = new HttpPostRequestDecoder(new DefaultHttpDataFactory(false), request); + InterfaceHttpData data = decoder.getBodyHttpData("data"); + if (data.getHttpDataType() != InterfaceHttpData.HttpDataType.Attribute) { + sendResponse(channel, HttpResponseStatus.BAD_REQUEST); + return null; + } + + Attribute attribute = (Attribute) data; + String value = attribute.getValue(); + JsonArray result = Json.createReader(new StringReader(value)).readArray(); List positions = new LinkedList<>(); for (int i = 0; i < result.size(); i++) { JsonObject message = result.getJsonObject(i); @@ -60,6 +75,7 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { } Position position = new Position(); position.setDeviceId(deviceSession.getDeviceId()); + position.setProtocol(getProtocolName()); decodePosition(message, position); positions.add(position); } @@ -69,36 +85,246 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { } private void decodePosition(JsonObject object, Position position) { - position.setProtocol(getProtocolName()); + // store all params in position + Set> params = object.entrySet(); + Iterator> it = params.iterator(); + while (it.hasNext()) { + Map.Entry param = it.next(); + String paramName = param.getKey(); + JsonValue paramValue = param.getValue(); + if ("timestamp".equals(paramName)) { + Date deviceTime = new Date((long) (((JsonNumber) paramValue).doubleValue() * 1000)); + position.setTime(deviceTime); + } else if (paramName.startsWith("position.")) { + savePosition(paramName, paramValue, position); + } else if (paramName.matches("din#[\\d]{1,2}")) { + saveInput(paramName, paramValue, position); + } else if (paramName.matches("dout#[\\d]{1,2}")) { + saveOutput(paramName, paramValue, position); + } else if (saveAlarm(paramName, paramValue, position) == 0 + && saveParam(paramName, paramValue, position) == 0) { + saveUnknownParam(param.getKey(), param.getValue(), position); + } + } + if (position.getLatitude() == 0 && position.getLongitude() == 0) { + getLastLocation(position, position.getDeviceTime()); + } + } - Date deviceTime = new Date((long) object.getJsonNumber("timestamp").doubleValue() * 1000); - position.setTime(deviceTime); - JsonNumber lat = object.getJsonNumber("position.latitude"); - JsonNumber lon = object.getJsonNumber("position.longitude"); - if (lat != null && lon != null) { - position.setLatitude(lat.doubleValue()); - position.setLongitude(lon.doubleValue()); - } else { - getLastLocation(position, deviceTime); + private void savePosition(String name, JsonValue value, Position position) { + switch (name) { + case "position.latitude": + position.setLatitude(((JsonNumber) value).doubleValue()); + break; + case "position.longitude": + position.setLongitude(((JsonNumber) value).doubleValue()); + break; + case "position.speed": + position.setSpeed(((JsonNumber) value).doubleValue()); + break; + case "position.direction": + position.setCourse(((JsonNumber) value).doubleValue()); + break; + case "position.altitude": + position.setAltitude(((JsonNumber) value).doubleValue()); + break; + case "position.satellites": + position.set(Position.KEY_SATELLITES, ((JsonNumber) value).intValue()); + break; + case "position.valid": + position.setValid(value == JsonValue.TRUE); + break; + case "position.hdop": + position.set(Position.KEY_HDOP, ((JsonNumber) value).doubleValue()); + break; + case "position.pdop": + position.set(Position.KEY_PDOP, ((JsonNumber) value).doubleValue()); + break; + default: + saveUnknownParam(name, value, position); + break; + } + } + + private int saveParam(String name, JsonValue value, Position position) { + if (name == null) { + return 0; + } + if (name.equals("gps.vehicle.mileage") || name.startsWith("gps.vehicle.mileage#")) { + position.set(Position.KEY_ODOMETER, ((JsonNumber) value).doubleValue()); + return 1; + } + if (name.equals("external.powersource.voltage") || name.startsWith("external.powersource.voltage#")) { + position.set(Position.KEY_POWER, ((JsonNumber) value).doubleValue()); + return 1; + } + if (name.equals("battery.voltage") || name.startsWith("battery.voltage#")) { + position.set(Position.KEY_BATTERY, ((JsonNumber) value).doubleValue()); + return 1; + } + if (name.equals("fuel.level") || name.equals("can.fuel.level") + || name.startsWith("fuel.level#") || name.startsWith("can.fuel.level#")) { + position.set(Position.KEY_FUEL_LEVEL, ((JsonNumber) value).doubleValue()); + return 1; + } + if (name.equals("engine.rpm") || name.equals("can.engine.rpm") + || name.startsWith("engine.rpm#") || name.startsWith("can.engine.rpm#")) { + position.set(Position.KEY_RPM, ((JsonNumber) value).doubleValue()); + return 1; + } + if (name.equals("can.engine.temperature") || name.startsWith("can.engine.temperature#")) { + int seqNum = 0; + if (name.contains("#")) { + try { + seqNum = Integer.parseInt(name.replaceAll("can\\.engine\\.temperature#", "")); + } catch (NumberFormatException e) { + seqNum = 0; + } + } + position.set(Position.PREFIX_TEMP + seqNum, ((JsonNumber) value).doubleValue()); + return 1; + } + if (name.equals("engine.ignition.status")) { + position.set(Position.KEY_IGNITION, value == JsonValue.TRUE); + return 1; + } + if (name.equals("movement.status")) { + position.set(Position.KEY_MOTION, value == JsonValue.TRUE); + return 1; + } + if (name.equals("device.temperature")) { + position.set(Position.KEY_DEVICE_TEMP, ((JsonNumber) value).doubleValue()); + return 1; + } + if (name.equals("ibutton.code")) { + position.set(Position.KEY_DRIVER_UNIQUE_ID, ((JsonString) value).getString()); + return 1; + } + if (name.equals("vehicle.vin")) { + position.set(Position.KEY_VIN, ((JsonString) value).getString()); + return 1; + } + return 0; + } + + private int saveAlarm(String name, JsonValue value, Position position) { + if ("alarm.event.trigger".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); + } + return 1; + } + if ("towing.event.trigger".equals(name) || "towing.alarm.status".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_TOW); + } + return 1; + } + if ("geofence.event.enter".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_ENTER); + } + return 1; + } + if ("geofence.event.exit".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT); + } + return 1; + } + if ("shock.event.trigger".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_SHOCK); + } + return 1; } - JsonNumber speed = object.getJsonNumber("position.speed"); - if (speed != null) { - position.setSpeed(speed.doubleValue()); + if ("overspeeding.event.trigger".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); + } + return 1; } - JsonNumber course = object.getJsonNumber("position.direction"); - if (course != null) { - position.setCourse(course.doubleValue()); + if ("harsh.acceleration.event.trigger".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION); + } + return 1; } - JsonNumber altitude = object.getJsonNumber("position.altitude"); - if (altitude != null) { - position.setAltitude(altitude.doubleValue()); + if ("harsh.braking.event.trigger".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_BRAKING); + } + return 1; } + if ("harsh.cornering.event.trigger".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_CORNERING); + } + return 1; + } + if ("gnss.antenna.cut.status".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GPS_ANTENNA_CUT); + } + return 1; + } + if ("gsm.jamming.event.trigger".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_JAMMING); + } + return 1; + } + if ("hood.open.status".equals(name)) { + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_BONNET); + } + return 1; + } + return 0; + } + + private void saveInput(String name, JsonValue value, Position position) { + if (value != JsonValue.TRUE) { + return; + } + int in = Integer.parseInt(name.replaceAll("^din#", "")); + if (in > 32 || in < 1) { + return; + } + if (position.getInteger(Position.KEY_INPUT) == 0) { + position.set(Position.KEY_INPUT, 1 << (in - 1)); + } else { + position.set(Position.KEY_INPUT, (position.getInteger(Position.KEY_INPUT) | 1 << (in - 1))); + } + } - position.setValid(object.getBoolean("position.valid", true)); - position.set(Position.KEY_SATELLITES, object.getInt("position.satellites", 0)); + private void saveOutput(String name, JsonValue value, Position position) { + if (value != JsonValue.TRUE) { + return; + } + int out = Integer.parseInt(name.replaceAll("^dout#", "")); + if (out > 32 || out < 1) { + return; + } + if (position.getInteger(Position.KEY_OUTPUT) == 0) { + position.set(Position.KEY_OUTPUT, 1 << (out - 1)); + } else { + position.set(Position.KEY_OUTPUT, (position.getInteger(Position.KEY_OUTPUT) | 1 << (out - 1))); + } + } - if (object.getBoolean("alarm.event.trigger", false)) { - position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); + private void saveUnknownParam(String name, JsonValue value, Position position) { + if (value instanceof JsonNumber) { + if (((JsonNumber) value).isIntegral()) { + position.set(name, ((JsonNumber) value).longValue()); + } else { + position.set(name, ((JsonNumber) value).doubleValue()); + } + position.set(name, ((JsonNumber) value).doubleValue()); + } else if (value instanceof JsonString) { + position.set(name, ((JsonString) value).getString()); + } else if (value == JsonValue.TRUE || value == JsonValue.FALSE) { + position.set(name, value == JsonValue.TRUE); } } } -- cgit v1.2.3 From 445b1e12409ad71b37310166ceb5131c5f8beb34 Mon Sep 17 00:00:00 2001 From: namo Date: Thu, 7 Dec 2017 11:24:51 +0300 Subject: refactored to use switch instead of if-else --- .../traccar/protocol/FlespiProtocolDecoder.java | 319 +++++++++------------ 1 file changed, 129 insertions(+), 190 deletions(-) (limited to 'src') diff --git a/src/org/traccar/protocol/FlespiProtocolDecoder.java b/src/org/traccar/protocol/FlespiProtocolDecoder.java index 71f67b552..fefdb7df3 100644 --- a/src/org/traccar/protocol/FlespiProtocolDecoder.java +++ b/src/org/traccar/protocol/FlespiProtocolDecoder.java @@ -92,17 +92,13 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { Map.Entry param = it.next(); String paramName = param.getKey(); JsonValue paramValue = param.getValue(); - if ("timestamp".equals(paramName)) { - Date deviceTime = new Date((long) (((JsonNumber) paramValue).doubleValue() * 1000)); - position.setTime(deviceTime); - } else if (paramName.startsWith("position.")) { - savePosition(paramName, paramValue, position); - } else if (paramName.matches("din#[\\d]{1,2}")) { - saveInput(paramName, paramValue, position); - } else if (paramName.matches("dout#[\\d]{1,2}")) { - saveOutput(paramName, paramValue, position); - } else if (saveAlarm(paramName, paramValue, position) == 0 - && saveParam(paramName, paramValue, position) == 0) { + int index = -1; + if (paramName.contains("#")) { + String[] parts = paramName.split("#"); + paramName = parts[0]; + index = Integer.parseInt(parts[1]); + } + if (saveParam(paramName, index, paramValue, position) == 0) { saveUnknownParam(param.getKey(), param.getValue(), position); } } @@ -111,205 +107,148 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { } } - private void savePosition(String name, JsonValue value, Position position) { + private int saveParam(String name, int index, JsonValue value, Position position) { switch (name) { + case "timestamp": + Date deviceTime = new Date((long) (((JsonNumber) value).doubleValue() * 1000)); + position.setTime(deviceTime); + return 1; case "position.latitude": position.setLatitude(((JsonNumber) value).doubleValue()); - break; + return 1; case "position.longitude": position.setLongitude(((JsonNumber) value).doubleValue()); - break; + return 1; case "position.speed": position.setSpeed(((JsonNumber) value).doubleValue()); - break; + return 1; case "position.direction": position.setCourse(((JsonNumber) value).doubleValue()); - break; + return 1; case "position.altitude": position.setAltitude(((JsonNumber) value).doubleValue()); - break; + return 1; case "position.satellites": position.set(Position.KEY_SATELLITES, ((JsonNumber) value).intValue()); - break; + return 1; case "position.valid": position.setValid(value == JsonValue.TRUE); - break; + return 1; case "position.hdop": position.set(Position.KEY_HDOP, ((JsonNumber) value).doubleValue()); - break; + return 1; case "position.pdop": position.set(Position.KEY_PDOP, ((JsonNumber) value).doubleValue()); - break; - default: - saveUnknownParam(name, value, position); - break; - } - } - - private int saveParam(String name, JsonValue value, Position position) { - if (name == null) { - return 0; - } - if (name.equals("gps.vehicle.mileage") || name.startsWith("gps.vehicle.mileage#")) { - position.set(Position.KEY_ODOMETER, ((JsonNumber) value).doubleValue()); - return 1; - } - if (name.equals("external.powersource.voltage") || name.startsWith("external.powersource.voltage#")) { - position.set(Position.KEY_POWER, ((JsonNumber) value).doubleValue()); - return 1; - } - if (name.equals("battery.voltage") || name.startsWith("battery.voltage#")) { - position.set(Position.KEY_BATTERY, ((JsonNumber) value).doubleValue()); - return 1; - } - if (name.equals("fuel.level") || name.equals("can.fuel.level") - || name.startsWith("fuel.level#") || name.startsWith("can.fuel.level#")) { - position.set(Position.KEY_FUEL_LEVEL, ((JsonNumber) value).doubleValue()); - return 1; - } - if (name.equals("engine.rpm") || name.equals("can.engine.rpm") - || name.startsWith("engine.rpm#") || name.startsWith("can.engine.rpm#")) { - position.set(Position.KEY_RPM, ((JsonNumber) value).doubleValue()); - return 1; - } - if (name.equals("can.engine.temperature") || name.startsWith("can.engine.temperature#")) { - int seqNum = 0; - if (name.contains("#")) { - try { - seqNum = Integer.parseInt(name.replaceAll("can\\.engine\\.temperature#", "")); - } catch (NumberFormatException e) { - seqNum = 0; + return 1; + case "din": + case "dout": + String key = ("din".equals(name)) ? Position.KEY_INPUT : Position.KEY_OUTPUT; + if (value == JsonValue.TRUE && index <= 32 && index >= 1) { + if (position.getInteger(key) == 0) { + position.set(key, 1 << (index - 1)); + } else { + position.set(key, (position.getInteger(key) | 1 << (index - 1))); + } } - } - position.set(Position.PREFIX_TEMP + seqNum, ((JsonNumber) value).doubleValue()); - return 1; - } - if (name.equals("engine.ignition.status")) { - position.set(Position.KEY_IGNITION, value == JsonValue.TRUE); - return 1; - } - if (name.equals("movement.status")) { - position.set(Position.KEY_MOTION, value == JsonValue.TRUE); - return 1; - } - if (name.equals("device.temperature")) { - position.set(Position.KEY_DEVICE_TEMP, ((JsonNumber) value).doubleValue()); - return 1; - } - if (name.equals("ibutton.code")) { - position.set(Position.KEY_DRIVER_UNIQUE_ID, ((JsonString) value).getString()); - return 1; - } - if (name.equals("vehicle.vin")) { - position.set(Position.KEY_VIN, ((JsonString) value).getString()); - return 1; - } - return 0; - } - - private int saveAlarm(String name, JsonValue value, Position position) { - if ("alarm.event.trigger".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); - } - return 1; - } - if ("towing.event.trigger".equals(name) || "towing.alarm.status".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_TOW); - } - return 1; - } - if ("geofence.event.enter".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_ENTER); - } - return 1; - } - if ("geofence.event.exit".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT); - } - return 1; - } - if ("shock.event.trigger".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_SHOCK); - } - return 1; - } - if ("overspeeding.event.trigger".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); - } - return 1; - } - if ("harsh.acceleration.event.trigger".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION); - } - return 1; - } - if ("harsh.braking.event.trigger".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_BRAKING); - } - return 1; - } - if ("harsh.cornering.event.trigger".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_CORNERING); - } - return 1; - } - if ("gnss.antenna.cut.status".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_GPS_ANTENNA_CUT); - } - return 1; - } - if ("gsm.jamming.event.trigger".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_JAMMING); - } - return 1; - } - if ("hood.open.status".equals(name)) { - if (value == JsonValue.TRUE) { - position.set(Position.KEY_ALARM, Position.ALARM_BONNET); - } - return 1; - } - return 0; - } - - private void saveInput(String name, JsonValue value, Position position) { - if (value != JsonValue.TRUE) { - return; - } - int in = Integer.parseInt(name.replaceAll("^din#", "")); - if (in > 32 || in < 1) { - return; - } - if (position.getInteger(Position.KEY_INPUT) == 0) { - position.set(Position.KEY_INPUT, 1 << (in - 1)); - } else { - position.set(Position.KEY_INPUT, (position.getInteger(Position.KEY_INPUT) | 1 << (in - 1))); - } - } - - private void saveOutput(String name, JsonValue value, Position position) { - if (value != JsonValue.TRUE) { - return; - } - int out = Integer.parseInt(name.replaceAll("^dout#", "")); - if (out > 32 || out < 1) { - return; - } - if (position.getInteger(Position.KEY_OUTPUT) == 0) { - position.set(Position.KEY_OUTPUT, 1 << (out - 1)); - } else { - position.set(Position.KEY_OUTPUT, (position.getInteger(Position.KEY_OUTPUT) | 1 << (out - 1))); + return 1; + case "gps.vehicle.mileage": + position.set(Position.KEY_ODOMETER, ((JsonNumber) value).doubleValue()); + return 1; + case "external.powersource.voltage": + position.set(Position.KEY_POWER, ((JsonNumber) value).doubleValue()); + return 1; + case "battery.voltage": + position.set(Position.KEY_BATTERY, ((JsonNumber) value).doubleValue()); + return 1; + case "fuel.level": + case "can.fuel.level": + position.set(Position.KEY_FUEL_LEVEL, ((JsonNumber) value).doubleValue()); + return 1; + case "engine.rpm": + case "can.engine.rpm": + position.set(Position.KEY_RPM, ((JsonNumber) value).doubleValue()); + return 1; + case "can.engine.temperature": + position.set(Position.PREFIX_TEMP + (index > 0 ? index : 0), ((JsonNumber) value).doubleValue()); + return 1; + case "engine.ignition.status": + position.set(Position.KEY_IGNITION, value == JsonValue.TRUE); + return 1; + case "movement.status": + position.set(Position.KEY_MOTION, value == JsonValue.TRUE); + return 1; + case "device.temperature": + position.set(Position.KEY_DEVICE_TEMP, ((JsonNumber) value).doubleValue()); + return 1; + case "ibutton.code": + position.set(Position.KEY_DRIVER_UNIQUE_ID, ((JsonString) value).getString()); + return 1; + case "vehicle.vin": + position.set(Position.KEY_VIN, ((JsonString) value).getString()); + return 1; + case "alarm.event.trigger": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); + } + return 1; + case "towing.event.trigger": + case "towing.alarm.status": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_TOW); + } + return 1; + case "geofence.event.enter": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_ENTER); + } + return 1; + case "geofence.event.exit": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT); + } + return 1; + case "shock.event.trigger": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_SHOCK); + } + return 1; + case "overspeeding.event.trigger": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); + } + return 1; + case "harsh.acceleration.event.trigger": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION); + } + return 1; + case "harsh.braking.event.trigger": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_BRAKING); + } + return 1; + case "harsh.cornering.event.trigger": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_CORNERING); + } + return 1; + case "gnss.antenna.cut.status": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_GPS_ANTENNA_CUT); + } + return 1; + case "gsm.jamming.event.trigger": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_JAMMING); + } + return 1; + case "hood.open.status": + if (value == JsonValue.TRUE) { + position.set(Position.KEY_ALARM, Position.ALARM_BONNET); + } + return 1; + default: + return 0; } } -- cgit v1.2.3 From 4d188ce441334fe2e5cf075e333c123c77909c75 Mon Sep 17 00:00:00 2001 From: namo Date: Thu, 7 Dec 2017 12:39:17 +0300 Subject: saveParam return value changed to boolean --- .../traccar/protocol/FlespiProtocolDecoder.java | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/org/traccar/protocol/FlespiProtocolDecoder.java b/src/org/traccar/protocol/FlespiProtocolDecoder.java index fefdb7df3..89e6c6fd3 100644 --- a/src/org/traccar/protocol/FlespiProtocolDecoder.java +++ b/src/org/traccar/protocol/FlespiProtocolDecoder.java @@ -98,7 +98,7 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { paramName = parts[0]; index = Integer.parseInt(parts[1]); } - if (saveParam(paramName, index, paramValue, position) == 0) { + if (!saveParam(paramName, index, paramValue, position)) { saveUnknownParam(param.getKey(), param.getValue(), position); } } @@ -107,39 +107,39 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { } } - private int saveParam(String name, int index, JsonValue value, Position position) { + private boolean saveParam(String name, int index, JsonValue value, Position position) { switch (name) { case "timestamp": Date deviceTime = new Date((long) (((JsonNumber) value).doubleValue() * 1000)); position.setTime(deviceTime); - return 1; + return true; case "position.latitude": position.setLatitude(((JsonNumber) value).doubleValue()); - return 1; + return true; case "position.longitude": position.setLongitude(((JsonNumber) value).doubleValue()); - return 1; + return true; case "position.speed": position.setSpeed(((JsonNumber) value).doubleValue()); - return 1; + return true; case "position.direction": position.setCourse(((JsonNumber) value).doubleValue()); - return 1; + return true; case "position.altitude": position.setAltitude(((JsonNumber) value).doubleValue()); - return 1; + return true; case "position.satellites": position.set(Position.KEY_SATELLITES, ((JsonNumber) value).intValue()); - return 1; + return true; case "position.valid": position.setValid(value == JsonValue.TRUE); - return 1; + return true; case "position.hdop": position.set(Position.KEY_HDOP, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "position.pdop": position.set(Position.KEY_PDOP, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "din": case "dout": String key = ("din".equals(name)) ? Position.KEY_INPUT : Position.KEY_OUTPUT; @@ -150,105 +150,105 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder { position.set(key, (position.getInteger(key) | 1 << (index - 1))); } } - return 1; + return true; case "gps.vehicle.mileage": position.set(Position.KEY_ODOMETER, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "external.powersource.voltage": position.set(Position.KEY_POWER, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "battery.voltage": position.set(Position.KEY_BATTERY, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "fuel.level": case "can.fuel.level": position.set(Position.KEY_FUEL_LEVEL, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "engine.rpm": case "can.engine.rpm": position.set(Position.KEY_RPM, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "can.engine.temperature": position.set(Position.PREFIX_TEMP + (index > 0 ? index : 0), ((JsonNumber) value).doubleValue()); - return 1; + return true; case "engine.ignition.status": position.set(Position.KEY_IGNITION, value == JsonValue.TRUE); - return 1; + return true; case "movement.status": position.set(Position.KEY_MOTION, value == JsonValue.TRUE); - return 1; + return true; case "device.temperature": position.set(Position.KEY_DEVICE_TEMP, ((JsonNumber) value).doubleValue()); - return 1; + return true; case "ibutton.code": position.set(Position.KEY_DRIVER_UNIQUE_ID, ((JsonString) value).getString()); - return 1; + return true; case "vehicle.vin": position.set(Position.KEY_VIN, ((JsonString) value).getString()); - return 1; + return true; case "alarm.event.trigger": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); } - return 1; + return true; case "towing.event.trigger": case "towing.alarm.status": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_TOW); } - return 1; + return true; case "geofence.event.enter": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_ENTER); } - return 1; + return true; case "geofence.event.exit": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT); } - return 1; + return true; case "shock.event.trigger": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_SHOCK); } - return 1; + return true; case "overspeeding.event.trigger": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); } - return 1; + return true; case "harsh.acceleration.event.trigger": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION); } - return 1; + return true; case "harsh.braking.event.trigger": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_BRAKING); } - return 1; + return true; case "harsh.cornering.event.trigger": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_CORNERING); } - return 1; + return true; case "gnss.antenna.cut.status": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_GPS_ANTENNA_CUT); } - return 1; + return true; case "gsm.jamming.event.trigger": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_JAMMING); } - return 1; + return true; case "hood.open.status": if (value == JsonValue.TRUE) { position.set(Position.KEY_ALARM, Position.ALARM_BONNET); } - return 1; + return true; default: - return 0; + return false; } } -- cgit v1.2.3