Meitrack request photo camera index

2 files changed, 8 insertions, 2 deletions

diff --git a/src/org/traccar/protocol/MeitrackProtocolEncoder.java b/src/org/traccar/protocol/MeitrackProtocolEncoder.java
index b10a751c1..f73d74de9 100644
--- a/src/org/traccar/protocol/MeitrackProtocolEncoder.java
+++ b/src/org/traccar/protocol/MeitrackProtocolEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,8 @@ public class MeitrackProtocolEncoder extends StringProtocolEncoder {
             case Command.TYPE_ALARM_DISARM:
                 return formatCommand(command, 'M', "C01,0,22022");
             case Command.TYPE_REQUEST_PHOTO:
-                return formatCommand(command, 'D', "D03,1,camera_picture.jpg");
+                int index = command.getInteger(Command.KEY_INDEX);
+                return formatCommand(command, 'D', "D03," + (index > 0 ? index : 1) + ",camera_picture.jpg");
             case Command.TYPE_SEND_SMS:
                 return formatCommand(command, 'f', "C02,0,"
                         + attributes.get(Command.KEY_PHONE) + "," + attributes.get(Command.KEY_MESSAGE));
diff --git a/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java b/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java
index d5ecbb488..b63ce5051 100644
--- a/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java
@@ -20,6 +20,11 @@ public class MeitrackProtocolEncoderTest extends ProtocolTest {
         assertEquals("@@Q25,123456789012345,A10*68\r\n", encoder.encodeCommand(command));
 
         command.setDeviceId(1);
+        command.setType(Command.TYPE_REQUEST_PHOTO);
+
+        assertEquals("@@D46,123456789012345,D03,1,camera_picture.jpg*1F\r\n", encoder.encodeCommand(command));
+
+        command.setDeviceId(1);
         command.setType(Command.TYPE_SEND_SMS);
         command.set(Command.KEY_PHONE, "15360853789");
         command.set(Command.KEY_MESSAGE, "Meitrack");