Add support for multi-fence type

nadezhdamosunova · Dec 14, 2017 · c60b591 · c60b591
1 parent c2e96b3
commit c60b591
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -118,6 +118,7 @@ private static boolean hasGps(int type) {
             case MSG_GPS_LBS_EXTEND:
             case MSG_GPS_2:
             case MSG_FENCE_SINGLE:
+            case MSG_FENCE_MULTI:
                 return true;
             default:
                 return false;
@@ -135,6 +136,7 @@ private static boolean hasLbs(int type) {
             case MSG_GPS_LBS_STATUS_3:
             case MSG_GPS_2:
             case MSG_FENCE_SINGLE:
+            case MSG_FENCE_MULTI:
             case MSG_LBS_ALARM:
             case MSG_LBS_ADDRESS:
                 return true;
@@ -630,7 +632,7 @@ private Object decodeBasicOther(Channel channel, ChannelBuffer buf,
             buf.readUnsignedShort();
         }
 
-        if (type == MSG_GPS_LBS_STATUS_3) {
+        if (type == MSG_GPS_LBS_STATUS_3 || type == MSG_FENCE_MULTI) {
             position.set(Position.KEY_GEOFENCE, buf.readUnsignedByte());
         }
 

diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -19,7 +19,7 @@ public void testDecode() throws Exception {
         verifyAttributes(decoder, binary(
                 "78780B23C00122040001000818720D0A"));
 
-        verifyNull(decoder, binary(
+        verifyNotNull(decoder, binary(
                 "78782EA4110C0C02281BF6026C18720C38D22800149C1181CC00010000260E000000000615F8012C05041102FF001058FD0D0A"));
 
         verifyNotNull(decoder, binary(