From 4ee083a1c80e6b13c9f8bfbc0cdda08b97ac86fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=B9=8F?= <304594656@qq.com>
Date: Wed, 25 Dec 2024 13:50:47 +0800
Subject: [PATCH] =?UTF-8?q?WastePackageFilter=E6=94=AF=E6=8C=81=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86A9=E3=80=81A8=E3=80=81A7=E9=BB=98=E8=AE=A4=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Waste.SocketService.cs/MyPackageFilter.cs | 30 ++++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/Waste.SocketService.cs/MyPackageFilter.cs b/Waste.SocketService.cs/MyPackageFilter.cs
index fffd2fa..1c2b65f 100644
--- a/Waste.SocketService.cs/MyPackageFilter.cs
+++ b/Waste.SocketService.cs/MyPackageFilter.cs
@@ -215,20 +215,20 @@ namespace Waste.SocketService
                 #endregion
                 if (key != "A9" && key != "A8" && key != "A7")
                 {
-                    var len = reader.Length;
-                    string msg = "";
+                    //var len = reader.Length;
+                    //string msg = "";
                     reader.Rewind(keylen);
-                    for (var i = 0; i < len; i++)
-                    {
-                        reader.TryRead(out byte msgByte);
-                        msg += msgByte.ByteToHexStr();
-                    }
-                    package.IsChecked = false;
-                    package.Body = msg;
-                    return package;
+                    //for (var i = 0; i < len; i++)
+                    //{
+                    //    reader.TryRead(out byte msgByte);
+                    //    msg += msgByte.ByteToHexStr();
+                    //}
+                    //package.IsChecked = false;
+                    //package.Body = msg;
+                    //return package;
 
                 }
-                else if (key == "A7")
+                if (key == "A7")
                 {
                     key = "A8";//全部GB2312的A8
                     return ReadA7(reader, package, key, GB2312);
@@ -335,7 +335,8 @@ namespace Waste.SocketService
                     #endregion
                     return package;
                 }
-                else
+
+                else if (key == "A9")
                 {
                     //package.Str = _reader.ReadString(GB2312);
                     package.Key = key;
@@ -447,6 +448,11 @@ namespace Waste.SocketService
                     #endregion
                     return package;
                 }
+                else
+                {
+                    key = "A8";//全部GB2312的A8
+                    return ReadA7(reader, package, key, GB2312);
+                }
             }
             catch (Exception ex)
             {