diff --git a/Waste.SocketService.cs/MyPackageFilter.cs b/Waste.SocketService.cs/MyPackageFilter.cs index fa4e17e..af5c30e 100644 --- a/Waste.SocketService.cs/MyPackageFilter.cs +++ b/Waste.SocketService.cs/MyPackageFilter.cs @@ -87,6 +87,20 @@ namespace Waste.SocketService return returnStr; } /// + /// 字节数组转字符串 + /// + /// + /// + public static string BytesToStringBUtf8(this byte[] bytes) + { + string returnStr = ""; + if (bytes != null) + { + returnStr = Encoding.UTF8.GetString(bytes); + } + return returnStr; + } + /// /// 字节数据转中文 /// /// @@ -186,7 +200,6 @@ namespace Waste.SocketService var package = new MyPackage(); var _reader = reader; Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - package.Str = _reader.ReadString(Encoding.GetEncoding("GB2312")); string key = ""; int keylen = 1; #region 解析头部,头部固定为A9 @@ -210,6 +223,7 @@ namespace Waste.SocketService #endregion if (key != "A9" && key !="A8") { + package.Str = _reader.ReadString(Encoding.GetEncoding("GB2312")); var len = reader.Length; string msg = ""; reader.Rewind(keylen); @@ -236,7 +250,7 @@ namespace Waste.SocketService { return null; } - body = bytes.BytesToString().Replace("\r", "").Replace("\n", ""); + body = bytes.BytesToStringBUtf8().Replace("\r", "").Replace("\n", ""); package.Body = bytes.BytesToHexStr(); var arr = body.Split('|'); #region 心跳包的处理,IMEI|GPS @@ -284,7 +298,8 @@ namespace Waste.SocketService } package.Time = $"{arr[4]}{arr[5]}".Replace("-", "").Replace(":", ""); //uuid@datetime@垃圾类型@子类@重量@价格@金额@操作员 - var measurearr =Encoding.UTF8.GetString(Encoding.GetEncoding("GB2312").GetBytes(arr[6])).Split('@'); + package.Str = _reader.ReadString(Encoding.UTF8); + var measurearr = arr[6].Split('@'); if (measurearr.Length == 8) { package.UUID = measurearr[0]; @@ -307,6 +322,7 @@ namespace Waste.SocketService } else { + package.Str = _reader.ReadString(Encoding.GetEncoding("GB2312")); package.Key = key; package.Len = (int)reader.Length - 2; string body = ""; diff --git a/Waste.SocketService.cs/Properties/PublishProfiles/FolderProfile.pubxml.user b/Waste.SocketService.cs/Properties/PublishProfiles/FolderProfile.pubxml.user index d00cf4d..37d90b7 100644 --- a/Waste.SocketService.cs/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Waste.SocketService.cs/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2022-06-21T06:07:12.5956345Z;True|2022-06-18T11:30:52.8509064+08:00;True|2022-06-18T11:12:53.8211499+08:00;True|2022-06-18T11:11:56.6483268+08:00;True|2022-06-18T10:40:35.8822373+08:00;True|2022-05-17T17:19:03.8993888+08:00;True|2021-11-23T17:56:50.1140092+08:00;True|2021-11-23T17:47:15.3723334+08:00;True|2021-11-23T17:46:56.0953346+08:00;True|2021-11-23T15:39:30.7279293+08:00;True|2021-11-23T15:26:11.9749528+08:00;True|2021-11-23T15:19:15.3506970+08:00;True|2021-11-23T14:58:10.0460847+08:00; + True|2022-06-21T08:12:12.0351728Z;True|2022-06-21T16:02:10.4631892+08:00;True|2022-06-21T15:53:41.4845069+08:00;True|2022-06-21T14:07:12.5956345+08:00;True|2022-06-18T11:30:52.8509064+08:00;True|2022-06-18T11:12:53.8211499+08:00;True|2022-06-18T11:11:56.6483268+08:00;True|2022-06-18T10:40:35.8822373+08:00;True|2022-05-17T17:19:03.8993888+08:00;True|2021-11-23T17:56:50.1140092+08:00;True|2021-11-23T17:47:15.3723334+08:00;True|2021-11-23T17:46:56.0953346+08:00;True|2021-11-23T15:39:30.7279293+08:00;True|2021-11-23T15:26:11.9749528+08:00;True|2021-11-23T15:19:15.3506970+08:00;True|2021-11-23T14:58:10.0460847+08:00; \ No newline at end of file