diff options
| author | Gavriel Fleischer <flocsy@gmail.com> | 2019-11-09 23:51:41 +0200 |
|---|---|---|
| committer | Gavriel Fleischer <flocsy@gmail.com> | 2019-11-09 23:51:41 +0200 |
| commit | 47a1af1554b0216eae8248227407486c0eba8ef3 (patch) | |
| tree | 65478eb23a6ae1bc08248040498117802e20ff72 /src | |
| parent | fd6d1aa06ba983e17833b11393cfb344e5825fba (diff) | |
| download | trackermap-server-47a1af1554b0216eae8248227407486c0eba8ef3.tar.gz trackermap-server-47a1af1554b0216eae8248227407486c0eba8ef3.tar.bz2 trackermap-server-47a1af1554b0216eae8248227407486c0eba8ef3.zip | |
added language to watch protocol's set_timezone command
Diffstat (limited to 'src')
3 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/model/Command.java b/src/main/java/org/traccar/model/Command.java index 336fc61f4..abe538a10 100644 --- a/src/main/java/org/traccar/model/Command.java +++ b/src/main/java/org/traccar/model/Command.java @@ -68,6 +68,7 @@ public class Command extends Message implements Cloneable { public static final String KEY_UNIQUE_ID = "uniqueId"; public static final String KEY_FREQUENCY = "frequency"; + public static final String KEY_LANGUAGE = "language"; public static final String KEY_TIMEZONE = "timezone"; public static final String KEY_DEVICE_PASSWORD = "devicePassword"; public static final String KEY_RADIUS = "radius"; diff --git a/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java b/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java index b433dfd2a..1c535e9de 100644 --- a/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java +++ b/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java @@ -47,6 +47,8 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin return DataConverter.printHex(value.toString().getBytes(StandardCharsets.UTF_16BE)); } else if (key.equals(Command.KEY_ENABLE)) { return (boolean) value ? "1" : "0"; + } else if (key.equals(Command.KEY_LANGUAGE)) { + return String.valueOf(value); } return null; @@ -161,7 +163,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin case Command.TYPE_POSITION_PERIODIC: return formatTextCommand(channel, command, "UPLOAD,{%s}", Command.KEY_FREQUENCY); case Command.TYPE_SET_TIMEZONE: - return formatTextCommand(channel, command, "LZ,,{%s}", Command.KEY_TIMEZONE); + return formatTextCommand(channel, command, "LZ,{%s},{%s}", Command.KEY_LANGUAGE, Command.KEY_TIMEZONE); case Command.TYPE_SET_INDICATOR: return formatTextCommand(channel, command, "FLOWER,{%s}", Command.KEY_DATA); default: diff --git a/src/test/java/org/traccar/protocol/WatchProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/WatchProtocolEncoderTest.java index 798213c7b..a4a795050 100644 --- a/src/test/java/org/traccar/protocol/WatchProtocolEncoderTest.java +++ b/src/test/java/org/traccar/protocol/WatchProtocolEncoderTest.java @@ -78,6 +78,10 @@ public class WatchProtocolEncoderTest extends ProtocolTest { command.set(Command.KEY_TIMEZONE, "GMT-11:30"); verifyFrame(buffer("[CS*123456789012345*0009*LZ,,-11.5]"), encoder.encodeCommand(null, command)); + command.set(Command.KEY_LANGUAGE, 0); + command.set(Command.KEY_TIMEZONE, "GMT+05:45"); + verifyFrame(buffer("[CS*123456789012345*000a*LZ,0,+5.75]"), encoder.encodeCommand(null, command)); + } } |