From 7b0bb441ab2327cab4b1853a2b40c11d14de1f36 Mon Sep 17 00:00:00 2001
From: cli <377476583@qq.com>
Date: Fri, 11 Oct 2024 08:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Plugins/TcpServiceReceivedPlugin.cs       | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs b/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs
index cda19df..601c04f 100644
--- a/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs
+++ b/JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs
@@ -1,28 +1,16 @@
-using JiShe.CollectBus.Core.Exceptions;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using JiShe.CollectBus.Protocol.Contracts.Interfaces;
 using TouchSocket.Core;
 using TouchSocket.Sockets;
 
 namespace JiShe.CollectBus.Core.Plugins
 {
-    public class TcpServiceReceivedPlugin : PluginBase, ITcpReceivedPlugin, ITcpConnectingPlugin, ITcpConnectedPlugin, ITcpClosedPlugin
+    public class TcpServiceReceivedPlugin(IServiceProvider serviceProvider) : PluginBase, ITcpReceivedPlugin,
+        ITcpConnectingPlugin, ITcpConnectedPlugin, ITcpClosedPlugin
     {
-        private readonly IServiceProvider _serviceProvider;
-
-        public TcpServiceReceivedPlugin(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
         public async Task OnTcpReceived(ITcpSession client, ReceivedDataEventArgs e)
         {
-            //TODO:根据指令区别是376还是645协议
+            //TODO:电表： 376.1 645-07 modbus  水表： 118 645-97
 
             var protocolType = "TestProtocol";
             IProtocolPlugin? protocolPlugin;
@@ -35,7 +23,7 @@ namespace JiShe.CollectBus.Core.Plugins
                 //    //todo: 直接拿设备信息，根据设备信息使用不同的协议解析服务
                 //    break;
             }
-            protocolPlugin = _serviceProvider.GetKeyedService<IProtocolPlugin>(protocolType);
+            protocolPlugin = serviceProvider.GetKeyedService<IProtocolPlugin>(protocolType);
             client.Logger.Info($"{protocolPlugin?.Get().Name},{protocolPlugin?.Get().RegularExpression}");