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) {