aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-07-19 10:20:51 +0300
committerninioe <ninioe@gmail.com>2016-07-19 10:20:51 +0300
commitbfa3fa62305858166d8acdcf6da4a6d33249877d (patch)
tree8cac0dc85f2da735055333a9d90b86c71579d1e5 /src/org/traccar
parentef40f3317392068692606b484c6782b95b554cbf (diff)
downloadtrackermap-server-bfa3fa62305858166d8acdcf6da4a6d33249877d.tar.gz
trackermap-server-bfa3fa62305858166d8acdcf6da4a6d33249877d.tar.bz2
trackermap-server-bfa3fa62305858166d8acdcf6da4a6d33249877d.zip
changed to generic alarm type event
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/events/AlertEventHandler.java10
-rw-r--r--src/org/traccar/model/Event.java5
-rw-r--r--src/org/traccar/protocol/H02ProtocolDecoder.java2
3 files changed, 3 insertions, 14 deletions
diff --git a/src/org/traccar/events/AlertEventHandler.java b/src/org/traccar/events/AlertEventHandler.java
index 92d1566a7..61c2d7b16 100644
--- a/src/org/traccar/events/AlertEventHandler.java
+++ b/src/org/traccar/events/AlertEventHandler.java
@@ -29,15 +29,7 @@ public class AlertEventHandler extends BaseEventHandler {
Object alarm = position.getAttributes().get(Position.KEY_ALARM);
if (alarm != null) {
Collection<Event> events = new ArrayList<>();
- if(alarm.equals(Event.TYPE_SOS_ALARM)){
- events.add(new Event(Event.TYPE_SOS_ALARM, position.getDeviceId(), position.getId()));
- } else if(alarm.equals(Event.TYPE_VIBRATION_ALARM)){
- events.add(new Event(Event.TYPE_VIBRATION_ALARM, position.getDeviceId(), position.getId()));
- } else if(alarm.equals(Event.TYPE_MOVEMENT_ALARM)){
- events.add(new Event(Event.TYPE_MOVEMENT_ALARM, position.getDeviceId(), position.getId()));
- } else if(alarm.equals(Event.TYPE_OVERSPEED_ALARM)){
- events.add(new Event(Event.TYPE_OVERSPEED_ALARM, position.getDeviceId(), position.getId()));
- }
+ events.add(new Event(Event.TYPE_ALARM, position.getDeviceId(), position.getId()));
return events;
}
return null;
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 3a0056bd6..a2c346688 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -48,10 +48,7 @@ public class Event extends Message {
public static final String TYPE_GEOFENCE_ENTER = "geofenceEnter";
public static final String TYPE_GEOFENCE_EXIT = "geofenceExit";
- public static final String TYPE_SOS_ALARM = "sosAlarm";
- public static final String TYPE_VIBRATION_ALARM = "vibrationAlarm";
- public static final String TYPE_MOVEMENT_ALARM = "movementAlarm";
- public static final String TYPE_OVERSPEED_ALARM = "overspeedAlarm";
+ public static final String TYPE_ALARM = "alarm";
private Date serverTime;
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index 09375958e..51bcfa26c 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -68,7 +68,7 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
|| !BitUtil.check(status, 3) || !BitUtil.check(status, 4) || !BitUtil.check(status, 7)) {
if (!BitUtil.check(status, 0)){
- position.set(Position.KEY_ALARM, Event.TYPE_VIBRATION_ALARM);//theft alarm
+ position.set(Position.KEY_ALARM, Position.ALARM_VIBRATION);//theft alarm in protocol
} else if (!BitUtil.check(status, 1)){
position.set(Position.KEY_ALARM, "robbery");
} else if (!BitUtil.check(status, 3)){