From 1f710ea91b25aec02d04b69e5b9f6dbd96230a82 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 27 Mar 2019 18:52:05 -0700 Subject: Fix photo decoding --- src/org/traccar/protocol/FifotrackProtocolDecoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/traccar/protocol/FifotrackProtocolDecoder.java b/src/org/traccar/protocol/FifotrackProtocolDecoder.java index 5831a75dd..beaa34125 100644 --- a/src/org/traccar/protocol/FifotrackProtocolDecoder.java +++ b/src/org/traccar/protocol/FifotrackProtocolDecoder.java @@ -77,7 +77,7 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder { .number("d+,") // length .number("(d+),") // imei .any() - .number("(d+),") // length + .number(",(d+),") // length .expression("([^*]+)") // photo id .text("*") .number("xx") @@ -87,7 +87,7 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder { .text("$$") .number("d+,") // length .number("(d+),") // imei - .expression("([^*]+)") // photo id + .expression("([^*]+),") // photo id .number("(d+),") // offset .number("(d+),") // size .number("(x+)") // data -- cgit v1.2.3