diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-08-03 18:07:01 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-08-03 18:07:07 -0700 |
| commit | 10da32b83608a882744212373e3ff4ff2716aadf (patch) | |
| tree | e00ea42eb6117873c3688e005125c44e5037f7fe | |
| parent | 1417443c6023f71a16d7b17549e2601c8cd05c2d (diff) | |
| download | trackermap-server-10da32b83608a882744212373e3ff4ff2716aadf.tar.gz trackermap-server-10da32b83608a882744212373e3ff4ff2716aadf.tar.bz2 trackermap-server-10da32b83608a882744212373e3ff4ff2716aadf.zip | |
Support temperature sensor
| -rw-r--r-- | src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java | 12 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java index ebc7e7c04..c97017d65 100644 --- a/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java @@ -163,6 +163,18 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder { position.set("tagData", values[index++]); break; case "IWD": + while (index < values.length) { + index += 1; // data identifier + int dataType = Integer.parseInt(values[index++]); + if (dataType == 0) { + position.set(Position.KEY_DRIVER_UNIQUE_ID, values[index++]); + } else if (dataType == 1) { + index += 1; // temperature sensor serial number + position.set(Position.PREFIX_TEMP + 1, Double.parseDouble(values[index++])); + + } + } + if (index < values.length && values[index + 1].equals("0")) { position.set(Position.KEY_DRIVER_UNIQUE_ID, values[index + 2]); } diff --git a/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java index 9a3f61274..6a140d746 100644 --- a/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java @@ -12,6 +12,10 @@ public class GoSafeProtocolDecoderTest extends ProtocolTest { GoSafeProtocolDecoder decoder = new GoSafeProtocolDecoder(null); verifyAttribute(decoder, text( + "*GS06,351535058659335,081234310719,,SYS:G6S;V3.37;V1.1.8,GPS:A;10;N23.169758;E113.450640;0;323;47;0.82,COT:18539;,ADC:10.81;4.07,DTT:4000;E0;0;0;0;1,IWD:0;1;9f00000655705d28;22.5#"), + Position.PREFIX_TEMP + 1, 22.5); + + verifyAttribute(decoder, text( "*GS06,359568052580548,091946150719,1C,SYS:G3C;V1.40;V1.0.4,GPS:A;5;S25.750200;E28.204858;0;0;1337;1.68,COT:,ADC:13.12;4.06,DTT:4004;C6;0;0;10000000;0$091948150719,,SYS:G3C;V1.40;V1.0.4,GPS:A;5;S25.750200;E28.204858;0;0;1337;1.68,COT:,ADC:12.96;4.06,DTT:4004;C6;0;0;0;1#"), Position.KEY_EVENT, 0x1C); |