更新dll

NDSD-Screwdriver/NDSD_Screwdriver.csproj

@@ -41,8 +41,8 @@
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="mscorlib" />
-    <Reference Include="NewLife.Core, Version=11.0.2024.826, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
+    <Reference Include="NewLife.Core, Version=11.0.2024.827, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
-      <HintPath>..\packages\NewLife.Core.11.0.2024.826-beta0719\lib\net461\NewLife.Core.dll</HintPath>
+      <HintPath>..\packages\NewLife.Core.11.0.2024.827-beta1512\lib\net461\NewLife.Core.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -125,6 +125,7 @@
     <Compile Include="Tool\ClientFactory.cs" />
     <Compile Include="Tool\DengTool.cs" />
     <Compile Include="Tool\MyFixedHeaderRequestInfo.cs" />
+    <Compile Include="Tool\QingTcpClient2.cs" />
     <Compile Include="Tool\SerialPortFactory1.cs" />
     <EmbeddedResource Include="FrmSetting.resx">
       <DependentUpon>FrmSetting.cs</DependentUpon>

NDSD-Screwdriver/Tool/QingTcpClient2.cs

@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+using NewLife.Log;
+using TouchSocket.Core;
+using TouchSocket.Sockets;
+
+namespace NDSD_Screwdriver.Tool
+{
+    public class QingTcpClient2
+    {
+        private int eable = -1;
+        TcpClient tcpClient = new TcpClient();
+        private Timer timer1 = null;
+        public QingTcpClient2(string str = "192.168.5.212:4545")
+        {
+            tcpClient.Connecting = (client, e) => EasyTask.CompletedTask;//即将连接到服务器，此时已经创建socket，但是还未建立tcp
+            tcpClient.Connected = (client, e) => EasyTask.CompletedTask;//成功连接到服务器
+            tcpClient.Setup(new TouchSocketConfig()
+                .SetRemoteIPHost(str)
+                .ConfigureContainer(a =>
+                {
+                    a.AddConsoleLogger();//添加一个日志注入
+                }));
+
+            tcpClient.Received = (client, e) =>
+            {
+                //从服务器收到信息。但是一般byteBlock和requestInfo会根据适配器呈现不同的值。
+                var mes = e.ByteBlock.Span.ToString(Encoding.ASCII);
+
+                var sb= Sub(mes);
+
+                switch (sb)
+                {
+                    case "0002":
+                        switch (eable)
+                        {
+                            case 1:
+                                client.Send("00200043            \0");
+                                break;
+                            case 0:
+                                client.Send("00200042            \0");
+                                break;
+                        }
+                        eable = -1;
+                        break;
+                    case "0043":
+                        client.Send("00300064001         0000000000\0");
+                        break;
+                }
+
+                XTrace.WriteLine($"客户端接收到信息：{mes}");
+                return EasyTask.CompletedTask;
+
+            };
+
+            tcpClient.Connect();
+
+
+
+            timer1 = new Timer();
+            timer1.Enabled = true;
+            timer1.Elapsed += timer1_Tick;
+            timer1.Interval = 500; //设置时间间隔（毫秒为单位）单位Ms
+            timer1.Start();
+
+        }
+
+
+
+        private string Sub(string str)
+        {
+            string mes = "";
+            var length = str.TrimStart().Length;
+            if (length>= 9)
+            {
+                mes= str.Substring(5, 4);
+            }
+
+            if (mes == "0005" && length >= 24) 
+            {
+                mes = str.Substring(21, 4);
+            }
+
+            return mes;
+        }
+
+        private void timer1_Tick(object sender, EventArgs e)
+        {
+            tcpClient.Send("00209999            \0");
+        }
+
+
+        public void Begin()
+        {
+            tcpClient.Send("00200001            \0");
+        }
+
+        public void Enable()
+        {
+            eable = 1;
+
+        }
+
+        public void Close()
+        {
+            eable = 0;
+        }
+
+
+        public void Satus()
+        {
+            tcpClient.Send("00300064001         0000000000\0");
+        }
+
+    }
+}

NDSD-Screwdriver/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Chloe" version="5.30.0" targetFramework="net48" />
   <package id="Chloe.SQLite" version="5.30.0" targetFramework="net48" />
-  <package id="NewLife.Core" version="11.0.2024.826-beta0719" targetFramework="net48" />
+  <package id="NewLife.Core" version="11.0.2024.827-beta1512" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.IO.Ports" version="9.0.0-preview.7.24405.7" targetFramework="net48" />

NDSD-TouchSocket/NDSD_TouchSocket.csproj

@@ -33,8 +33,8 @@
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="mscorlib" />
-    <Reference Include="NewLife.Core, Version=11.0.2024.826, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
+    <Reference Include="NewLife.Core, Version=11.0.2024.827, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
-      <HintPath>..\packages\NewLife.Core.11.0.2024.826-beta0719\lib\net461\NewLife.Core.dll</HintPath>
+      <HintPath>..\packages\NewLife.Core.11.0.2024.827-beta1512\lib\net461\NewLife.Core.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\NDSD-Screwdriver\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

NDSD-TouchSocket/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NewLife.Core" version="11.0.2024.826-beta0719" targetFramework="net48" />
+  <package id="NewLife.Core" version="11.0.2024.827-beta1512" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.IO.Ports" version="9.0.0-preview.7.24405.7" targetFramework="net48" />