aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/org/traccar/model/Event.java2
-rw-r--r--src/org/traccar/protocol/WondexFrameDecoder.java5
-rw-r--r--src/org/traccar/protocol/WondexProtocolDecoder.java86
-rw-r--r--test/org/traccar/protocol/WondexFrameDecoderTest.java7
-rw-r--r--test/org/traccar/protocol/WondexProtocolDecoderTest.java15
5 files changed, 78 insertions, 37 deletions
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 13368ef5b..8ae817e30 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -58,6 +58,8 @@ public abstract class Event extends Extensible {
public static final String KEY_OBD_SPEED = "obd-speed";
public static final String KEY_OBD_ODOMETER = "obd-odometer";
+ public static final String KEY_RESULT = "result";
+
// Starts with 1 not 0
public static final String PREFIX_TEMP = "temp";
public static final String PREFIX_ADC = "adc";
diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java
index c217166e8..7502c3320 100644
--- a/src/org/traccar/protocol/WondexFrameDecoder.java
+++ b/src/org/traccar/protocol/WondexFrameDecoder.java
@@ -15,7 +15,9 @@
*/
package org.traccar.protocol;
+import java.nio.charset.StandardCharsets;
import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.handler.codec.frame.FrameDecoder;
@@ -40,6 +42,9 @@ public class WondexFrameDecoder extends FrameDecoder {
if (channel != null) {
channel.write(frame);
}
+ // Pass deviceId to protocol decoder
+ long deviceId = ((Long.reverseBytes((frame.getLong(0)))) >> 32) & 0xFFFFFFFFL;
+ return ChannelBuffers.copiedBuffer("$ID:"+String.valueOf(deviceId), StandardCharsets.US_ASCII);
} else {
diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/org/traccar/protocol/WondexProtocolDecoder.java
index def878727..d35d1d930 100644
--- a/src/org/traccar/protocol/WondexProtocolDecoder.java
+++ b/src/org/traccar/protocol/WondexProtocolDecoder.java
@@ -25,6 +25,7 @@ import org.traccar.model.Event;
import org.traccar.model.Position;
import java.net.SocketAddress;
+import java.util.Date;
import java.util.regex.Pattern;
public class WondexProtocolDecoder extends BaseProtocolDecoder {
@@ -58,43 +59,64 @@ public class WondexProtocolDecoder extends BaseProtocolDecoder {
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
- Parser parser = new Parser(PATTERN, (String) msg);
- if (!parser.matches()) {
+ if (((String) msg).startsWith("$ID:")) {
+ identify(((String) msg).substring(4), channel, remoteAddress);
return null;
}
- Position position = new Position();
- position.setProtocol(getProtocolName());
+ else if (((String) msg).startsWith("$OK:") || ((String) msg).startsWith("$ERR:")) {
- if (!identify(parser.next(), channel, remoteAddress)) {
- return null;
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+ position.setDeviceId(getDeviceId());
+ getLastLocation(position, null);
+ position.setTime(new Date());
+ position.setValid(false);
+ position.set(Event.KEY_RESULT, (String) msg);
+
+ return position;
+
+ } else {
+
+ Parser parser = new Parser(PATTERN, (String) msg);
+ if (!parser.matches()) {
+ return null;
+ }
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+
+ if (!identify(parser.next(), channel, remoteAddress)) {
+ return null;
+ }
+ position.setDeviceId(getDeviceId());
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt())
+ .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+ position.setTime(dateBuilder.getDate());
+
+ position.setLongitude(parser.nextDouble());
+ position.setLatitude(parser.nextDouble());
+ position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+ position.setCourse(parser.nextDouble());
+ position.setAltitude(parser.nextDouble());
+
+ int satellites = parser.nextInt();
+ position.setValid(satellites >= 3);
+ position.set(Event.KEY_SATELLITES, satellites);
+
+ position.set(Event.KEY_EVENT, parser.next());
+ position.set(Event.KEY_BATTERY, parser.next());
+ position.set(Event.KEY_ODOMETER, parser.next());
+ position.set(Event.KEY_INPUT, parser.next());
+ position.set(Event.PREFIX_ADC + 1, parser.next());
+ position.set(Event.PREFIX_ADC + 2, parser.next());
+ position.set(Event.KEY_OUTPUT, parser.next());
+
+ return position;
}
- position.setDeviceId(getDeviceId());
-
- DateBuilder dateBuilder = new DateBuilder()
- .setDate(parser.nextInt(), parser.nextInt(), parser.nextInt())
- .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
- position.setTime(dateBuilder.getDate());
-
- position.setLongitude(parser.nextDouble());
- position.setLatitude(parser.nextDouble());
- position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
- position.setCourse(parser.nextDouble());
- position.setAltitude(parser.nextDouble());
-
- int satellites = parser.nextInt();
- position.setValid(satellites >= 3);
- position.set(Event.KEY_SATELLITES, satellites);
-
- position.set(Event.KEY_EVENT, parser.next());
- position.set(Event.KEY_BATTERY, parser.next());
- position.set(Event.KEY_ODOMETER, parser.next());
- position.set(Event.KEY_INPUT, parser.next());
- position.set(Event.PREFIX_ADC + 1, parser.next());
- position.set(Event.PREFIX_ADC + 2, parser.next());
- position.set(Event.KEY_OUTPUT, parser.next());
-
- return position;
+
}
}
diff --git a/test/org/traccar/protocol/WondexFrameDecoderTest.java b/test/org/traccar/protocol/WondexFrameDecoderTest.java
index 5877452ed..fa95acb2b 100644
--- a/test/org/traccar/protocol/WondexFrameDecoderTest.java
+++ b/test/org/traccar/protocol/WondexFrameDecoderTest.java
@@ -9,15 +9,18 @@ public class WondexFrameDecoderTest extends ProtocolTest {
@Test
public void testDecode() throws Exception {
- Pt502FrameDecoder decoder = new Pt502FrameDecoder();
+ WondexFrameDecoder decoder = new WondexFrameDecoder();
Assert.assertNull(
- decoder.decode(null, null, binary("d0d70b0001ca9a3b")));
+ decoder.decode(null, null, binary("f0d70b0001ca9a3b")));
Assert.assertEquals(
binary("313034343938393630312c32303133303332333039353531352c31332e3537323737362c35322e3430303833382c302c3030302c37322c302c32"),
decoder.decode(null, null, binary("313034343938393630312c32303133303332333039353531352c31332e3537323737362c35322e3430303833382c302c3030302c37322c302c320d0a")));
+ Assert.assertEquals(binary("2449443a31303030303030303031"),
+ decoder.decode(null, null, binary("d0d70b0001ca9a3b")));
+
}
}
diff --git a/test/org/traccar/protocol/WondexProtocolDecoderTest.java b/test/org/traccar/protocol/WondexProtocolDecoderTest.java
index a44f7030f..2212cc216 100644
--- a/test/org/traccar/protocol/WondexProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WondexProtocolDecoderTest.java
@@ -23,7 +23,7 @@ public class WondexProtocolDecoderTest extends ProtocolTest {
verifyPosition(decoder, text(
"2000000259,20151030145653,69.380826,53.283890,9,10,15,2,1,695,1002.6,108.2,0.0"));
-
+
verifyPosition(decoder, text(
"1044989601,20130323074605,0.000000,90.000000,0,000,0,0,2"));
@@ -38,13 +38,22 @@ public class WondexProtocolDecoderTest extends ProtocolTest {
verifyPosition(decoder, text(
"1044989601,20130322172647,13.572583,52.401070,22,204,-49,0,2"));
-
+
verifyPosition(decoder, text(
"3997324533,20140326074908,28.797603,47.041635,0,48,0,6,2,3.90V,0"));
-
+
verifyPosition(decoder, text(
"2000000001,20140529213210,-63.179111,9.781493,0,0,54.0,8,2,0.0,0,0.01,0.01,0,0,0,0"));
+ verifyNotNull(decoder, text(
+ "$OK:VER=M7 2.003 DVB rev02c,V2"));
+
+ verifyNotNull(decoder, text(
+ "$OK:REBOOT"));
+
+ verifyNotNull(decoder, text(
+ "$ERR:GETLOCATION=1"));
+
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 03:30:50 +0000