Complete PT502 photo decoding

2 files changed, 48 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/Pt502ProtocolDecoder.java b/src/org/traccar/protocol/Pt502ProtocolDecoder.java
index b60500c25..76e7ee1bf 100644
--- a/src/org/traccar/protocol/Pt502ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Pt502ProtocolDecoder.java
@@ -20,6 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;

 import org.jboss.netty.channel.Channel;

 import org.traccar.BaseProtocolDecoder;

+import org.traccar.Context;

 import org.traccar.DeviceSession;

 import org.traccar.helper.DateBuilder;

 import org.traccar.helper.Parser;

@@ -139,6 +140,14 @@ public class Pt502ProtocolDecoder extends BaseProtocolDecoder {
         return position;

     }

 

+    private void requestPhotoFragment(Channel channel) {

+        if (channel != null) {

+            int offset = photo.writerIndex();

+            int size = Math.min(photo.writableBytes(), MAX_CHUNK_SIZE);

+            channel.write("#PHD" + offset + "," + size + "\r\n");

+        }

+    }

+

     @Override

     protected Object decode(

             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {

@@ -150,13 +159,45 @@ public class Pt502ProtocolDecoder extends BaseProtocolDecoder {
 

         if (type.startsWith("$PHD")) {

 

-            // TODO decode photo

+            int dataIndex = buf.indexOf(typeEndIndex + 1, buf.writerIndex(), (byte) ',') + 1;

+            buf.readerIndex(dataIndex);

+

+            if (photo != null) {

+

+                photo.writeBytes(buf.readBytes(buf.readableBytes()));

+

+                if (photo.writableBytes() > 0) {

+

+                    requestPhotoFragment(channel);

+

+                } else {

+

+                    DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);

+                    String uniqueId = Context.getIdentityManager().getById(deviceSession.getDeviceId()).getUniqueId();

+

+                    Position position = new Position(getProtocolName());

+                    position.setDeviceId(deviceSession.getDeviceId());

+

+                    getLastLocation(position, null);

+

+                    position.set(Position.KEY_IMAGE, Context.getMediaManager().writeFile(uniqueId, photo, "jpg"));

+

+                    photo = null;

+

+                    return position;

+

+                }

+

+            }

 

         } else {

 

-            if (type.startsWith("$PHO") && channel != null) {

-                photo = ChannelBuffers.buffer(Integer.parseInt(type.substring(4, type.indexOf('-'))));

-                channel.write("#PHD0," + Math.min(photo.capacity(), MAX_CHUNK_SIZE) + "\r\n");

+            if (type.startsWith("$PHO")) {

+                int size = Integer.parseInt(type.split("-")[0].substring(4));

+                if (size > 0) {

+                    photo = ChannelBuffers.buffer(size);

+                    requestPhotoFragment(channel);

+                }

             }

 

             return decodePosition(channel, remoteAddress, buf.toString(StandardCharsets.US_ASCII));

diff --git a/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java b/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java
index 789d2253b..cca264faa 100644
--- a/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class Pt502ProtocolDecoderTest extends ProtocolTest {
 
         Pt502ProtocolDecoder decoder = new Pt502ProtocolDecoder(new Pt502Protocol());
 
+        verifyNull(decoder, binary(
+                "24504844302c3936302cffd8ffdb008400140e0f120f0d14121012171514181e32211e1c1c1e3d2c2e243249404c4b47404645505a736250556d5645466488656d777b8182814e608d978c7d96737e817c011517171e1a1e3b21213b7c5346537c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7cffc000110800f0014003012100021101031101ffdd0004000affc401a20000010501010101010100000000000000000102030405060708090a0b100002010303020403050504040000017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2f3f4f5f6f7f8f9fa0100030101010101010101010000000000000102030405060708090a0b1100020102040403040705040400010277000102031104052131061241510761711322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a35363738393a434445464748494a535455565758595a636465666768696a737475767778797a82838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffda000c03010002110311003f00e5292800ef450020a2800a2801d49400b450014b40052e2800a69340094a05007fffd0e5d14b10055b51b00c76a00527273494005250014500251400525001450015347c25003a928010d25007ffd1e52909a00290d0014b40052d0014500145002e297b50018a280109a6d002d2e2803fffd2e7a04da3777a94fbd0025140052500145002514005250014940054e381400b494008690d007fffd3e4f345001486800a5a005a2800a2801680280168a002909e280100cd028016a48937bfb5007fffd4c5038a42280128a004a280128a003ad2500251400945002a8cb0a9a80133450026692803ffd5e4e8a004a2801694500145002d18a005c5140052e280109a69a0029680140abb147b139eb401ffd6c62290d00251400949400114940052500252d002525003e31c93525002521a004a4a00ffd7e4a8a00281400a29d40094b40053ba500252d0018a31400d3cd250018cd2d005ab58777ccdd074ab645007ffd0c72290d00348a2801280"));
+
         verifyPosition(decoder, buffer(
                 "$PHO3821-1,1156802639,022125.000,A,0707.0014,N,07307.3725,W,0.0,0.1,110418,,,A/00000,00000/0,0,0,0/500//fd4//"));