From f83fcec786db08ed952950d4377ff4e81e626371 Mon Sep 17 00:00:00 2001
From: Kimdiego2098 <2248356998@qq.com>
Date: Thu, 12 Oct 2023 14:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DLT645/DLT645_2007Message.cs                           | 7 ++-----
 .../Modbus/ModbusRtu/ModbusRtuMessage.cs                   | 7 ++-----
 .../Modbus/ModbusSerialServer/ModbusSerialServerMessage.cs | 7 ++-----
 .../Modbus/ModbusTcp/ModbusTcpMessage.cs                   | 6 +++---
 .../Modbus/ModbusTcpServer/ModbusTcpServerMessage.cs       | 6 +++---
 .../Foundation/Message/CollectMessageBase.cs               | 2 +-
 .../Foundation/Message/IMessage.cs                         | 4 ++--
 7 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/framework/Foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007Message.cs b/framework/Foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007Message.cs
index 24312ed9d..8e9053b5a 100644
--- a/framework/Foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007Message.cs
+++ b/framework/Foundation/ThingsGateway.Foundation.Adapter.DLT645/DLT645/DLT645_2007Message.cs
@@ -20,15 +20,12 @@ public class DLT645_2007Message : MessageBase, IMessage
     public override int HeadBytesLength => -1;
 
     /// <inheritdoc/>
-    public override bool CheckHeadBytes(byte[] head)
+    public override bool CheckHeadBytes(byte[] heads)
     {
         BodyLength = -1;
         return true;
     }
 
-    /// <inheritdoc/>
-    protected override void SendBytesThen()
-    {
-    }
+
 
 }
\ No newline at end of file
diff --git a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtuMessage.cs b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtuMessage.cs
index b6402d4b2..3f0a12eda 100644
--- a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtuMessage.cs
+++ b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtuMessage.cs
@@ -20,15 +20,12 @@ public class ModbusRtuMessage : MessageBase, IMessage
     public override int HeadBytesLength => -1;
 
     /// <inheritdoc/>
-    public override bool CheckHeadBytes(byte[] head)
+    public override bool CheckHeadBytes(byte[] heads)
     {
         BodyLength = -1;
         return true;
     }
 
-    /// <inheritdoc/>
-    protected override void SendBytesThen()
-    {
-    }
+
 
 }
\ No newline at end of file
diff --git a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusSerialServer/ModbusSerialServerMessage.cs b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusSerialServer/ModbusSerialServerMessage.cs
index 8a59b538d..60a2630a3 100644
--- a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusSerialServer/ModbusSerialServerMessage.cs
+++ b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusSerialServer/ModbusSerialServerMessage.cs
@@ -30,14 +30,11 @@ public class ModbusSerialServerMessage : MessageBase, IMessage
     public override int HeadBytesLength => -1;
 
     /// <inheritdoc/>
-    public override bool CheckHeadBytes(byte[] head)
+    public override bool CheckHeadBytes(byte[] heads)
     {
         BodyLength = -1;
         return true;
     }
 
-    /// <inheritdoc/>
-    protected override void SendBytesThen()
-    {
-    }
+
 }
\ No newline at end of file
diff --git a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcp/ModbusTcpMessage.cs b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcp/ModbusTcpMessage.cs
index a183a9e36..e399ae8ca 100644
--- a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcp/ModbusTcpMessage.cs
+++ b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcp/ModbusTcpMessage.cs
@@ -23,10 +23,10 @@ public class ModbusTcpMessage : MessageBase, IMessage
     /// </summary>
     public bool IsCheckMessageId { get; set; } = false;
     /// <inheritdoc/>
-    public override bool CheckHeadBytes(byte[] head)
+    public override bool CheckHeadBytes(byte[] heads)
     {
-        if (head == null || head.Length <= 0) return false;
-        HeadBytes = head;
+        if (heads == null || heads.Length <= 0) return false;
+        HeadBytes = heads;
 
         int num = (HeadBytes[4] * 256) + HeadBytes[5];
         BodyLength = num;
diff --git a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcpServer/ModbusTcpServerMessage.cs b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcpServer/ModbusTcpServerMessage.cs
index 5d9157463..bfa79aa37 100644
--- a/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcpServer/ModbusTcpServerMessage.cs
+++ b/framework/Foundation/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcpServer/ModbusTcpServerMessage.cs
@@ -29,10 +29,10 @@ namespace ThingsGateway.Foundation.Adapter.Modbus
         /// <inheritdoc/>
         public override int HeadBytesLength => 6;
         /// <inheritdoc/>
-        public override bool CheckHeadBytes(byte[] head)
+        public override bool CheckHeadBytes(byte[] heads)
         {
-            if (head == null || head.Length != 6) return false;
-            HeadBytes = head;
+            if (heads == null || heads.Length != 6) return false;
+            HeadBytes = heads;
 
             int num = (HeadBytes[4] * 256) + HeadBytes[5];
             BodyLength = num;
diff --git a/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs b/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs
index 588344946..26913db03 100644
--- a/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs
+++ b/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/CollectMessageBase.cs
@@ -43,7 +43,7 @@ public abstract class MessageBase : OperResult<byte[]>, IMessage
     }
 
     /// <inheritdoc/>
-    public abstract bool CheckHeadBytes(byte[] head);
+    public abstract bool CheckHeadBytes(byte[] heads);
 
     /// <summary>
     /// 写入<see cref="SendBytes"/>后触发此方法
diff --git a/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/IMessage.cs b/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/IMessage.cs
index 85e8effa7..5c066d22e 100644
--- a/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/IMessage.cs
+++ b/framework/Foundation/ThingsGateway.Foundation/Foundation/Message/IMessage.cs
@@ -51,7 +51,7 @@ public interface IMessage : IOperResult, IRequestInfo
     /// <summary>
     /// 检查头子节的合法性,并赋值<see cref="BodyLength"/><br />
     /// </summary>
-    /// <param name="head">接收的头子节</param>
+    /// <param name="heads">接收的头子节</param>
     /// <returns>是否成功的结果</returns>
-    bool CheckHeadBytes(byte[] head);
+    bool CheckHeadBytes(byte[] heads);
 }
\ No newline at end of file