2 files changed, 72 insertions, 8 deletions

diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java
index b6ad73db1..ad59a1c70 100644
--- a/src/org/traccar/Server.java
+++ b/src/org/traccar/Server.java
@@ -52,6 +52,7 @@ import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.SimpleChannelHandler;
+import org.traccar.protocol.xexun2.Xexun2ProtocolDecoder;
 
 /**
  * Server
@@ -501,6 +502,57 @@ public class Server implements DataManager {
             serverList.add(server);
         }
     }
+    
+    /**
+     * Xexun 2 pipeline factory
+     */
+    protected class Xexun2PipelineFactory implements ChannelPipelineFactory {
+
+        private TrackerServer server;
+        private Server serverCreator;
+        private Integer resetDelay;
+        
+        public Xexun2PipelineFactory(
+                TrackerServer server, Server serverCreator, Integer resetDelay) {
+            this.server = server;
+            this.serverCreator = serverCreator;
+            this.resetDelay = resetDelay;
+        }
+        
+        public ChannelPipeline getPipeline() {
+            ChannelPipeline pipeline = Channels.pipeline();
+            pipeline.addLast("openHandler", new OpenChannelHandler(server));
+            if (serverCreator.isLoggerEnabled()) {
+                pipeline.addLast("logger", new LoggingHandler("logger"));
+            }
+            byte delimiter[] = { (byte) '\r', (byte) '\n' };
+            pipeline.addLast("frameDecoder",
+                    new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
+            pipeline.addLast("stringDecoder", new StringDecoder());
+            pipeline.addLast("objectDecoder", new Xexun2ProtocolDecoder(serverCreator, resetDelay));
+            pipeline.addLast("handler", new TrackerEventHandler(serverCreator));            
+            return pipeline;
+        }
+    }
+    
+    /**
+     * Init Xexun 2 server
+     */
+    public void initXexun2Server(Properties properties) throws SQLException {
+
+        boolean enable = Boolean.valueOf(properties.getProperty("xexun2.enable"));
+        if (enable) {
+
+            TrackerServer server = new TrackerServer(
+                    Integer.valueOf(properties.getProperty("xexun2.port")));
+
+            String resetDelay = properties.getProperty("xexun2.resetDelay");
+            server.setPipelineFactory(new Xexun2PipelineFactory(
+                    server, this, (resetDelay == null) ? 0 : Integer.valueOf(resetDelay)));
+
+            serverList.add(server);
+        }
+    }
 
     /**
      * Start
diff --git a/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java
index 678d4c283..f7ff9f528 100644
--- a/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java
+++ b/src/org/traccar/protocol/xexun2/Xexun2ProtocolDecoder.java
@@ -59,19 +59,28 @@ public class Xexun2ProtocolDecoder extends OneToOneDecoder {
      * Regular expressions pattern
      */
     static private Pattern pattern = Pattern.compile(
+            "\\d+," +
+            "\\+\\d+," +
             "GPRMC," +
-            "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)
+            "(\\d{2})(\\d{2})(\\d{2}).(\\d{3})," + // Time (HHMMSS.SSS)
             "([AV])," +                         // Validity
-            "([\\d]{2})([\\d]{2}.[\\d]{4})," +  // Latitude (DDMM.MMMM)
+            "(\\d{2})(\\d{2}.\\d{4})," +        // Latitude (DDMM.MMMM)
             "([NS])," +
-            "([\\d]{3})([\\d]{2}.[\\d]{4})," +  // Longitude (DDDMM.MMMM)
+            "(\\d{3})(\\d{2}.\\d{4})," +        // Longitude (DDDMM.MMMM)
             "([EW])," +
-            "([\\d]+.[\\d]+)," +                // Speed
-            "([\\d]+.[\\d]+)?," +               // Course
-            "([\\d]{2})([\\d]{2})([\\d]{2})," + // Date (DDMMYY)
+            "(\\d+.\\d+)," +                    // Speed
+            "(\\d+.\\d+)?," +                   // Course
+            "(\\d{2})(\\d{2})(\\d{2})," +       // Date (DDMMYY)
             ".*imei:" +
-            "([\\d]+),");                       // IMEI
-
+            "([\\d]+)," +                       // IMEI
+            "\\d+," +
+            "\\d+.\\d+," +
+            "F:(\\d+.\\d+)V," +                 // Power
+            ".*");
+
+    //"111111120009,+436763737552,GPRMC,120009.590,A,4639.6774,N,01418.5737,E,0.00,0.00,111111"
+    //",,,A*68,F,, imei:012207000694569,04,481.2,F:4.15V,0,139,2689,232,03,2725,0576"
+    
     /**
      * Decode message
      */
@@ -137,6 +146,9 @@ public class Xexun2ProtocolDecoder extends OneToOneDecoder {
         // Get device by IMEI
         String imei = parser.group(index++);
         position.setDeviceId(dataManager.getDeviceByImei(imei).getId());
+        
+        // Power
+        position.setPower(Double.valueOf(parser.group(index++)));
 
         return position;
     }