Add terminal id to KHD commands

2 files changed, 15 insertions, 15 deletions

diff --git a/src/org/traccar/protocol/KhdProtocolDecoder.java b/src/org/traccar/protocol/KhdProtocolDecoder.java
index d1b5413e5..2f29a16f8 100644
--- a/src/org/traccar/protocol/KhdProtocolDecoder.java
+++ b/src/org/traccar/protocol/KhdProtocolDecoder.java
@@ -36,17 +36,10 @@ public class KhdProtocolDecoder extends BaseProtocolDecoder {
 
     private String readSerialNumber(ChannelBuffer buf) {
         int b1 = buf.readUnsignedByte();
-        int b2 = buf.readUnsignedByte();
-        if (b2 > 0x80) {
-            b2 -= 0x80;
-        }
-        int b3 = buf.readUnsignedByte();
-        if (b3 > 0x80) {
-            b3 -= 0x80;
-        }
+        int b2 = buf.readUnsignedByte() - 0x80;
+        int b3 = buf.readUnsignedByte() - 0x80;
         int b4 = buf.readUnsignedByte();
-        String serialNumber = String.format("%02d%02d%02d%02d", b1, b2, b3, b4);
-        return String.valueOf(Long.parseLong(serialNumber));
+        return String.format("%02d%02d%02d%02d", b1, b2, b3, b4);
     }
 
     public static final int MSG_LOGIN = 0xB1;
diff --git a/src/org/traccar/protocol/KhdProtocolEncoder.java b/src/org/traccar/protocol/KhdProtocolEncoder.java
index 618e43dad..cb26c757a 100644
--- a/src/org/traccar/protocol/KhdProtocolEncoder.java
+++ b/src/org/traccar/protocol/KhdProtocolEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2018 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.
@@ -27,7 +27,7 @@ public class KhdProtocolEncoder extends BaseProtocolEncoder {
     public static final int MSG_CUT_OIL = 0x39;
     public static final int MSG_RESUME_OIL = 0x38;
 
-    private ChannelBuffer encodeCommand(int command) {
+    private ChannelBuffer encodeCommand(int command, String uniqueId) {
 
         ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
 
@@ -37,7 +37,12 @@ public class KhdProtocolEncoder extends BaseProtocolEncoder {
         buf.writeByte(command);
         buf.writeShort(6); // size
 
-        buf.writeInt(0); // terminal id
+        uniqueId = "00000000".concat(uniqueId);
+        uniqueId = uniqueId.substring(uniqueId.length() - 8);
+        buf.writeByte(Integer.parseInt(uniqueId.substring(0, 2)));
+        buf.writeByte(Integer.parseInt(uniqueId.substring(2, 4)) + 0x80);
+        buf.writeByte(Integer.parseInt(uniqueId.substring(4, 6)) + 0x80);
+        buf.writeByte(Integer.parseInt(uniqueId.substring(6, 8)));
 
         buf.writeByte(Checksum.xor(buf.toByteBuffer()));
         buf.writeByte(0x0D); // ending
@@ -48,11 +53,13 @@ public class KhdProtocolEncoder extends BaseProtocolEncoder {
     @Override
     protected Object encodeCommand(Command command) {
 
+        String uniqueId = getUniqueId(command.getDeviceId());
+
         switch (command.getType()) {
             case Command.TYPE_ENGINE_STOP:
-                return encodeCommand(MSG_CUT_OIL);
+                return encodeCommand(MSG_CUT_OIL, uniqueId);
             case Command.TYPE_ENGINE_RESUME:
-                return encodeCommand(MSG_RESUME_OIL);
+                return encodeCommand(MSG_RESUME_OIL, uniqueId);
             default:
                 Log.warning(new UnsupportedOperationException(command.getType()));
                 break;