aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/UproProtocolDecoder.java11
-rw-r--r--test/org/traccar/protocol/UproProtocolDecoderTest.java3
2 files changed, 14 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/UproProtocolDecoder.java b/src/org/traccar/protocol/UproProtocolDecoder.java
index d5a00c6df..c6f400cae 100644
--- a/src/org/traccar/protocol/UproProtocolDecoder.java
+++ b/src/org/traccar/protocol/UproProtocolDecoder.java
@@ -121,12 +121,23 @@ public class UproProtocolDecoder extends BaseProtocolDecoder {
case 'B':
position.set(Position.KEY_STATUS, data[i].substring(1));
break;
+ case 'C':
+ long odometer = 0;
+ for (int j = 1; j < data[i].length(); j++) {
+ odometer <<= 4;
+ odometer += data[i].charAt(j) - '0';
+ }
+ position.set(Position.KEY_ODOMETER, odometer);
+ break;
case 'P':
position.set(Position.KEY_MCC, Integer.parseInt(data[i].substring(1, 5)));
position.set(Position.KEY_MNC, Integer.parseInt(data[i].substring(5, 9)));
position.set(Position.KEY_LAC, Integer.parseInt(data[i].substring(9, 13), 16));
position.set(Position.KEY_CID, Integer.parseInt(data[i].substring(13, 17), 16));
break;
+ case 'S':
+ position.set("obd", data[i]);
+ break;
default:
break;
}
diff --git a/test/org/traccar/protocol/UproProtocolDecoderTest.java b/test/org/traccar/protocol/UproProtocolDecoderTest.java
index 034fd78a1..711fe39b6 100644
--- a/test/org/traccar/protocol/UproProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/UproProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class UproProtocolDecoderTest extends ProtocolTest {
UproProtocolDecoder decoder = new UproProtocolDecoder(new UproProtocol());
verifyPosition(decoder, text(
+ "*MG201693502000035441,BA&A1213073325458307036690710000151116&P0730000032ce4fb3&D1&B0000000000&C005799?7&S3,20161115120025,07035.54659E,3324.87721N,3000,0,0,0,0,847,599,8,40,0,19,20&U_P\0\0\0\0\0\0\0\0\0\0\0\0\0\0&T0107#"));
+
+ verifyPosition(decoder, text(
"*MG201693502000034964,AB&A0800253335360507036975710000091116&P0730000032d2a94d&B0000000000&N13&Z12&U_P\0\0\0\u0004\0\0\0\0\0\0\0\0\0\0#"),
position("2016-11-09 08:00:25.000", true, -33.58934, -70.61626));