From eccec85ea619d7a4d6c474a63ef33d094bfd8682 Mon Sep 17 00:00:00 2001 From: Kimdiego2098 <2248356998@qq.com> Date: Sun, 21 Jan 2024 21:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A7=A3=E6=9E=90=E5=AF=84?= =?UTF-8?q?=E5=AD=98=E5=99=A8=E5=9C=B0=E5=9D=80=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/DLT645/Dlt645_2007Master.cs | 2 +- .../src/Master/ModbusMaster.cs | 2 +- .../src/Utils/ByteTransUtil.cs | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/foundation/ThingsGateway.Foundation.Dlt645/src/DLT645/Dlt645_2007Master.cs b/src/foundation/ThingsGateway.Foundation.Dlt645/src/DLT645/Dlt645_2007Master.cs index ed01d6fb5..cc2a31db5 100644 --- a/src/foundation/ThingsGateway.Foundation.Dlt645/src/DLT645/Dlt645_2007Master.cs +++ b/src/foundation/ThingsGateway.Foundation.Dlt645/src/DLT645/Dlt645_2007Master.cs @@ -482,7 +482,7 @@ internal class DtuPlugin : PluginBase, ITcpReceivingPlugin if (!socket.Id.StartsWith("ID=")) { ByteBlock byteBlock = e.ByteBlock; - var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray()).ToLower()}"; + var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray())}"; client.Logger.Info(string.Format(DltConst.DtuConnected, id)); socket.ResetId(id); } diff --git a/src/foundation/ThingsGateway.Foundation.Modbus/src/Master/ModbusMaster.cs b/src/foundation/ThingsGateway.Foundation.Modbus/src/Master/ModbusMaster.cs index 2bcf81b88..cbc733f78 100644 --- a/src/foundation/ThingsGateway.Foundation.Modbus/src/Master/ModbusMaster.cs +++ b/src/foundation/ThingsGateway.Foundation.Modbus/src/Master/ModbusMaster.cs @@ -351,7 +351,7 @@ internal class DtuPlugin : PluginBase, ITcpReceivingPlugin if (!socket.Id.StartsWith("ID=")) { ByteBlock byteBlock = e.ByteBlock; - var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray()).ToLower()}"; + var id = $"ID={Encoding.UTF8.GetString(byteBlock.ToArray())}"; client.Logger.Info(string.Format(ModbusConst.DtuConnected, id)); socket.ResetId(id); } diff --git a/src/foundation/ThingsGateway.Foundation/src/Utils/ByteTransUtil.cs b/src/foundation/ThingsGateway.Foundation/src/Utils/ByteTransUtil.cs index 682ca1b79..6fa5c108a 100644 --- a/src/foundation/ThingsGateway.Foundation/src/Utils/ByteTransUtil.cs +++ b/src/foundation/ThingsGateway.Foundation/src/Utils/ByteTransUtil.cs @@ -65,7 +65,7 @@ public class ByteTransUtil return cachedConverter!.CopyNew(); } - registerAddress = registerAddress.Trim().ToLower(); + registerAddress = registerAddress.Trim(); var strs = registerAddress.SplitStringBySemicolon(); @@ -77,27 +77,27 @@ public class ByteTransUtil StringBuilder sb = new(); foreach (var str in strs) { - if (str.StartsWith("data=")) + if (str.ToLower().StartsWith("data=")) { var dataFormatName = str.Substring(5); try { if (Enum.TryParse(dataFormatName, true, out var dataFormat1)) dataFormat = dataFormat1; } catch { } } - else if (str.StartsWith("encoding=")) + else if (str.ToLower().StartsWith("encoding=")) { var encodingName = str.Substring(9); try { encoding = Encoding.GetEncoding(encodingName); } catch { } } - else if (str.StartsWith("len=")) + else if (str.ToLower().StartsWith("len=")) { var lenStr = str.Substring(4); stringlength = lenStr.IsNullOrEmpty() ? null : Convert.ToUInt16(lenStr); } - else if (str.StartsWith("arraylen=")) + else if (str.ToLower().StartsWith("arraylen=")) { var lenStr = str.Substring(9); length = lenStr.IsNullOrEmpty() ? null : Convert.ToUInt16(lenStr); } - else if (str.StartsWith("bcd=")) + else if (str.ToLower().StartsWith("bcd=")) { var bcdName = str.Substring(4); try { if (Enum.TryParse(bcdName, true, out var bcdFormat1)) bcdFormat = bcdFormat1; } catch { }