aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debug.xml1
-rw-r--r--src/org/traccar/protocol/HuaShengProtocol.java43
-rw-r--r--src/org/traccar/protocol/HuaShengProtocolDecoder.java165
-rw-r--r--src/org/traccar/protocol/T55ProtocolDecoder.java2
-rw-r--r--src/org/traccar/protocol/TelicProtocolDecoder.java1
-rw-r--r--test/org/traccar/protocol/Gt06ProtocolDecoderTest.java3
-rw-r--r--test/org/traccar/protocol/HuaShengProtocolDecoderTest.java21
-rw-r--r--test/org/traccar/protocol/T55ProtocolDecoderTest.java3
-rw-r--r--test/org/traccar/protocol/TelicProtocolDecoderTest.java3
9 files changed, 241 insertions, 1 deletions
diff --git a/debug.xml b/debug.xml
index d11cf99f4..bf8f8e2b5 100644
--- a/debug.xml
+++ b/debug.xml
@@ -393,5 +393,6 @@
<entry key='supermate.port'>5108</entry>
<entry key='appello.port'>5109</entry>
<entry key='idpl.port'>5110</entry>
+ <entry key='huasheng.port'>5111</entry>
</properties>
diff --git a/src/org/traccar/protocol/HuaShengProtocol.java b/src/org/traccar/protocol/HuaShengProtocol.java
new file mode 100644
index 000000000..7c1d48860
--- /dev/null
+++ b/src/org/traccar/protocol/HuaShengProtocol.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * 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.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+import org.traccar.BaseProtocol;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class HuaShengProtocol extends BaseProtocol {
+
+ public HuaShengProtocol() {
+ super("huasheng");
+ }
+
+ @Override
+ public void initTrackerServers(List<TrackerServer> serverList) {
+ serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
+ @Override
+ protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 3, 2, 0, 0));
+ pipeline.addLast("objectDecoder", new HuaShengProtocolDecoder(HuaShengProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/org/traccar/protocol/HuaShengProtocolDecoder.java
new file mode 100644
index 000000000..dd288b182
--- /dev/null
+++ b/src/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * 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.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.BitUtil;
+import org.traccar.helper.Checksum;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
+
+public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
+
+ public HuaShengProtocolDecoder(HuaShengProtocol protocol) {
+ super(protocol);
+ }
+
+ public static final int MSG_POSITION = 0xAA00;
+ public static final int MSG_POSITION_RSP = 0xFF01;
+ public static final int MSG_LOGIN = 0xAA02;
+ public static final int MSG_LOGIN_RSP = 0xFF03;
+
+ private static void sendResponse(Channel channel, int type, ChannelBuffer content) {
+ if (channel != null) {
+ ChannelBuffer response = ChannelBuffers.dynamicBuffer();
+ response.writeByte(0xC0);
+ response.writeShort(0x0100);
+ response.writeShort(0x000D); // TODO: length
+ response.writeByte(MSG_LOGIN_RSP);
+ response.writeShort(0);
+ response.writeInt(1);
+ response.writeByte(0); // success
+ response.writeByte(0xC0);
+ channel.write(response);
+ }
+ }
+
+
+ @Override
+ protected Object decode(
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ ChannelBuffer buf = (ChannelBuffer) msg;
+
+ buf.skipBytes(1); // start marker
+ buf.readUnsignedByte(); // flag
+ buf.readUnsignedByte(); // reserved
+ buf.readUnsignedShort(); // length
+
+ int type = buf.readUnsignedShort();
+
+ buf.readUnsignedShort(); // checksum
+ buf.readUnsignedInt(); // index
+
+ if (type == MSG_LOGIN) {
+
+ while (buf.readableBytes() > 4) {
+ int subtype = buf.readUnsignedShort();
+ int length = buf.readUnsignedShort() - 4;
+ if (subtype == 0x0003) {
+ String imei = buf.readBytes(length).toString(StandardCharsets.US_ASCII);
+ if (identify(imei, channel, remoteAddress) && channel != null) {
+
+ }
+ } else {
+ buf.skipBytes(length);
+ }
+ }
+
+ } else if (type == MSG_POSITION) {
+
+
+
+ }
+
+
+
+ /*buf.skipBytes(2); // header
+ buf.readByte(); // size
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+
+ // Zero for location messages
+ int power = buf.readUnsignedByte();
+ int gsm = buf.readUnsignedByte();
+
+ String imei = ChannelBuffers.hexDump(buf.readBytes(8)).substring(1);
+ if (!identify(imei, channel, remoteAddress)) {
+ return null;
+ }
+ position.setDeviceId(getDeviceId());
+
+ position.set(Position.KEY_INDEX, buf.readUnsignedShort());
+
+ int type = buf.readUnsignedByte();
+
+ if (type == MSG_HEARTBEAT) {
+
+ getLastLocation(position, null);
+
+ position.set(Position.KEY_POWER, power);
+ position.set(Position.KEY_GSM, gsm);
+
+ if (channel != null) {
+ byte[] response = {0x54, 0x68, 0x1A, 0x0D, 0x0A};
+ channel.write(ChannelBuffers.wrappedBuffer(response));
+ }
+
+ } else if (type == MSG_DATA) {
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
+ .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
+ position.setTime(dateBuilder.getDate());
+
+ double latitude = buf.readUnsignedInt() / (60.0 * 30000.0);
+ double longitude = buf.readUnsignedInt() / (60.0 * 30000.0);
+
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+ position.setCourse(buf.readUnsignedShort());
+
+ buf.skipBytes(3); // reserved
+
+ long flags = buf.readUnsignedInt();
+ position.setValid(BitUtil.check(flags, 0));
+ if (!BitUtil.check(flags, 1)) {
+ latitude = -latitude;
+ }
+ if (!BitUtil.check(flags, 2)) {
+ longitude = -longitude;
+ }
+
+ position.setLatitude(latitude);
+ position.setLongitude(longitude);
+
+ } else {
+
+ return null;
+
+ }*/
+
+ return null;
+ }
+
+}
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java
index 0a86e46a7..87c7a60c3 100644
--- a/src/org/traccar/protocol/T55ProtocolDecoder.java
+++ b/src/org/traccar/protocol/T55ProtocolDecoder.java
@@ -240,7 +240,7 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
this.position = null;
return position;
}
- } else if (sentence.length() == 15 && Character.isDigit(sentence.charAt(0))) {
+ } else if (sentence.matches("^[0-9A-F]+$")) {
identify(sentence, channel, remoteAddress);
} else if (sentence.startsWith("$GPRMC")) {
return decodeGprmc(sentence, remoteAddress, channel);
diff --git a/src/org/traccar/protocol/TelicProtocolDecoder.java b/src/org/traccar/protocol/TelicProtocolDecoder.java
index b8929fae5..be4c80b84 100644
--- a/src/org/traccar/protocol/TelicProtocolDecoder.java
+++ b/src/org/traccar/protocol/TelicProtocolDecoder.java
@@ -52,6 +52,7 @@ public class TelicProtocolDecoder extends BaseProtocolDecoder {
.number("(d+),") // satellites
.expression("(?:[^,]*,){7}")
.number("(d+),") // battery
+ .expression("[^,]*,")
.number("(d+),") // external
.any()
.compile();
diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 81f9f81c3..94d665478 100644
--- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -19,6 +19,9 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyAttributes(decoder, binary(
"7979000794050000c9b63e0d0a"));
+ verifyPosition(decoder, binary(
+ "7878251610051b0f1c34c5022515d504b5dcd20738080902d4022bdf009cba5006640201006759680d0a"));
+
verifyNotNull(decoder, binary(
"787866150000000000416c726561647920696e20746865207374617465206f66206675656c20737570706c7920746f20726573756d652c74686520636f6d6d616e64206973206e6f742072756e6e696e672100000000000000000000000000000000000001001981e50d0a"));
diff --git a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java
new file mode 100644
index 000000000..78ebc25eb
--- /dev/null
+++ b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java
@@ -0,0 +1,21 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class HuaShengProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ /*HuaShengProtocolDecoder decoder = new HuaShengProtocolDecoder(new HuaShengProtocol());
+
+ verifyNothing(decoder, binary(
+ "C00000007EAA020000000000010001001047315F48312E305F56312E3000030013383632393530303238353334333036000400144C342D56374C673979497A7A2D724A6D0005000501000600084341524400070008434152440008000500000900183839383630303530313931343436313130393134000A0009434D4E4554C0"));
+
+ verifyPosition(decoder, binary(
+ "C000000041AA00000000000030DBDC00000031353035323630373538323800ADDCC100226AEF0000000000120005000100151206EF0504E99975002903EB80556492CEC0"));*/
+
+ }
+
+}
diff --git a/test/org/traccar/protocol/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/T55ProtocolDecoderTest.java
index e8e5ba90e..753b4f689 100644
--- a/test/org/traccar/protocol/T55ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/T55ProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class T55ProtocolDecoderTest extends ProtocolTest {
T55ProtocolDecoder decoder = new T55ProtocolDecoder(new T55Protocol());
verifyNothing(decoder, text(
+ "086415031C20"));
+
+ verifyNothing(decoder, text(
"358244017671308"));
verifyNotNull(decoder, text(
diff --git a/test/org/traccar/protocol/TelicProtocolDecoderTest.java b/test/org/traccar/protocol/TelicProtocolDecoderTest.java
index 79ec0aa68..07a7da1f8 100644
--- a/test/org/traccar/protocol/TelicProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TelicProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class TelicProtocolDecoderTest extends ProtocolTest {
TelicProtocolDecoder decoder = new TelicProtocolDecoder(new TelicProtocol());
verifyPosition(decoder, text(
+ "003097061325,220616044200,0,220616044200,247169,593911,3,48,248,8,,,50,1024846,,1111,00,48,0,51,0406"));
+
+ verifyPosition(decoder, text(
"003097061325,210216112630,0,210216001405,246985,594078,3,0,283,12,,,23,4418669,,0010,00,117,0,0,0108"));
verifyPosition(decoder, text(
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 19:46:07 +0000