diff options
author | Gavriel Fleischer <flocsy@gmail.com> | 2019-11-11 00:20:13 +0200 |
---|---|---|
committer | Gavriel Fleischer <flocsy@gmail.com> | 2019-11-11 00:20:13 +0200 |
commit | 8a696af4d92821ccf741c21dcbe118861008743a (patch) | |
tree | 74cd5697a87603c4b17ca84206cea9fc34d91f9f /src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java | |
parent | 47a1af1554b0216eae8248227407486c0eba8ef3 (diff) | |
parent | 81a7195b2efe148d47e3cf0cead0de415529bbab (diff) | |
download | trackermap-server-8a696af4d92821ccf741c21dcbe118861008743a.tar.gz trackermap-server-8a696af4d92821ccf741c21dcbe118861008743a.tar.bz2 trackermap-server-8a696af4d92821ccf741c21dcbe118861008743a.zip |
Merge branch 'master' into set-language
# Conflicts:
# src/main/java/org/traccar/StringProtocolEncoder.java
# src/main/java/org/traccar/protocol/WatchProtocolEncoder.java
Diffstat (limited to 'src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java')
-rw-r--r-- | src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java index 343ac9431..0c9f8ebb8 100644 --- a/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java +++ b/src/main/java/org/traccar/protocol/LaipacProtocolEncoder.java @@ -40,13 +40,13 @@ public class LaipacProtocolEncoder extends StringProtocolEncoder { switch (command.getType()) { case Command.TYPE_CUSTOM: - return formatCommand(command, "{%s}", + return formatCommand(command, "%s", Command.KEY_DATA); case Command.TYPE_POSITION_SINGLE: - return formatCommand(command, "AVREQ,{%s},1", + return formatCommand(command, "AVREQ,%s,1", Command.KEY_DEVICE_PASSWORD); case Command.TYPE_REBOOT_DEVICE: - return formatCommand(command, "AVRESET,{%s},{%s}", + return formatCommand(command, "AVRESET,%s,%s", Command.KEY_UNIQUE_ID, Command.KEY_DEVICE_PASSWORD); default: return null; |