diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-04-25 12:44:34 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-04-25 12:44:34 +1200 |
| commit | 0f04b2a8355cb25071d4f01c2e2abc2858636c36 (patch) | |
| tree | ec0bdf989f22c73196b5f3ebb6b5e7a7cea41616 /src/org | |
| parent | 3d9b8bdd2a4df0ef055e3dd064209fc5c3e8401d (diff) | |
| download | trackermap-server-0f04b2a8355cb25071d4f01c2e2abc2858636c36.tar.gz trackermap-server-0f04b2a8355cb25071d4f01c2e2abc2858636c36.tar.bz2 trackermap-server-0f04b2a8355cb25071d4f01c2e2abc2858636c36.zip | |
Add some new command types
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/model/Command.java | 10 | ||||
| -rw-r--r-- | src/org/traccar/protocol/MeiligaoProtocol.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/MeiligaoProtocolEncoder.java | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index eda5f61d1..bb3f2186e 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -31,8 +31,16 @@ public class Command extends Extensible { public static final String TYPE_SET_TIMEZONE = "setTimezone"; public static final String TYPE_REQUEST_PHOTO = "requestPhoto"; public static final String TYPE_REBOOT_DEVICE = "rebootDevice"; - public static final String TYPE_MOVEMENT_ALARM = "movementAlarm"; public static final String TYPE_SEND_SMS = "sendSms"; + public static final String TYPE_SOS_NUMBER = "sosNumber"; + public static final String TYPE_SILENCE_TIME = "silenceTime"; + public static final String TYPE_SET_PHONEBOOK = "setPhonebook"; + + public static final String TYPE_ALARM_GEOFENCE = "movementAlarm"; + public static final String TYPE_ALARM_BATTERY = "alarmBattery"; + public static final String TYPE_ALARM_SOS = "alarmSos"; + public static final String TYPE_ALARM_REMOVE = "alarmRemove"; + public static final String TYPE_ALARM_CLOCK = "alarmClock"; public static final String KEY_UNIQUE_ID = "uniqueId"; public static final String KEY_FREQUENCY = "frequency"; diff --git a/src/org/traccar/protocol/MeiligaoProtocol.java b/src/org/traccar/protocol/MeiligaoProtocol.java index 2e4226e19..04e15fcee 100644 --- a/src/org/traccar/protocol/MeiligaoProtocol.java +++ b/src/org/traccar/protocol/MeiligaoProtocol.java @@ -32,7 +32,7 @@ public class MeiligaoProtocol extends BaseProtocol { Command.TYPE_POSITION_PERIODIC, Command.TYPE_ENGINE_STOP, Command.TYPE_ENGINE_RESUME, - Command.TYPE_MOVEMENT_ALARM, + Command.TYPE_ALARM_GEOFENCE, Command.TYPE_SET_TIMEZONE, Command.TYPE_REBOOT_DEVICE); } diff --git a/src/org/traccar/protocol/MeiligaoProtocolEncoder.java b/src/org/traccar/protocol/MeiligaoProtocolEncoder.java index 4aae12add..a40ce9271 100644 --- a/src/org/traccar/protocol/MeiligaoProtocolEncoder.java +++ b/src/org/traccar/protocol/MeiligaoProtocolEncoder.java @@ -76,7 +76,7 @@ public class MeiligaoProtocolEncoder extends BaseProtocolEncoder { case Command.TYPE_ENGINE_RESUME: content.writeByte(0x00); return encodeContent(command.getDeviceId(), MSG_OUTPUT_CONTROL, content); - case Command.TYPE_MOVEMENT_ALARM: + case Command.TYPE_ALARM_GEOFENCE: content.writeShort(((Number) attributes.get(Command.KEY_RADIUS)).intValue()); return encodeContent(command.getDeviceId(), MSG_MOVEMENT_ALARM, content); case Command.TYPE_SET_TIMEZONE: |