Support custom commands for TK103 (fix #3869)

2 files changed, 18 insertions, 2 deletions

diff --git a/src/org/traccar/protocol/Tk103ProtocolEncoder.java b/src/org/traccar/protocol/Tk103ProtocolEncoder.java
index 3ec562cc3..d64c85c2c 100644
--- a/src/org/traccar/protocol/Tk103ProtocolEncoder.java
+++ b/src/org/traccar/protocol/Tk103ProtocolEncoder.java
@@ -47,6 +47,8 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
 
         if (alternative) {
             switch (command.getType()) {
+                case Command.TYPE_CUSTOM:
+                    return formatAlt(command, "{%s}", Command.KEY_DATA);
                 case Command.TYPE_GET_VERSION:
                     return formatAlt(command, "*about*");
                 case Command.TYPE_REBOOT_DEVICE:
@@ -57,8 +59,6 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
                     return formatAlt(command, "*routetrack*99*");
                 case Command.TYPE_POSITION_STOP:
                     return formatAlt(command, "*routetrackoff*");
-                case Command.TYPE_CUSTOM:
-                    return formatAlt(command, "{%s}", Command.KEY_DATA);
                 case Command.TYPE_GET_DEVICE_STATUS:
                     return formatAlt(command, "*status*");
                 case Command.TYPE_IDENTIFICATION:
@@ -80,6 +80,8 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
             }
         } else {
             switch (command.getType()) {
+                case Command.TYPE_CUSTOM:
+                    return formatCommand(command, "({%s}{%s})", Command.KEY_UNIQUE_ID, Command.KEY_DATA);
                 case Command.TYPE_GET_VERSION:
                     return formatCommand(command, "({%s}AP07)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_REBOOT_DEVICE:
diff --git a/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java b/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
index 25968a0fe..34b2acf86 100644
--- a/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
@@ -221,6 +221,20 @@ public class Tk103ProtocolEncoderTest extends ProtocolTest {
     }
 
     @Test
+    public void testEncodeCustom() throws Exception {
+
+        Tk103ProtocolEncoder encoder = new Tk103ProtocolEncoder();
+
+        Command command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_CUSTOM);
+        command.set(Command.KEY_DATA, "AA00");
+
+        assertEquals("(123456789012345AA00)", encoder.encodeCommand(command));
+
+    }
+
+    @Test
     public void testEncodeCustomAlternative() throws Exception {
 
         Tk103ProtocolEncoder encoder = new Tk103ProtocolEncoder(true);