aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-07-18 17:45:40 +0500
committerAbyss777 <abyss@fox5.ru>2016-07-18 17:47:18 +0500
commit69b21e59dda3677a641adf8edeb78e31f76d8267 (patch)
tree124a1132eef66caa6f580c4d99b2d56371a96a94 /src
parent464711d63dafb44e89f3d4112f13250f268c11cd (diff)
downloadtraccar-server-69b21e59dda3677a641adf8edeb78e31f76d8267.tar.gz
traccar-server-69b21e59dda3677a641adf8edeb78e31f76d8267.tar.bz2
traccar-server-69b21e59dda3677a641adf8edeb78e31f76d8267.zip
Use password for command from device attributes
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/TotemProtocolEncoder.java11
-rw-r--r--src/org/traccar/protocol/WondexProtocolEncoder.java13
2 files changed, 21 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java
index 51d6fec1e..50e15075e 100644
--- a/src/org/traccar/protocol/TotemProtocolEncoder.java
+++ b/src/org/traccar/protocol/TotemProtocolEncoder.java
@@ -16,17 +16,26 @@
*/
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");
+ if (Context.getDeviceManager() != null) {
+ Device device = Context.getDeviceManager().getDeviceById(command.getDeviceId());
+ if (device != null) {
+ if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
+ command.set(Command.KEY_DEVICE_PASSWORD, device.getAttributes().get(Command.KEY_DEVICE_PASSWORD).toString());
+ }
+ }
+ }
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..20341ae8d 100644
--- a/src/org/traccar/protocol/WondexProtocolEncoder.java
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -1,15 +1,24 @@
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");
+ if (Context.getDeviceManager() != null) {
+ Device device = Context.getDeviceManager().getDeviceById(command.getDeviceId());
+ if (device != null) {
+ if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) {
+ command.set(Command.KEY_DEVICE_PASSWORD, device.getAttributes().get(Command.KEY_DEVICE_PASSWORD).toString());
+ }
+ }
+ }
switch (command.getType()) {
case Command.TYPE_REBOOT_DEVICE: