diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-10-05 22:44:01 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 22:44:01 +1300 |
| commit | 273a1b8faba5894d83c7feb64fce6351817be769 (patch) | |
| tree | 439ab219a1facfd5f289c22076c3d13a5fbab3d0 /src/org/traccar/protocol/Gl200ProtocolEncoder.java | |
| parent | 44d36f3adea94b98c88b6e491d22f4466678ad6d (diff) | |
| parent | 1160c79fa59518f70183aea4b58b12755bdf6475 (diff) | |
| download | traccar-server-273a1b8faba5894d83c7feb64fce6351817be769.tar.gz traccar-server-273a1b8faba5894d83c7feb64fce6351817be769.tar.bz2 traccar-server-273a1b8faba5894d83c7feb64fce6351817be769.zip | |
Merge pull request #2407 from Abyss777/gl200
GL200 Password for commands and heartbeat authentication
Diffstat (limited to 'src/org/traccar/protocol/Gl200ProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/protocol/Gl200ProtocolEncoder.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolEncoder.java b/src/org/traccar/protocol/Gl200ProtocolEncoder.java index 0537420a0..25ca1bf75 100644 --- a/src/org/traccar/protocol/Gl200ProtocolEncoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolEncoder.java @@ -24,15 +24,21 @@ public class Gl200ProtocolEncoder extends StringProtocolEncoder { @Override protected Object encodeCommand(Command command) { + initDevicePassword(command, ""); + switch (command.getType()) { case Command.TYPE_POSITION_SINGLE: - return "AT+GTRTO=gv300,1,,,,,,FFFF$"; + return formatCommand(command, "AT+GTRTO={%s},1,,,,,,FFFF$", Command.KEY_DEVICE_PASSWORD); case Command.TYPE_ENGINE_STOP: - return "AT+GTOUT=gv300,1,,,0,0,0,0,0,0,0,,,,,,,FFFF$"; + return formatCommand(command, "AT+GTOUT={%s},1,,,0,0,0,0,0,0,0,,,,,,,FFFF$", + Command.KEY_DEVICE_PASSWORD); case Command.TYPE_ENGINE_RESUME: - return "AT+GTOUT=gv300,0,,,0,0,0,0,0,0,0,,,,,,,FFFF$"; + return formatCommand(command, "AT+GTOUT={%s},0,,,0,0,0,0,0,0,0,,,,,,,FFFF$", + Command.KEY_DEVICE_PASSWORD); + case Command.TYPE_IDENTIFICATION: + return formatCommand(command, "AT+GTRTO={%s},8,,,,,,FFFF$", Command.KEY_DEVICE_PASSWORD); case Command.TYPE_REBOOT_DEVICE: - return "AT+GTRTO=gv300,3,,,,,,FFFF$"; + return formatCommand(command, "AT+GTRTO={%s},3,,,,,,FFFF$", Command.KEY_DEVICE_PASSWORD); default: Log.warning(new UnsupportedOperationException(command.getType())); break; |