Implement EasyTrack encoder

3 files changed, 77 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/protocol/EasyTrackProtocol.java b/src/main/java/org/traccar/protocol/EasyTrackProtocol.java
index 74c636d06..4626156a5 100644
--- a/src/main/java/org/traccar/protocol/EasyTrackProtocol.java
+++ b/src/main/java/org/traccar/protocol/EasyTrackProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +21,23 @@ import org.traccar.BaseProtocol;
 import org.traccar.CharacterDelimiterFrameDecoder;
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
+import org.traccar.model.Command;
 
 public class EasyTrackProtocol extends BaseProtocol {
 
     public EasyTrackProtocol() {
+        setSupportedDataCommands(
+                Command.TYPE_ENGINE_STOP,
+                Command.TYPE_ENGINE_RESUME,
+                Command.TYPE_ALARM_ARM,
+                Command.TYPE_ALARM_DISARM);
         addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, "#", "\r\n"));
                 pipeline.addLast(new StringDecoder());
                 pipeline.addLast(new StringEncoder());
+                pipeline.addLast(new EasyTrackProtocolEncoder(EasyTrackProtocol.this));
                 pipeline.addLast(new EasyTrackProtocolDecoder(EasyTrackProtocol.this));
             }
         });
diff --git a/src/main/java/org/traccar/protocol/EasyTrackProtocolEncoder.java b/src/main/java/org/traccar/protocol/EasyTrackProtocolEncoder.java
new file mode 100644
index 000000000..3f2a142d6
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/EasyTrackProtocolEncoder.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.traccar.Protocol;
+import org.traccar.StringProtocolEncoder;
+import org.traccar.model.Command;
+
+public class EasyTrackProtocolEncoder extends StringProtocolEncoder {
+
+    public EasyTrackProtocolEncoder(Protocol protocol) {
+        super(protocol);
+    }
+
+    @Override
+    protected Object encodeCommand(Command command) {
+
+        switch (command.getType()) {
+            case Command.TYPE_ENGINE_STOP:
+                return formatCommand(command, "*ET,%s,FD,Y1#", Command.KEY_UNIQUE_ID);
+            case Command.TYPE_ENGINE_RESUME:
+                return formatCommand(command, "*ET,%s,FD,Y2#", Command.KEY_UNIQUE_ID);
+            case Command.TYPE_ALARM_ARM:
+                return formatCommand(command, "*ET,%s,FD,F1#", Command.KEY_UNIQUE_ID);
+            case Command.TYPE_ALARM_DISARM:
+                return formatCommand(command, "*ET,%s,FD,F2#", Command.KEY_UNIQUE_ID);
+            default:
+                return null;
+        }
+    }
+
+}
diff --git a/src/test/java/org/traccar/protocol/EasyTrackProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/EasyTrackProtocolEncoderTest.java
new file mode 100644
index 000000000..376ddf1e7
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/EasyTrackProtocolEncoderTest.java
@@ -0,0 +1,24 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+import static org.junit.Assert.assertEquals;
+
+public class EasyTrackProtocolEncoderTest extends ProtocolTest {
+
+    @Test
+    public void testEncodeEngineStop() {
+
+        EasyTrackProtocolEncoder encoder = new EasyTrackProtocolEncoder(null);
+
+        Command command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_ENGINE_STOP);
+
+        assertEquals("*ET,123456789012345,FD,Y1#", encoder.encodeCommand(command));
+
+    }
+
+}