1 files changed, 30 insertions, 14 deletions
diff --git a/src/main/java/org/traccar/protocol/CellocatorProtocolEncoder.java b/src/main/java/org/traccar/protocol/CellocatorProtocolEncoder.java
index 0382dbbc7..76fa67686 100644
--- a/src/main/java/org/traccar/protocol/CellocatorProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/CellocatorProtocolEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2019 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.
@@ -19,27 +19,26 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.traccar.BaseProtocolEncoder;
 import org.traccar.model.Command;
+import org.traccar.Protocol;
 
 public class CellocatorProtocolEncoder extends BaseProtocolEncoder {
 
-    private ByteBuf encodeContent(long deviceId, int command, int data1, int data2) {
+    public CellocatorProtocolEncoder(Protocol protocol) {
+        super(protocol);
+    }
+
+    public static ByteBuf encodeContent(int type, int uniqueId, int packetNumber, ByteBuf content) {
 
-        ByteBuf buf = Unpooled.buffer(0);
+        ByteBuf buf = Unpooled.buffer();
         buf.writeByte('M');
         buf.writeByte('C');
         buf.writeByte('G');
         buf.writeByte('P');
-        buf.writeByte(0);
-        buf.writeIntLE(Integer.parseInt(getUniqueId(deviceId)));
-        buf.writeByte(0); // command numerator
+        buf.writeByte(type);
+        buf.writeIntLE(uniqueId);
+        buf.writeByte(packetNumber);
         buf.writeIntLE(0); // authentication code
-        buf.writeByte(command);
-        buf.writeByte(command);
-        buf.writeByte(data1);
-        buf.writeByte(data1);
-        buf.writeByte(data2);
-        buf.writeByte(data2);
-        buf.writeIntLE(0); // command specific data
+        buf.writeBytes(content);
 
         byte checksum = 0;
         for (int i = 4; i < buf.writerIndex(); i++) {
@@ -50,6 +49,23 @@ public class CellocatorProtocolEncoder extends BaseProtocolEncoder {
         return buf;
     }
 
+    private ByteBuf encodeCommand(long deviceId, int command, int data1, int data2) {
+
+        ByteBuf content = Unpooled.buffer();
+        content.writeByte(command);
+        content.writeByte(command);
+        content.writeByte(data1);
+        content.writeByte(data1);
+        content.writeByte(data2);
+        content.writeByte(data2);
+        content.writeIntLE(0); // command specific data
+
+        ByteBuf buf = encodeContent(0, Integer.parseInt(getUniqueId(deviceId)), 0, content);
+        content.release();
+
+        return buf;
+    }
+
     @Override
     protected Object encodeCommand(Command command) {
 
@@ -57,7 +73,7 @@ public class CellocatorProtocolEncoder extends BaseProtocolEncoder {
             case Command.TYPE_OUTPUT_CONTROL:
                 int data = Integer.parseInt(command.getString(Command.KEY_DATA)) << 4
                         + command.getInteger(Command.KEY_INDEX);
-                return encodeContent(command.getDeviceId(), 0x03, data, 0);
+                return encodeCommand(command.getDeviceId(), 0x03, data, 0);
             default:
                 return null;
         }