4 files changed, 130 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 561b57a57..d28ab0997 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -285,5 +285,6 @@
     <entry key='vnet.port'>5205</entry>
     <entry key='blue.port'>5206</entry>
     <entry key='pst.port'>5207</entry>
+    <entry key='dingtek.port'>5208</entry>
 
 </properties>
diff --git a/src/main/java/org/traccar/protocol/DingtekProtocol.java b/src/main/java/org/traccar/protocol/DingtekProtocol.java
new file mode 100644
index 000000000..31962202c
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/DingtekProtocol.java
@@ -0,0 +1,35 @@
+/*
+ * 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 io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.traccar.BaseProtocol;
+import org.traccar.PipelineBuilder;
+import org.traccar.TrackerServer;
+
+public class DingtekProtocol extends BaseProtocol {
+
+    public DingtekProtocol() {
+        addServer(new TrackerServer(false, getName()) {
+            @Override
+            protected void addProtocolHandlers(PipelineBuilder pipeline) {
+                pipeline.addLast(new LengthFieldBasedFrameDecoder(1024, 4, 1));
+                pipeline.addLast(new DingtekProtocolDecoder(DingtekProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/main/java/org/traccar/protocol/DingtekProtocolDecoder.java b/src/main/java/org/traccar/protocol/DingtekProtocolDecoder.java
new file mode 100644
index 000000000..1488c2cd6
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/DingtekProtocolDecoder.java
@@ -0,0 +1,74 @@
+/*
+ * 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 io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.Protocol;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+
+public class DingtekProtocolDecoder extends BaseProtocolDecoder {
+
+    public DingtekProtocolDecoder(Protocol protocol) {
+        super(protocol);
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        ByteBuf buf = (ByteBuf) msg;
+
+        buf.readUnsignedByte(); // header
+        buf.readUnsignedByte(); // forced
+        buf.readUnsignedByte(); // device type
+        int type = buf.readUnsignedByte();
+        buf.readUnsignedByte(); // length
+
+        String imei = ByteBufUtil.hexDump(buf.slice(buf.writerIndex() - 9, 8)).substring(1);
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, imei);
+        if (deviceSession == null) {
+            return null;
+        }
+
+        if (type == 0x01 || type == 0x02 || type == 0x04) {
+            Position position = new Position(getProtocolName());
+            position.setDeviceId(deviceSession.getDeviceId());
+
+            position.set("height", buf.readUnsignedShort());
+
+            position.setValid(buf.readUnsignedByte() > 0);
+            position.setLongitude(buf.readFloat());
+            position.setLatitude(buf.readFloat());
+
+            position.set(Position.PREFIX_TEMP + 1, buf.readUnsignedByte());
+            position.set(Position.KEY_STATUS, buf.readUnsignedInt());
+            position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+            position.set(Position.KEY_RSSI, buf.readFloat());
+            position.set(Position.KEY_INDEX, buf.readUnsignedShort());
+
+            return position;
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/test/java/org/traccar/protocol/DingtekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/DingtekProtocolDecoderTest.java
new file mode 100644
index 000000000..ccf23a5c2
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/DingtekProtocolDecoderTest.java
@@ -0,0 +1,20 @@
+package org.traccar.protocol;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class DingtekProtocolDecoderTest extends ProtocolTest {
+
+    @Ignore
+    @Test
+    public void testDecode() throws Exception {
+
+        DingtekProtocolDecoder decoder = new DingtekProtocolDecoder(null);
+
+        verifyPosition(decoder, binary(
+                "800001011e0692001a00000000016e008027c40000186962703655111781"));
+
+    }
+
+}