From 49646eccd5ec57013c78ea0a0776c206f812cb0b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Tue, 1 Nov 2022 21:26:02 -0700
Subject: Better Meiligao commands

---
 .../org/traccar/protocol/MeiligaoProtocol.java     |  1 +
 .../traccar/protocol/MeiligaoProtocolEncoder.java  | 47 +++++++++++++++++-----
 .../protocol/MeiligaoProtocolEncoderTest.java      |  4 ++
 3 files changed, 41 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/traccar/protocol/MeiligaoProtocol.java b/src/main/java/org/traccar/protocol/MeiligaoProtocol.java
index 2c853f0e1..492094ce3 100644
--- a/src/main/java/org/traccar/protocol/MeiligaoProtocol.java
+++ b/src/main/java/org/traccar/protocol/MeiligaoProtocol.java
@@ -30,6 +30,7 @@ public class MeiligaoProtocol extends BaseProtocol {
         setSupportedDataCommands(
                 Command.TYPE_POSITION_SINGLE,
                 Command.TYPE_POSITION_PERIODIC,
+                Command.TYPE_OUTPUT_CONTROL,
                 Command.TYPE_ENGINE_STOP,
                 Command.TYPE_ENGINE_RESUME,
                 Command.TYPE_ALARM_GEOFENCE,
diff --git a/src/main/java/org/traccar/protocol/MeiligaoProtocolEncoder.java b/src/main/java/org/traccar/protocol/MeiligaoProtocolEncoder.java
index 21f9f8801..03f0e7ecf 100644
--- a/src/main/java/org/traccar/protocol/MeiligaoProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/MeiligaoProtocolEncoder.java
@@ -24,8 +24,10 @@ import org.traccar.helper.Checksum;
 import org.traccar.helper.DataConverter;
 import org.traccar.helper.model.AttributeUtil;
 import org.traccar.model.Command;
+import org.traccar.model.Device;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Set;
 import java.util.TimeZone;
 
 public class MeiligaoProtocolEncoder extends BaseProtocolEncoder {
@@ -57,15 +59,36 @@ public class MeiligaoProtocolEncoder extends BaseProtocolEncoder {
         return buf;
     }
 
-    @Override
-    protected Object encodeCommand(Command command) {
+    private ByteBuf encodeOutputCommand(long deviceId, int index, int value) {
+
+        int outputCount;
+        int outputType;
+
+        String model = getCacheManager().getObject(Device.class, deviceId).getModel();
 
-        boolean alternative = AttributeUtil.lookup(
-                getCacheManager(), Keys.PROTOCOL_ALTERNATIVE.withPrefix(getProtocolName()), command.getDeviceId());
+        if (model != null && Set.of("TK510", "GT08", "TK208", "TK228", "MT05").contains(model)) {
+            outputCount = 5;
+            outputType = MeiligaoProtocolDecoder.MSG_OUTPUT_CONTROL_1;
+        } else {
+            outputCount = 1;
+            boolean alternative = AttributeUtil.lookup(
+                    getCacheManager(), Keys.PROTOCOL_ALTERNATIVE.withPrefix(getProtocolName()), deviceId);
+            outputType = alternative
+                    ? MeiligaoProtocolDecoder.MSG_OUTPUT_CONTROL_1
+                    : MeiligaoProtocolDecoder.MSG_OUTPUT_CONTROL_2;
+        }
+
+        ByteBuf content = Unpooled.buffer();
 
-        int outputControlMessageType = alternative
-                ? MeiligaoProtocolDecoder.MSG_OUTPUT_CONTROL_1
-                : MeiligaoProtocolDecoder.MSG_OUTPUT_CONTROL_2;
+        for (int i = 1; i <= outputCount; i++) {
+            content.writeByte(i == index ? value : 2);
+        }
+
+        return encodeContent(deviceId, outputType, content);
+    }
+
+    @Override
+    protected Object encodeCommand(Command command) {
 
         ByteBuf content = Unpooled.buffer();
 
@@ -75,12 +98,14 @@ public class MeiligaoProtocolEncoder extends BaseProtocolEncoder {
             case Command.TYPE_POSITION_PERIODIC:
                 content.writeShort(command.getInteger(Command.KEY_FREQUENCY) / 10);
                 return encodeContent(command.getDeviceId(), MeiligaoProtocolDecoder.MSG_TRACK_BY_INTERVAL, content);
+            case Command.TYPE_OUTPUT_CONTROL:
+                int index = Integer.parseInt(command.getString(Command.KEY_INDEX)) - 1;
+                int value = Integer.parseInt(command.getString(Command.KEY_DATA));
+                return encodeOutputCommand(command.getDeviceId(), index, value);
             case Command.TYPE_ENGINE_STOP:
-                content.writeByte(0x01);
-                return encodeContent(command.getDeviceId(), outputControlMessageType, content);
+                return encodeOutputCommand(command.getDeviceId(), 1, 1);
             case Command.TYPE_ENGINE_RESUME:
-                content.writeByte(0x00);
-                return encodeContent(command.getDeviceId(), outputControlMessageType, content);
+                return encodeOutputCommand(command.getDeviceId(), 1, 0);
             case Command.TYPE_ALARM_GEOFENCE:
                 content.writeShort(command.getInteger(Command.KEY_RADIUS));
                 return encodeContent(command.getDeviceId(), MeiligaoProtocolDecoder.MSG_MOVEMENT_ALARM, content);
diff --git a/src/test/java/org/traccar/protocol/MeiligaoProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/MeiligaoProtocolEncoderTest.java
index 5b72f6f1f..1f2e5f7e3 100644
--- a/src/test/java/org/traccar/protocol/MeiligaoProtocolEncoderTest.java
+++ b/src/test/java/org/traccar/protocol/MeiligaoProtocolEncoderTest.java
@@ -36,6 +36,10 @@ public class MeiligaoProtocolEncoderTest extends ProtocolTest {
 
         verifyCommand(encoder, command, binary("4040001312345678901234410603e87bb00d0a"));
 
+        command.setType(Command.TYPE_ENGINE_STOP);
+
+        verifyCommand(encoder, command, binary("4040001212345678901234411501fd460d0a"));
+
     }
 
 }
-- 
cgit v1.2.3