From 97acf5442c9d99f07bb2e654c1b62e8629754e41 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Thu, 15 Feb 2024 09:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/imdroid/sideslope/message/BaseMessage.java    | 7 +++----
 .../com/imdroid/sideslope/message/D331RtcmMessage.java     | 7 +++----
 .../com/imdroid/sideslope/message/D341LocationMessage.java | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/BaseMessage.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/BaseMessage.java
index 1f630942..dfa4a804 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/BaseMessage.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/BaseMessage.java
@@ -1,6 +1,5 @@
 package com.imdroid.sideslope.message;
 
-import com.imdroid.common.util.WrongMessageRecorder;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 
@@ -32,12 +31,12 @@ public abstract class BaseMessage {
 
             this.len = src.readUnsignedShort();
             this.seq = this.len >> 11;
-            this.len = this.len & 0x7FF;
+            this.len = packetLen;//this.len & 0x7FF;
             this.id = String.valueOf(src.readUnsignedInt());
-            if (packetLen - 4 != this.len) {
+            /*if (packetLen - 4 != this.len) {
                 String msg = (String.format("id[%s],长度字段值[%s]与包的消息体长度[%s]不匹配", id, this.len, packetLen - 4));
                 WrongMessageRecorder.INSTANCE.append("receive wrong message," + msg);
-            }
+            }*/
             this.pps = src.readUnsignedShort();
         }
         decodeBody(src);
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D331RtcmMessage.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D331RtcmMessage.java
index ab9cc606..226a55a3 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D331RtcmMessage.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D331RtcmMessage.java
@@ -1,6 +1,5 @@
 package com.imdroid.sideslope.message;
 
-import com.imdroid.common.util.WrongMessageRecorder;
 import com.imdroid.sideslope.bd.Gga;
 import io.netty.buffer.ByteBuf;
 
@@ -17,12 +16,12 @@ public class D331RtcmMessage extends BaseMessage {
         this.header = src.getUnsignedShort(0); // flag
         this.len = src.getUnsignedShort(2); // length:11 bits
         this.seq = this.len >> 11;
-        this.len = this.len & 0x7FF;
+        this.len = src.readableBytes();//this.len & 0x7FF;//有可能两个d331粘包
         this.id = String.valueOf(src.getUnsignedInt(4)); //id
-        if (src.readableBytes() - 4 < this.len) {
+        /*if (src.readableBytes() - 4 < this.len) {
             String msg = String.format("id[%s],长度字段值[%s]效益包的消息体长度[%s]", id, this.len, src.readableBytes() - 4);
             WrongMessageRecorder.INSTANCE.append("receive wrong message," + msg);
-        }
+        }*/
         gga = Gga.getFrom(src);
         this.srcData = new byte[src.readableBytes()];
         src.readBytes(this.srcData);
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D341LocationMessage.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D341LocationMessage.java
index 85d3d89a..b47898a1 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D341LocationMessage.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D341LocationMessage.java
@@ -3,7 +3,6 @@ package com.imdroid.sideslope.message;
 import com.imdroid.sideslope.bd.Gga;
 import com.imdroid.sideslope.bd.Tilt;
 import com.imdroid.sideslope.bd.UBXUtil;
-import com.imdroid.common.util.WrongMessageRecorder;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,12 +25,12 @@ public class D341LocationMessage extends BaseMessage {
         this.header = src.getUnsignedShort(pos);pos+=2;
         this.len = src.getUnsignedShort(pos);pos+=2;
         this.seq = this.len >> 11;
-        this.len = this.len & 0x7FF;
+        this.len = packetLen;//this.len & 0x7FF;
         this.id = String.valueOf(src.getUnsignedInt(pos));pos+=4; //id
-        if (packetLen - 4 != this.len) {
+        /*if (packetLen - 4 != this.len) {
             String msg = (String.format("id[%s],长度字段值[%s]与包的消息体长度[%s]不匹配", id, this.len, packetLen - 4));
             WrongMessageRecorder.INSTANCE.append("receive wrong message," + msg);
-        }
+        }*/
         this.pps = src.getUnsignedShort(pos);pos+=2;
 
         tilt = new Tilt(src.getFloat(pos), src.getFloat(pos+4),src.getFloat(pos+8),src.getFloat(pos+12));