From c4bc919e3490dfc4d1d20d6b41e48003d1400073 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 20 Nov 2023 10:40:58 -0800
Subject: Improve Queclink basic pattern

---
 src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java   | 2 +-
 .../java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index 290f35d83..5ee3761dd 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -1398,7 +1398,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
     private static final Pattern PATTERN_BASIC = new PatternBuilder()
             .text("+").expression("(?:RESP|BUFF)").text(":")
             .expression("GT...,")
-            .number("(?:[0-9A-Z]{2}xxxx)?,").optional() // protocol version
+            .expression("[^,]+,").optional()     // protocol version
             .number("(d{15}|x{14}),")            // imei
             .any()
             .text(",")
diff --git a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
index 0a0d27e3e..037c8f75a 100644
--- a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
@@ -11,15 +11,14 @@ public class Gl200TextProtocolDecoderTest extends ProtocolTest {
 
         var decoder = inject(new Gl200TextProtocolDecoder(null));
 
-        verifyAttribute(decoder, buffer(
-                "+RESP:GTLSA,C50204,866356062524268,,1,0,1,0,0.0,0,123.3,4.730544,51.620446,20231116021001,0204,0008,0D0C,309C,18,1,7,96,0,,,20231116080602,0040$"),
-                "lightLevel", 7);
+        verifyPosition(decoder, buffer(
+                "+BUFF:GTFRI,8020040200,866314060249032,,12194,10,1,3,0.0,0,20.1,-71.596533,-33.524718,20230926200338,0730,0001,772A,052B253E,02,0,0.0,,,,,0,420000,,,,20230926200340,1549$"));
 
         verifyAttribute(decoder, buffer(
                 "+RESP:GTFRI,423037,866884047716519,GT501,0,1,1,5,12,0.1,0,46.8,-95.559173,30.109955,20231110185836,6,0e36c9916485,-50,,,,e831cd5eb79d,-73,,,,ccf4110c4bd5,-79,,,,acdb48973168,-79,,,,80ab4dc323c4,-82,,,,ec8eb5cfa1c6,-89,,,,310,10,711D,81ECF0F,00,,93,20231110185839,0005$"),
                 Position.KEY_BATTERY_LEVEL, 93);
 
-        verifyNull(decoder, buffer(
+        verifyPosition(decoder, buffer(
                 "+RESP:GTFRI,8020040200,866314060109269,,,10,1,1,0.0,0,9.0,-71.596601,-33.524595,20230722145338,0730,0001,772A,052B253E,00,0.0,,,,,100,210100,,,,20230722145341,0F4C$"));
 
         verifyAttributes(decoder, buffer(
-- 
cgit v1.2.3