From 63a3499444348d7ee8def59c17814a88aa1f3eb6 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Fri, 17 May 2024 09:32:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81gga=E5=A4=84=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81d300=E5=92=8Cb562=E6=B7=B7?=
 =?UTF-8?q?=E5=90=88=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/imdroid/sideslope/bd/Gga.java    | 43 +++++--------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java
index 038fec90..cded5c89 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java
@@ -38,19 +38,11 @@ public class Gga {
     public Gga() {
     }
 
-    static public Gga getFrom(ByteBuf data){
+    public static Gga getFrom(ByteBuf data){
         int msgFlag = data.getUnsignedShort(0);
-        if(msgFlag == 0xD341){
-            return getFromD341(data);
+        if(msgFlag != 0xD341 && msgFlag != 0xD331){
+            return null;
         }
-        else if(msgFlag == 0xD331){
-            return getFromD331(data);
-        }
-        else return null;
-
-    }
-
-    static Gga getFromD331(ByteBuf data){
         int pos = 26; // 从惯导之后开始
         boolean found = false;
         while(pos<data.readableBytes()){
@@ -65,29 +57,14 @@ public class Gga {
                     pos += 26;
                 }
                 else {
-                    pos++;
-                    pos += data.getUnsignedShort(pos) + 5;//length+payload+crc
-                }
-            }
-            else{
-                break;
-            }
-        }
-        if(found){
-            return getFromGGAString(data, pos);
-        }
-        else return null;
-    }
+                    // +----------+----------+----------+
+                    // |    d3    |  6bit |   10bits    |
+                    // +----------+----------+----------+
+                    // d3 xx payload len(10bits)
 
-    static Gga getFromD341(ByteBuf data){
-        int pos = 26; // 从惯导之后开始
-        boolean found = false;
-        while(pos<data.readableBytes()){
-            byte d0 = data.getByte(pos);
-            byte d1 = data.getByte(pos+1);
-            if(GGA_FLAG[0] == d0 && GGA_FLAG[1] == d1){
-                found = true;
-                break;
+                    pos++;
+                    pos += ((data.getUnsignedShort(pos)&0x03FF) + 5);//length(2byte)+payload+crc(3byte)
+                }
             }
             else if(b562_flag[0] == d0 && b562_flag[1] == d1){
                 pos += 4; // type, class id