Merge remote-tracking branch 'refs/remotes/tananaev/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/src/org/traccar/protocol/MeitrackProtocol.java b/src/org/traccar/protocol/MeitrackProtocol.java
index c957d4ea1..e5b5ddf2b 100644
--- a/src/org/traccar/protocol/MeitrackProtocol.java
+++ b/src/org/traccar/protocol/MeitrackProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,10 +31,12 @@ public class MeitrackProtocol extends BaseProtocol {
     public MeitrackProtocol() {
         super("meitrack");
         setSupportedCommands(
+                Command.TYPE_POSITION_SINGLE,
                 Command.TYPE_ENGINE_STOP,
                 Command.TYPE_ENGINE_RESUME,
                 Command.TYPE_ALARM_ARM,
-                Command.TYPE_ALARM_DISARM);
+                Command.TYPE_ALARM_DISARM,
+                Command.TYPE_REQUEST_PHOTO);
     }
 
     @Override
@@ -44,6 +46,7 @@ public class MeitrackProtocol extends BaseProtocol {
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
                 pipeline.addLast("frameDecoder", new MeitrackFrameDecoder());
                 pipeline.addLast("stringEncoder", new StringEncoder());
+                pipeline.addLast("objectEncoder", new MeitrackProtocolEncoder());
                 pipeline.addLast("objectDecoder", new MeitrackProtocolDecoder(MeitrackProtocol.this));
             }
         };
@@ -53,6 +56,7 @@ public class MeitrackProtocol extends BaseProtocol {
             @Override
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
                 pipeline.addLast("stringEncoder", new StringEncoder());
+                pipeline.addLast("objectEncoder", new MeitrackProtocolEncoder());
                 pipeline.addLast("objectDecoder", new MeitrackProtocolDecoder(MeitrackProtocol.this));
             }
         };