diff options
| author | Gavriel Fleischer <flocsy@gmail.com> | 2019-01-14 19:54:56 +0200 |
|---|---|---|
| committer | Gavriel Fleischer <flocsy@gmail.com> | 2019-01-14 19:54:56 +0200 |
| commit | 4022d0c0e4166716b6b20063de4daf5631c4579b (patch) | |
| tree | e7d26f4b6c171f3994bfa5785f3e33e6c8c620bd | |
| parent | 4650b7f1c866c9471a7ae79eb355256976d4b6c5 (diff) | |
| download | traccar-server-4022d0c0e4166716b6b20063de4daf5631c4579b.tar.gz traccar-server-4022d0c0e4166716b6b20063de4daf5631c4579b.tar.bz2 traccar-server-4022d0c0e4166716b6b20063de4daf5631c4579b.zip | |
added message sending to WatchProtocol
| -rw-r--r-- | src/org/traccar/model/Command.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/WatchProtocol.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/WatchProtocolEncoder.java | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index d50a66b36..336fc61f4 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -40,6 +40,7 @@ public class Command extends Message implements Cloneable { 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_MESSAGE = "message"; public static final String TYPE_VOICE_MESSAGE = "voiceMessage"; public static final String TYPE_OUTPUT_CONTROL = "outputControl"; public static final String TYPE_VOICE_MONITORING = "voiceMonitoring"; diff --git a/src/org/traccar/protocol/WatchProtocol.java b/src/org/traccar/protocol/WatchProtocol.java index 926d2826d..5d923106d 100644 --- a/src/org/traccar/protocol/WatchProtocol.java +++ b/src/org/traccar/protocol/WatchProtocol.java @@ -37,6 +37,7 @@ public class WatchProtocol extends BaseProtocol { Command.TYPE_SILENCE_TIME, Command.TYPE_ALARM_CLOCK, Command.TYPE_SET_PHONEBOOK, + Command.TYPE_MESSAGE, Command.TYPE_VOICE_MESSAGE, Command.TYPE_SET_TIMEZONE, Command.TYPE_SET_INDICATOR); diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java index 17952e3cd..f66ba4072 100644 --- a/src/org/traccar/protocol/WatchProtocolEncoder.java +++ b/src/org/traccar/protocol/WatchProtocolEncoder.java @@ -36,6 +36,8 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin double offset = TimeZone.getTimeZone((String) value).getRawOffset() / 3600000.0; DecimalFormat fmt = new DecimalFormat("+#.##;-#.##", DecimalFormatSymbols.getInstance(Locale.US)); return fmt.format(offset); + } else if (key.equals(Command.KEY_MESSAGE)) { + return DataConverter.printHex(value.toString().getBytes()); } return null; @@ -134,6 +136,8 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin return formatCommand(channel, command, "REMIND,{%s}", Command.KEY_DATA); case Command.TYPE_SET_PHONEBOOK: return formatCommand(channel, command, "PHB,{%s}", Command.KEY_DATA); + case Command.TYPE_MESSAGE: + return formatCommand(channel, command, "MESSAGE,{%s}", Command.KEY_MESSAGE); case Command.TYPE_VOICE_MESSAGE: return formatCommand(channel, command, "TK,%s", getBinaryData(command)); case Command.TYPE_POSITION_PERIODIC: |