Update some encoders with hardcoded protocol names and passwords

5 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolEncoder.java
index bbc5e02d8..a3ceb4f30 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolEncoder.java
@@ -34,7 +34,7 @@ public class Gt06ProtocolEncoder extends BaseProtocolEncoder {
     private ByteBuf encodeContent(long deviceId, String content) {
 
         boolean language = Context.getIdentityManager()
-            .lookupAttributeBoolean(deviceId, "gt06.language", false, false, true);
+            .lookupAttributeBoolean(deviceId, getProtocolName() + ".language", false, false, true);
 
         ByteBuf buf = Unpooled.buffer();
 
@@ -67,13 +67,17 @@ public class Gt06ProtocolEncoder extends BaseProtocolEncoder {
     protected Object encodeCommand(Command command) {
 
         boolean alternative = Context.getIdentityManager().lookupAttributeBoolean(
-                command.getDeviceId(), "gt06.alternative", false, false, true);
+                command.getDeviceId(), getProtocolName() + ".alternative", false, false, true);
+
+        initDevicePassword(command, "123456");
 
         switch (command.getType()) {
             case Command.TYPE_ENGINE_STOP:
-                return encodeContent(command.getDeviceId(), alternative ? "DYD,123456#" : "Relay,1#");
+                return encodeContent(command.getDeviceId(),
+                    alternative ? "DYD," + Command.KEY_DEVICE_PASSWORD + "#" : "Relay,1#");
             case Command.TYPE_ENGINE_RESUME:
-                return encodeContent(command.getDeviceId(), alternative ? "HFYD,123456#" : "Relay,0#");
+                return encodeContent(command.getDeviceId(),
+                    alternative ? "HFYD," + Command.KEY_DEVICE_PASSWORD + "#" : "Relay,0#");
             case Command.TYPE_CUSTOM:
                 return encodeContent(command.getDeviceId(), command.getString(Command.KEY_DATA));
             default:
diff --git a/src/main/java/org/traccar/protocol/H02ProtocolEncoder.java b/src/main/java/org/traccar/protocol/H02ProtocolEncoder.java
index 024899abb..7a765332c 100644
--- a/src/main/java/org/traccar/protocol/H02ProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/H02ProtocolEncoder.java
@@ -60,7 +60,7 @@ public class H02ProtocolEncoder extends StringProtocolEncoder {
             case Command.TYPE_POSITION_PERIODIC:
                 String frequency = command.getAttributes().get(Command.KEY_FREQUENCY).toString();
                 if (Context.getIdentityManager().lookupAttributeBoolean(
-                        command.getDeviceId(), "h02.alternative", false, false, true)) {
+                        command.getDeviceId(), getProtocolName() + ".alternative", false, false, true)) {
                     return formatCommand(time, uniqueId, "D1", frequency);
                 } else {
                     return formatCommand(time, uniqueId, "S71", "22", frequency);
diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolEncoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolEncoder.java
index c493b49fe..40d07230d 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolEncoder.java
@@ -36,7 +36,7 @@ public class HuabaoProtocolEncoder extends BaseProtocolEncoder {
     protected Object encodeCommand(Command command) {
 
         boolean alternative = Context.getIdentityManager().lookupAttributeBoolean(
-                command.getDeviceId(), "huabao.alternative", false, false, true);
+                command.getDeviceId(), getProtocolName() + ".alternative", false, false, true);
 
         ByteBuf id = Unpooled.wrappedBuffer(
                 DataConverter.parseHex(getUniqueId(command.getDeviceId())));
diff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolEncoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolEncoder.java
index 4db404ecf..354e81434 100644
--- a/src/main/java/org/traccar/protocol/MeitrackProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/MeitrackProtocolEncoder.java
@@ -43,7 +43,7 @@ public class MeitrackProtocolEncoder extends StringProtocolEncoder {
         Map<String, Object> attributes = command.getAttributes();
 
         boolean alternative = Context.getIdentityManager().lookupAttributeBoolean(
-                command.getDeviceId(), "meitrack.alternative", false, false, true);
+                command.getDeviceId(), getProtocolName() + ".alternative", false, false, true);
 
         switch (command.getType()) {
             case Command.TYPE_POSITION_SINGLE:
diff --git a/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java
index f21c5a3ae..a8aa84105 100644
--- a/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java
@@ -43,7 +43,7 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
     protected Object encodeCommand(Command command) {
 
         boolean alternative = forceAlternative || Context.getIdentityManager().lookupAttributeBoolean(
-                command.getDeviceId(), "tk103.alternative", false, false, true);
+                command.getDeviceId(), getProtocolName() + ".alternative", false, false, true);
 
         initDevicePassword(command, "123456");