From 76420fb31d41a62bc0fe19e8fea63be374c67b61 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 11 Aug 2016 08:27:11 +0500 Subject: Changed KEY_IGNITION to boolean in 3 protocols --- src/org/traccar/protocol/IdplProtocolDecoder.java | 2 +- src/org/traccar/protocol/Stl060ProtocolDecoder.java | 4 ++-- src/org/traccar/protocol/VisiontekProtocolDecoder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/traccar/protocol/IdplProtocolDecoder.java b/src/org/traccar/protocol/IdplProtocolDecoder.java index b0d331e3e..5b8ec7897 100644 --- a/src/org/traccar/protocol/IdplProtocolDecoder.java +++ b/src/org/traccar/protocol/IdplProtocolDecoder.java @@ -100,7 +100,7 @@ public class IdplProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_ALARM, parser.nextInt()); parser.nextInt(); // body tamper parser.nextInt(); // ac status - position.set(Position.KEY_IGNITION, parser.nextInt()); + position.set(Position.KEY_IGNITION, parser.nextInt() == 1); position.set(Position.KEY_OUTPUT, parser.nextInt()); position.set(Position.PREFIX_ADC + 1, parser.nextInt()); position.set(Position.PREFIX_ADC + 2, parser.nextInt()); diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java index b8eb5ed3d..86b097f77 100644 --- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java +++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.java @@ -98,7 +98,7 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { // Old format if (parser.hasNext(5)) { position.set(Position.KEY_ODOMETER, parser.nextInt()); - position.set(Position.KEY_IGNITION, parser.nextInt()); + position.set(Position.KEY_IGNITION, parser.nextInt() == 1); position.set(Position.KEY_INPUT, parser.nextInt() + parser.nextInt() << 1); position.set(Position.KEY_FUEL, parser.nextInt()); } @@ -106,7 +106,7 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { // New format if (parser.hasNext(10)) { position.set(Position.KEY_CHARGE, parser.nextInt() == 1); - position.set(Position.KEY_IGNITION, parser.nextInt()); + position.set(Position.KEY_IGNITION, parser.nextInt() == 1); position.set(Position.KEY_INPUT, parser.nextInt()); position.set(Position.KEY_RFID, parser.next()); position.set(Position.KEY_ODOMETER, parser.nextInt()); diff --git a/src/org/traccar/protocol/VisiontekProtocolDecoder.java b/src/org/traccar/protocol/VisiontekProtocolDecoder.java index bfd4a78fa..47a8b20cf 100644 --- a/src/org/traccar/protocol/VisiontekProtocolDecoder.java +++ b/src/org/traccar/protocol/VisiontekProtocolDecoder.java @@ -109,7 +109,7 @@ public class VisiontekProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_SATELLITES, parser.next()); position.set(Position.KEY_ODOMETER, parser.next()); - position.set(Position.KEY_IGNITION, parser.next()); + position.set(Position.KEY_IGNITION, parser.next().equals("1")); position.set(Position.PREFIX_IO + 1, parser.next()); position.set(Position.PREFIX_IO + 2, parser.next()); position.set("immobilizer", parser.next()); -- cgit v1.2.3 From 16ec66e18af7c421e80591cf6c463c52980665ec Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 11 Aug 2016 09:51:40 +0500 Subject: - Added IgnitionEventHandler - Added unit test for some EventHandlers - Changed a bit IdentityManager to fit EventHandlerTest --- src/org/traccar/database/IdentityManager.java | 2 + src/org/traccar/events/GeofenceEventHandler.java | 2 +- src/org/traccar/events/IgnitionEventHandler.java | 67 ++++++++++++++++++++++ src/org/traccar/events/MotionEventHandler.java | 4 +- src/org/traccar/events/OverspeedEventHandler.java | 4 +- src/org/traccar/model/Event.java | 3 + test/org/traccar/EventHandlerTest.java | 43 ++++++++++++++ test/org/traccar/ProtocolTest.java | 5 ++ test/org/traccar/events/AlertEventHandlerTest.java | 28 +++++++++ .../events/CommandResultEventHandlerTest.java | 28 +++++++++ .../traccar/events/IgnitionEventHandlerTest.java | 29 ++++++++++ .../org/traccar/events/MotionEventHandlerTest.java | 29 ++++++++++ 12 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 src/org/traccar/events/IgnitionEventHandler.java create mode 100644 test/org/traccar/EventHandlerTest.java create mode 100644 test/org/traccar/events/AlertEventHandlerTest.java create mode 100644 test/org/traccar/events/CommandResultEventHandlerTest.java create mode 100644 test/org/traccar/events/IgnitionEventHandlerTest.java create mode 100644 test/org/traccar/events/MotionEventHandlerTest.java diff --git a/src/org/traccar/database/IdentityManager.java b/src/org/traccar/database/IdentityManager.java index 8c0de8b38..8507d1f2e 100644 --- a/src/org/traccar/database/IdentityManager.java +++ b/src/org/traccar/database/IdentityManager.java @@ -26,4 +26,6 @@ public interface IdentityManager { Position getLastPosition(long deviceId); + boolean isLatestPosition(Position position); + } diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java index a0291dcfa..6126331bd 100644 --- a/src/org/traccar/events/GeofenceEventHandler.java +++ b/src/org/traccar/events/GeofenceEventHandler.java @@ -40,7 +40,7 @@ public class GeofenceEventHandler extends BaseEventHandler { if (device == null) { return null; } - if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) { + if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) { return null; } diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java new file mode 100644 index 000000000..297049ccd --- /dev/null +++ b/src/org/traccar/events/IgnitionEventHandler.java @@ -0,0 +1,67 @@ +/* + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.events; + +import java.util.ArrayList; +import java.util.Collection; + +import org.traccar.BaseEventHandler; +import org.traccar.Context; +import org.traccar.model.Device; +import org.traccar.model.Event; +import org.traccar.model.Position; + +public class IgnitionEventHandler extends BaseEventHandler { + + @Override + protected Collection analyzePosition(Position position) { + Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId()); + if (device == null) { + return null; + } + if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) { + return null; + } + + Collection result = null; + + boolean ignition = false; + Object ignitionObject = position.getAttributes().get(Position.KEY_IGNITION); + if (ignitionObject != null && Boolean.parseBoolean(ignitionObject.toString())) { + ignition = true; + } + + boolean oldIgnition = false; + Object oldIgnitionObject = null; + Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId()); + if (lastPosition != null) { + oldIgnitionObject = lastPosition.getAttributes().get(Position.KEY_IGNITION); + } + if (oldIgnitionObject != null && Boolean.parseBoolean(oldIgnitionObject.toString())) { + oldIgnition = true; + } + + if (ignition && !oldIgnition) { + result = new ArrayList<>(); + result.add(new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId())); + } else if (!ignition && oldIgnition) { + result = new ArrayList<>(); + result.add(new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId())); + } + return result; + } + +} diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java index ddb99185f..7178f7036 100644 --- a/src/org/traccar/events/MotionEventHandler.java +++ b/src/org/traccar/events/MotionEventHandler.java @@ -35,14 +35,14 @@ public class MotionEventHandler extends BaseEventHandler { if (device == null) { return null; } - if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) { + if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) { return null; } Collection result = null; double speed = position.getSpeed(); double oldSpeed = 0; - Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId()); + Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId()); if (lastPosition != null) { oldSpeed = lastPosition.getSpeed(); } diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java index dbdb01ffb..c739348eb 100644 --- a/src/org/traccar/events/OverspeedEventHandler.java +++ b/src/org/traccar/events/OverspeedEventHandler.java @@ -42,7 +42,7 @@ public class OverspeedEventHandler extends BaseEventHandler { if (device == null) { return null; } - if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) { + if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) { return null; } @@ -58,7 +58,7 @@ public class OverspeedEventHandler extends BaseEventHandler { } double oldSpeed = 0; if (notRepeat) { - Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId()); + Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId()); if (lastPosition != null) { oldSpeed = lastPosition.getSpeed(); } diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java index a2c346688..c3c8b5320 100644 --- a/src/org/traccar/model/Event.java +++ b/src/org/traccar/model/Event.java @@ -50,6 +50,9 @@ public class Event extends Message { public static final String TYPE_ALARM = "alarm"; + public static final String TYPE_IGNITION_ON = "ignitionOn"; + public static final String TYPE_IGNITION_OFF = "ignitionOff"; + private Date serverTime; public Date getServerTime() { diff --git a/test/org/traccar/EventHandlerTest.java b/test/org/traccar/EventHandlerTest.java new file mode 100644 index 000000000..423a5084f --- /dev/null +++ b/test/org/traccar/EventHandlerTest.java @@ -0,0 +1,43 @@ +package org.traccar; + +import org.traccar.database.IdentityManager; +import org.traccar.model.Device; +import org.traccar.model.Position; + +public class EventHandlerTest { + + static { + Context.init(new IdentityManager() { + + private Device createDevice() { + Device device = new Device(); + device.setId(1); + device.setName("test"); + device.setUniqueId("123456789012345"); + return device; + } + + @Override + public Device getDeviceById(long id) { + return createDevice(); + } + + @Override + public Device getDeviceByUniqueId(String uniqueId) { + return createDevice(); + } + + @Override + public Position getLastPosition(long deviceId) { + return null; + } + + @Override + public boolean isLatestPosition(Position position) { + return true; + } + + }); + } + +} diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index 07a19b691..c6c957679 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -49,6 +49,11 @@ public class ProtocolTest { public Position getLastPosition(long deviceId) { return null; } + + @Override + public boolean isLatestPosition(Position position) { + return true; + } }); } diff --git a/test/org/traccar/events/AlertEventHandlerTest.java b/test/org/traccar/events/AlertEventHandlerTest.java new file mode 100644 index 000000000..c6d5e07d9 --- /dev/null +++ b/test/org/traccar/events/AlertEventHandlerTest.java @@ -0,0 +1,28 @@ +package org.traccar.events; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Collection; + +import org.junit.Test; +import org.traccar.EventHandlerTest; +import org.traccar.model.Event; +import org.traccar.model.Position; + +public class AlertEventHandlerTest extends EventHandlerTest { + + @Test + public void testAlertEventHandler() throws Exception { + + AlertEventHandler alertEventHandler = new AlertEventHandler(); + + Position position = new Position(); + position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); + Collection events = alertEventHandler.analyzePosition(position); + assertNotNull(events); + Event event = (Event) events.toArray()[0]; + assertEquals(Event.TYPE_ALARM, event.getType()); + } + +} diff --git a/test/org/traccar/events/CommandResultEventHandlerTest.java b/test/org/traccar/events/CommandResultEventHandlerTest.java new file mode 100644 index 000000000..b09898b4a --- /dev/null +++ b/test/org/traccar/events/CommandResultEventHandlerTest.java @@ -0,0 +1,28 @@ +package org.traccar.events; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Collection; + +import org.junit.Test; +import org.traccar.EventHandlerTest; +import org.traccar.model.Event; +import org.traccar.model.Position; + +public class CommandResultEventHandlerTest extends EventHandlerTest { + + @Test + public void testCommandResultEventHandler() throws Exception { + + CommandResultEventHandler commandResultEventHandler = new CommandResultEventHandler(); + + Position position = new Position(); + position.set(Position.KEY_RESULT, "Test Result"); + Collection events = commandResultEventHandler.analyzePosition(position); + assertNotNull(events); + Event event = (Event) events.toArray()[0]; + assertEquals(Event.TYPE_COMMAND_RESULT, event.getType()); + } + +} diff --git a/test/org/traccar/events/IgnitionEventHandlerTest.java b/test/org/traccar/events/IgnitionEventHandlerTest.java new file mode 100644 index 000000000..96df6e1ed --- /dev/null +++ b/test/org/traccar/events/IgnitionEventHandlerTest.java @@ -0,0 +1,29 @@ +package org.traccar.events; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Collection; + +import org.junit.Test; +import org.traccar.EventHandlerTest; +import org.traccar.model.Event; +import org.traccar.model.Position; + +public class IgnitionEventHandlerTest extends EventHandlerTest{ + + @Test + public void testIgnitionEventHandler() throws Exception { + + IgnitionEventHandler ignitionEventHandler = new IgnitionEventHandler(); + + Position position = new Position(); + position.set(Position.KEY_IGNITION, true); + position.setValid(true); + Collection events = ignitionEventHandler.analyzePosition(position); + assertNotNull(events); + Event event = (Event) events.toArray()[0]; + assertEquals(Event.TYPE_IGNITION_ON, event.getType()); + } + +} diff --git a/test/org/traccar/events/MotionEventHandlerTest.java b/test/org/traccar/events/MotionEventHandlerTest.java new file mode 100644 index 000000000..34b2c481d --- /dev/null +++ b/test/org/traccar/events/MotionEventHandlerTest.java @@ -0,0 +1,29 @@ +package org.traccar.events; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Collection; + +import org.junit.Test; +import org.traccar.EventHandlerTest; +import org.traccar.model.Event; +import org.traccar.model.Position; + +public class MotionEventHandlerTest extends EventHandlerTest { + + @Test + public void testMotionEventHandler() throws Exception { + + MotionEventHandler motionEventHandler = new MotionEventHandler(); + + Position position = new Position(); + position.setSpeed(10.0); + position.setValid(true); + Collection events = motionEventHandler.analyzePosition(position); + assertNotNull(events); + Event event = (Event) events.toArray()[0]; + assertEquals(Event.TYPE_DEVICE_MOVING, event.getType()); + } + +} -- cgit v1.2.3 From 834a3d7f337555f579b77e57320583778f0f3d29 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 11 Aug 2016 10:07:42 +0500 Subject: Added message templates for alarm and ignition events --- .../notification/NotificationFormatter.java | 41 +++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java index 449426df0..1d5257b4f 100644 --- a/src/org/traccar/notification/NotificationFormatter.java +++ b/src/org/traccar/notification/NotificationFormatter.java @@ -70,6 +70,23 @@ public final class NotificationFormatter { + "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n" + "Time: %2$tc%n"; + public static final String TITLE_TEMPLATE_TYPE_ALARM = "%1$s: alarm!"; + public static final String MESSAGE_TEMPLATE_TYPE_ALARM = "Device: %1$s%n" + + "Alarm: %5$s%n" + + "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n" + + "Time: %2$tc%n"; + + public static final String TITLE_TEMPLATE_TYPE_IGNITION_ON = "%1$s: ignition ON"; + public static final String MESSAGE_TEMPLATE_TYPE_IGNITION_ON = "Device: %1$s%n" + + "Ignition ON%n" + + "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n" + + "Time: %2$tc%n"; + public static final String TITLE_TEMPLATE_TYPE_IGNITION_OFF = "%1$s: ignition OFF"; + public static final String MESSAGE_TEMPLATE_TYPE_IGNITION_OFF = "Device: %1$s%n" + + "Ignition OFF%n" + + "Point: http://www.openstreetmap.org/?mlat=%3$f&mlon=%4$f#map=16/%3$f/%4$f%n" + + "Time: %2$tc%n"; + public static String formatTitle(long userId, Event event, Position position) { Device device = Context.getIdentityManager().getDeviceById(event.getDeviceId()); StringBuilder stringBuilder = new StringBuilder(); @@ -100,6 +117,15 @@ public final class NotificationFormatter { case Event.TYPE_GEOFENCE_EXIT: formatter.format(TITLE_TEMPLATE_TYPE_GEOFENCE_EXIT, device.getName()); break; + case Event.TYPE_ALARM: + formatter.format(TITLE_TEMPLATE_TYPE_ALARM, device.getName()); + break; + case Event.TYPE_IGNITION_ON: + formatter.format(TITLE_TEMPLATE_TYPE_IGNITION_ON, device.getName()); + break; + case Event.TYPE_IGNITION_OFF: + formatter.format(TITLE_TEMPLATE_TYPE_IGNITION_OFF, device.getName()); + break; default: formatter.format("Unknown type"); break; @@ -117,7 +143,7 @@ public final class NotificationFormatter { switch (event.getType()) { case Event.TYPE_COMMAND_RESULT: formatter.format(MESSAGE_TEMPLATE_TYPE_COMMAND_RESULT, device.getName(), event.getServerTime(), - position.getAttributes().get("result")); + position.getAttributes().get(Position.KEY_RESULT)); break; case Event.TYPE_DEVICE_ONLINE: formatter.format(MESSAGE_TEMPLATE_TYPE_DEVICE_ONLINE, device.getName(), event.getServerTime()); @@ -147,6 +173,19 @@ public final class NotificationFormatter { position.getLatitude(), position.getLongitude(), Context.getGeofenceManager().getGeofence(event.getGeofenceId()).getName()); break; + case Event.TYPE_ALARM: + formatter.format(MESSAGE_TEMPLATE_TYPE_ALARM, device.getName(), event.getServerTime(), + position.getLatitude(), position.getLongitude(), + position.getAttributes().get(Position.KEY_ALARM)); + break; + case Event.TYPE_IGNITION_ON: + formatter.format(MESSAGE_TEMPLATE_TYPE_IGNITION_ON, device.getName(), position.getFixTime(), + position.getLatitude(), position.getLongitude()); + break; + case Event.TYPE_IGNITION_OFF: + formatter.format(MESSAGE_TEMPLATE_TYPE_IGNITION_OFF, device.getName(), position.getFixTime(), + position.getLatitude(), position.getLongitude()); + break; default: formatter.format("Unknown type"); break; -- cgit v1.2.3 From d89466435165e978429b609f43d3e5904212da3b Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 11 Aug 2016 10:12:39 +0500 Subject: Added strings for ignition events --- web/l10n/en.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/l10n/en.json b/web/l10n/en.json index b98e6d127..ef318bd74 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -121,6 +121,8 @@ "eventGeofenceEnter": "Device has entered geofence", "eventGeofenceExit": "Device has exited geofence", "eventAlarm": "Alarms", + "eventIgnitionOn": "Ignition is ON", + "eventIgnitionOff": "Ignition is OFF", "alarm": "Alarm", "alarmSos": "SOS Alarm", "alarmVibration": "Vibration Alarm", -- cgit v1.2.3 From 46be66c0639032c8ebf222f79e3a52b2b120ad24 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 11 Aug 2016 11:34:51 +0500 Subject: - Enabled IgnitionEventHandler in pipeline - Added motorHours to SummaryReport - Added ignition to test-generator.py --- debug.xml | 1 + src/org/traccar/BasePipelineFactory.java | 9 +++++++++ src/org/traccar/reports/Summary.java | 8 ++++++++ src/org/traccar/reports/model/SummaryReport.java | 11 +++++++++++ tools/test-generator.py | 7 +++++-- 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/debug.xml b/debug.xml index 3f875aae7..8570f6893 100644 --- a/debug.xml +++ b/debug.xml @@ -49,6 +49,7 @@ true true true + true