aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-07-17 09:54:15 +0300
committerninioe <ninioe@gmail.com>2016-07-17 09:54:15 +0300
commit4d55b911bd252c90d1d0ec4053d8502154192676 (patch)
tree5cb88f24fb5ba9edbec1bd0593ed2878c401bb2d /src/org/traccar/protocol
parent636f6e19b4ae7fbd80ff083498fface8c12ee9c8 (diff)
downloadtraccar-server-4d55b911bd252c90d1d0ec4053d8502154192676.tar.gz
traccar-server-4d55b911bd252c90d1d0ec4053d8502154192676.tar.bz2
traccar-server-4d55b911bd252c90d1d0ec4053d8502154192676.zip
Added AlertEventHandler & Mute button for all notifications
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/H02ProtocolDecoder.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index ffe16e975..09375958e 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -24,6 +24,7 @@ import org.traccar.helper.BitUtil;
import org.traccar.helper.DateBuilder;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Event;
import org.traccar.model.Position;
import java.net.SocketAddress;
@@ -65,18 +66,17 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
private void processStatus(Position position, long status) {
if (!BitUtil.check(status, 0) || !BitUtil.check(status, 1)
|| !BitUtil.check(status, 3) || !BitUtil.check(status, 4) || !BitUtil.check(status, 7)) {
- position.set(Position.KEY_ALARM, true);
if (!BitUtil.check(status, 0)){
- position.set(Position.KEY_ALARM_TYPE, "theft");
+ position.set(Position.KEY_ALARM, Event.TYPE_VIBRATION_ALARM);//theft alarm
} else if (!BitUtil.check(status, 1)){
- position.set(Position.KEY_ALARM_TYPE, "robbery");
+ position.set(Position.KEY_ALARM, "robbery");
} else if (!BitUtil.check(status, 3)){
- position.set(Position.KEY_ALARM_TYPE, "illegal ignition");
+ position.set(Position.KEY_ALARM, "illegal ignition");
} else if (!BitUtil.check(status, 4)){
- position.set(Position.KEY_ALARM_TYPE, "entering");
+ position.set(Position.KEY_ALARM, "entering");
} else if (!BitUtil.check(status, 7)){
- position.set(Position.KEY_ALARM_TYPE, "out");
+ position.set(Position.KEY_ALARM, "out");
}
}