Solar Powered GPS protocol

5 files changed, 153 insertions, 1 deletions

diff --git a/setup/default.xml b/setup/default.xml
index f1f3ab517..f97511ed6 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -277,5 +277,6 @@
     <entry key='pacifictrack.port'>5198</entry>
     <entry key='topin.port'>5199</entry>
     <entry key='outsafe.port'>5200</entry>
+    <entry key='solarpowered.port'>5201</entry>
 
 </properties>
diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index 94a6670ec..a1987ee5a 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -270,4 +270,3 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
     }
 
 }
-
diff --git a/src/main/java/org/traccar/protocol/SolarPoweredProtocol.java b/src/main/java/org/traccar/protocol/SolarPoweredProtocol.java
new file mode 100644
index 000000000..53a948cdc
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/SolarPoweredProtocol.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.traccar.BaseProtocol;
+import org.traccar.PipelineBuilder;
+import org.traccar.TrackerServer;
+
+public class SolarPoweredProtocol extends BaseProtocol {
+
+    public SolarPoweredProtocol() {
+        addServer(new TrackerServer(false, getName()) {
+            @Override
+            protected void addProtocolHandlers(PipelineBuilder pipeline) {
+                pipeline.addLast(new HuabaoFrameDecoder());
+                pipeline.addLast(new SolarPoweredProtocolDecoder(SolarPoweredProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/main/java/org/traccar/protocol/SolarPoweredProtocolDecoder.java b/src/main/java/org/traccar/protocol/SolarPoweredProtocolDecoder.java
new file mode 100644
index 000000000..34d749816
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/SolarPoweredProtocolDecoder.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.Protocol;
+import org.traccar.helper.BitUtil;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+
+public class SolarPoweredProtocolDecoder extends BaseProtocolDecoder {
+
+    public SolarPoweredProtocolDecoder(Protocol protocol) {
+        super(protocol);
+    }
+
+    public static final int MSG_ACTIVE_REPORTING = 0x11;
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        ByteBuf buf = (ByteBuf) msg;
+
+        buf.readUnsignedByte(); // start marker
+
+        String imei = ByteBufUtil.hexDump(buf.readSlice(8)).substring(0, 15);
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, imei);
+        if (deviceSession == null) {
+            return null;
+        }
+
+        int type = buf.readUnsignedByte();
+        buf.readUnsignedShort(); // attributes
+
+        if (type == MSG_ACTIVE_REPORTING) {
+
+            Position position = new Position(getProtocolName());
+            position.setDeviceId(deviceSession.getDeviceId());
+
+            while (buf.readableBytes() > 2) {
+                int tag = buf.readUnsignedByte();
+                int length = buf.readUnsignedByte();
+                switch (tag) {
+                    case 0x81:
+                        int status = buf.readUnsignedByte();
+                        DateBuilder dateBuilder = new DateBuilder()
+                                .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
+                                .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
+                        position.setTime(dateBuilder.getDate());
+                        position.setLatitude(buf.readUnsignedInt() * 0.000001);
+                        if (BitUtil.check(status, 3)) {
+                            position.setLatitude(-position.getLatitude());
+                        }
+                        position.setLongitude(buf.readUnsignedInt() * 0.000001);
+                        if (BitUtil.check(status, 3)) {
+                            position.setLongitude(-position.getLongitude());
+                        }
+                        position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+                        position.set(Position.KEY_DEVICE_TEMP, (int) buf.readByte());
+                        position.set(Position.KEY_BATTERY, buf.readUnsignedByte() * 0.02);
+                        position.setCourse(buf.readUnsignedByte());
+                        break;
+                    default:
+                        buf.skipBytes(length);
+                        break;
+                }
+            }
+
+            return position;
+
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/test/java/org/traccar/protocol/SolarPoweredProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SolarPoweredProtocolDecoderTest.java
new file mode 100644
index 000000000..b040d4ecf
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/SolarPoweredProtocolDecoderTest.java
@@ -0,0 +1,21 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class SolarPoweredProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        SolarPoweredProtocolDecoder decoder = new SolarPoweredProtocolDecoder(null);
+
+        verifyPosition(decoder, binary(
+                "7e850256553304728011003e811319130b0b11211f01a2e6be091fa0e10114cc1582020f00831000004e7400000044000000223819020c84114161726f6e34475630312d313931303331127e"));
+
+        verifyPosition(decoder, binary(
+                "7e850256553304728011003e811319130b0d160e2901a2e66f091fa0ab0014c39482020f0083100002f42c00000287000000fc2719021484114161726f6e34475630312d313931303331e67e"));
+
+    }
+
+}