aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-19 13:56:11 +1200
committerGitHub <noreply@github.com>2016-07-19 13:56:11 +1200
commit934371a0af815e18b3d29f350e96be60606de77b (patch)
tree13e4ad73a8b22bf31251fc2c2da450d07dbaaf8e
parent4054777eac379ce07560c44901ada659aad062ba (diff)
parent53b5d27767ff03da241c21e83b2cb2e12fcda60c (diff)
downloadtraccar-server-934371a0af815e18b3d29f350e96be60606de77b.tar.gz
traccar-server-934371a0af815e18b3d29f350e96be60606de77b.tar.bz2
traccar-server-934371a0af815e18b3d29f350e96be60606de77b.zip
Merge pull request #2126 from Abyss777/use_password_from_attributes
Use password from attributes to send command
-rw-r--r--src/org/traccar/protocol/TotemProtocolEncoder.java8
-rw-r--r--src/org/traccar/protocol/WondexProtocolEncoder.java10
2 files changed, 15 insertions, 3 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
diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java
index 9d000d9ea..568ca6aa0 100644
--- a/src/org/traccar/protocol/WondexProtocolEncoder.java
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -1,15 +1,21 @@
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.Command;
+import org.traccar.model.Device;
public class WondexProtocolEncoder extends StringProtocolEncoder {
@Override
protected Object encodeCommand(Command command) {
- // Temporary put default password
command.set(Command.KEY_DEVICE_PASSWORD, "0000");
+ 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()) {
case Command.TYPE_REBOOT_DEVICE: