Decode cell towers info

1 files changed, 15 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
index 9449e2d5c..920898039 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2020 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.
@@ -25,6 +25,8 @@ import org.traccar.Protocol;
 import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.UnitsConverter;
+import org.traccar.model.CellTower;
+import org.traccar.model.Network;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
@@ -161,6 +163,18 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
                         position.set(
                                 Position.KEY_VIN, buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
                         break;
+                    case 0x0020:
+                        Network network = new Network();
+                        String[] cells = buf.readCharSequence(
+                                length, StandardCharsets.US_ASCII).toString().split("\\+");
+                        for (String cell : cells) {
+                            String[] values = cell.split("@");
+                            network.addCellTower(CellTower.from(
+                                    Integer.parseInt(values[0]), Integer.parseInt(values[1]),
+                                    Integer.parseInt(values[2], 16), Integer.parseInt(values[3], 16)));
+                        }
+                        position.setNetwork(network);
+                        break;
                     default:
                         buf.skipBytes(length);
                         break;