diff --git a/JiShe.CollectBus.Console/JiShe.CollectBus.Console.csproj b/JiShe.CollectBus.Console/JiShe.CollectBus.Console.csproj index bdd95c7..efa68c7 100644 --- a/JiShe.CollectBus.Console/JiShe.CollectBus.Console.csproj +++ b/JiShe.CollectBus.Console/JiShe.CollectBus.Console.csproj @@ -37,4 +37,8 @@ + + + + diff --git a/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs b/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs index fb285a1..374ca04 100644 --- a/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs +++ b/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs @@ -12,7 +12,7 @@ namespace JiShe.CollectBus.Core.Plugins { //TODO:电表: 376.1 645-07 modbus 水表: 118 645-97 - const string protocolType = "TestProtocol"; + const string protocolType = "StandardProtocol"; switch (protocolType) { //case "376": diff --git a/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs b/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs index fa52834..838f9cc 100644 --- a/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs +++ b/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs @@ -2,6 +2,7 @@ using JiShe.CollectBus.Protocol.Contracts.Interfaces; using JiShe.CollectBus.Protocol.Contracts.Models; using Microsoft.Extensions.Caching.Distributed; +using TouchSocket.Sockets; namespace JiShe.CollectBus.Protocol.Contracts.Abstracts { @@ -16,7 +17,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts public abstract ProtocolInfo Get(); - public abstract void Received(); + public abstract void Received(ReceivedDataEventArgs e); public abstract void Send(); diff --git a/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs b/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs index 0c18e3f..ecbd143 100644 --- a/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs +++ b/JiShe.CollectBus.Protocol.Contracts/Interfaces/IProtocolPlugin.cs @@ -1,4 +1,5 @@ using JiShe.CollectBus.Protocol.Contracts.Models; +using TouchSocket.Sockets; namespace JiShe.CollectBus.Protocol.Contracts.Interfaces { @@ -8,7 +9,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Interfaces void Load(); - void Received(); + void Received(ReceivedDataEventArgs e); void Send(); } diff --git a/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj b/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj index 8be6c70..04db03d 100644 --- a/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj +++ b/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj @@ -1,12 +1,13 @@  - - netstandard2.1 - enable - + + netstandard2.1 + enable + - - - + + + + diff --git a/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs b/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs index 592c719..f53f957 100644 --- a/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs +++ b/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs @@ -3,6 +3,7 @@ using JiShe.CollectBus.Protocol.Contracts.Attributes; using JiShe.CollectBus.Protocol.Contracts.DependencyInjection; using JiShe.CollectBus.Protocol.Contracts.Models; using Microsoft.Extensions.Caching.Distributed; +using TouchSocket.Sockets; namespace JiShe.CollectBus.Protocol.Test { @@ -14,7 +15,7 @@ namespace JiShe.CollectBus.Protocol.Test return new ProtocolInfo("Test", "376.1", "TCP", "376.1协议", "DTSU1980"); } - public override void Received() + public override void Received(ReceivedDataEventArgs e) { throw new NotImplementedException(); } diff --git a/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs b/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs index d90ae49..2424512 100644 --- a/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs +++ b/JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs @@ -3,6 +3,7 @@ using JiShe.CollectBus.Protocol.Contracts.Attributes; using JiShe.CollectBus.Protocol.Contracts.DependencyInjection; using JiShe.CollectBus.Protocol.Contracts.Models; using Microsoft.Extensions.Caching.Distributed; +using TouchSocket.Sockets; namespace JiShe.CollectBus.Protocol { @@ -19,7 +20,7 @@ namespace JiShe.CollectBus.Protocol base.Load(); } - public override void Received() + public override void Received(ReceivedDataEventArgs e) { throw new NotImplementedException(); }