diff options
| author | ninioe <ninioe@gmail.com> | 2016-07-19 15:20:15 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-07-19 15:20:15 +0300 |
| commit | 20f603076210073e122c720e21a3e8999478b11a (patch) | |
| tree | 668a50e6c55601c2420bf0f4b986ed0b194c2e32 /src/org/traccar/protocol/TotemProtocolEncoder.java | |
| parent | e954e95547d05a34bbd36e3aa5003f4ddaf2ccd0 (diff) | |
| parent | 00e2f8a3575855a8b863e245005b8f83b3314bfb (diff) | |
| download | traccar-server-20f603076210073e122c720e21a3e8999478b11a.tar.gz traccar-server-20f603076210073e122c720e21a3e8999478b11a.tar.bz2 traccar-server-20f603076210073e122c720e21a3e8999478b11a.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/protocol/TotemProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/protocol/TotemProtocolEncoder.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java index 51d6fec1e..1c870f63c 100644 --- a/src/org/traccar/protocol/TotemProtocolEncoder.java +++ b/src/org/traccar/protocol/TotemProtocolEncoder.java @@ -16,17 +16,23 @@ */ package org.traccar.protocol; +import org.traccar.Context; import org.traccar.StringProtocolEncoder; import org.traccar.helper.Log; import org.traccar.model.Command; +import org.traccar.model.Device; public class TotemProtocolEncoder extends StringProtocolEncoder { @Override protected Object encodeCommand(Command command) { - // Temporary put default password command.set(Command.KEY_DEVICE_PASSWORD, "000000"); + Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId()); + if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) { + command.set(Command.KEY_DEVICE_PASSWORD, (String) device.getAttributes() + .get(Command.KEY_DEVICE_PASSWORD)); + } switch (command.getType()) { //Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8 |