From e331573c0df7467fd36ae3eba3c259ed9b1d9253 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 13 Sep 2018 15:11:04 +1200 Subject: Fix Coban 306A OBD decoding --- src/org/traccar/protocol/Gps103ProtocolDecoder.java | 2 +- test/org/traccar/protocol/Gps103ProtocolDecoderTest.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index 2b797d05a..3c8cbbe87 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -85,7 +85,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { .expression("OBD,") // type .number("(dd)(dd)(dd)") // date (yymmdd) .number("(dd)(dd)(dd),") // time (hhmmss) - .number("(d+),") // odometer + .number("(d+)?,") // odometer .number("(d+.d+)?,") // fuel instant .number("(d+.d+)?,") // fuel average .number("(d+)?,") // hours diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java index cf111f687..bd960a522 100644 --- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java @@ -10,6 +10,9 @@ public class Gps103ProtocolDecoderTest extends ProtocolTest { Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new Gps103Protocol()); + verifyAttributes(decoder, text( + "imei:868683027758113,OBD,180905200218,,,,0,0,0.39%,70,9.41%,494,0.00,P0137,P0430,,;")); + verifyPosition(decoder, text( "imei:353451044508750,001,0809231929,13554900601,F,055403.000,A,2233.1870,N,11354.3067,E,0.00,30.1,65.43,1,0,10.5%,0.0%,28;")); @@ -25,7 +28,7 @@ public class Gps103ProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, text( "imei:862106025092216,OBD,170605095949,195874,,370.8,808,066,30.0%,+87,13.0%,02444,14.3,,,,;")); - verifyNull(decoder, text( + verifyAttributes(decoder, text( "imei:868683027825532,OBD,170613203014,,,,0,0,0.00%,0,0.00%,0,0.00,,,,;")); verifyAttributes(decoder, text( -- cgit v1.2.3