fix

ConsoleApplication/ConsoleApplication.csproj

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
+            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{D090275D-5272-4408-A97F-96DA24D568A4}</ProjectGuid>
+        <OutputType>Exe</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>ConsoleApplication</RootNamespace>
+        <AssemblyName>ConsoleApplication</AssemblyName>
+        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+        <FileAlignment>512</FileAlignment>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>bin\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <DebugType>pdbonly</DebugType>
+        <Optimize>true</Optimize>
+        <OutputPath>bin\Release\</OutputPath>
+        <DefineConstants>TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+    </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="Newtonsoft.Json">
+          <HintPath>C:\Program Files\IIS\Microsoft Web Deploy V3\Newtonsoft.Json.dll</HintPath>
+        </Reference>
+        <Reference Include="System"/>
+        <Reference Include="System.Core"/>
+        <Reference Include="System.Data"/>
+        <Reference Include="System.Net.Http" />
+        <Reference Include="System.Xml"/>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Include="Program.cs"/>
+        <Compile Include="Properties\AssemblyInfo.cs"/>
+    </ItemGroup>
+    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
+    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+         Other similar extension points exist, see Microsoft.Common.targets.
+    <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+    </Target>
+    -->
+
+</Project>

ConsoleApplication/Program.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+
+namespace ConsoleApplication
+{
+    internal class Program
+    {
+        
+        static string GetTimestamp()
+        {
+            long milliseconds = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+            return milliseconds.ToString();
+        }
+
+        static string GenerateMD5(string input)
+        {
+            using (MD5 md5 = MD5.Create())
+            {
+                byte[] inputBytes = Encoding.UTF8.GetBytes(input);
+                byte[] hashBytes = md5.ComputeHash(inputBytes);
+                StringBuilder sb = new StringBuilder();
+
+                for (int i = 0; i < hashBytes.Length; i++)
+                {
+                    sb.Append(hashBytes[i].ToString("x2"));
+                }
+
+                return sb.ToString();
+            }
+        }
+        
+        public static void Main(string[] args)
+        {
+            //创建 HttpClient 实例
+            using (HttpClient client = new HttpClient())
+            {
+                // 设置请求的基础地址
+                client.BaseAddress = new Uri("http://IP/jd/services/sendReceiveCollectionBag");
+                string timeStamp = GetTimestamp();
+                // 设置请求头
+                client.DefaultRequestHeaders.Accept.Clear();
+                client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                client.DefaultRequestHeaders.Add("JD-MachineCode", "channel-machine-test-rk-001");
+                client.DefaultRequestHeaders.Add("JD-Timestamp", timeStamp);
+                client.DefaultRequestHeaders.Add("JD-Signature", GenerateMD5("channel-machine-test-rk-001" + timeStamp + "08F68F890E91838CE6C5D08347F17F58"));
+
+                object parameters = new object();
+                
+                var jsonContent = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(parameters), Encoding.UTF8, "application/json");
+
+                // 选择请求方式
+                HttpResponseMessage response;
+                try
+                {
+                    // 发送 POST 请求
+                    response =  client.PostAsync("/api/endpoint", jsonContent).GetAwaiter().GetResult();
+
+                    // 处理响应
+                    if (response.IsSuccessStatusCode)
+                    {
+                        string responseData =  response.Content.ReadAsStringAsync().GetAwaiter().GetResult();;
+                        Console.WriteLine("Response: " + responseData);
+                    }
+                    else
+                    {
+                        Console.WriteLine("Error: " + response.ReasonPhrase);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("Exception: " + e.Message);
+                }
+            } 
+            
+            
+            Thread.Sleep(-1);
+            
+        }
+    }
+}

ConsoleApplication/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ConsoleApplication")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ConsoleApplication")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("D090275D-5272-4408-A97F-96DA24D568A4")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DNSD_DB/DNSD_DB.csproj

@@ -36,14 +36,14 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Chloe, Version=5.25.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Chloe.5.25.0\lib\net46\Chloe.dll</HintPath>
+    <Reference Include="Chloe, Version=5.26.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Chloe.5.26.0\lib\net46\Chloe.dll</HintPath>
     </Reference>
     <Reference Include="Chloe.Extension, Version=5.25.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Chloe.Extension.5.25.0\lib\net46\Chloe.Extension.dll</HintPath>
     </Reference>
-    <Reference Include="Chloe.SQLite, Version=5.25.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Chloe.SQLite.5.25.0\lib\net46\Chloe.SQLite.dll</HintPath>
+    <Reference Include="Chloe.SQLite, Version=5.26.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Chloe.SQLite.5.26.0\lib\net46\Chloe.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -64,5 +64,8 @@
     <Compile Include="SqlLiteTool.cs" />
     <Compile Include="Student.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

DNSD_DB/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Chloe" version="5.26.0" targetFramework="net48" />
+  <package id="Chloe.SQLite" version="5.26.0" targetFramework="net48" />
+</packages>

NDSD-Screwdriver/App.config

@@ -21,6 +21,10 @@
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Chloe" publicKeyToken="null" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.26.0.0" newVersion="5.26.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

NDSD-Screwdriver/FrmSetting.Designer.cs

@@ -29,12 +29,13 @@
         private void InitializeComponent()
         {
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.btnSave = new System.Windows.Forms.Button();
             this.RfidNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Green = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Yellow = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Red = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btnSave = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.groupBox1.SuspendLayout();
             this.SuspendLayout();
@@ -55,26 +56,6 @@
             this.dataGridView1.Size = new System.Drawing.Size(693, 788);
             this.dataGridView1.TabIndex = 0;
             // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.dataGridView1);
-            this.groupBox1.Location = new System.Drawing.Point(27, 32);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(699, 815);
-            this.groupBox1.TabIndex = 1;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "报警灯设置";
-            // 
-            // btnSave
-            // 
-            this.btnSave.Location = new System.Drawing.Point(30, 904);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(183, 90);
-            this.btnSave.TabIndex = 2;
-            this.btnSave.Text = "保存报警灯";
-            this.btnSave.UseVisualStyleBackColor = true;
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
-            // 
             // RfidNo
             // 
             this.RfidNo.DataPropertyName = "RfidNo";
@@ -115,11 +96,42 @@
             this.Red.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.Red.Width = 80;
             // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.dataGridView1);
+            this.groupBox1.Location = new System.Drawing.Point(27, 32);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(699, 815);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "报警灯设置";
+            // 
+            // btnSave
+            // 
+            this.btnSave.Location = new System.Drawing.Point(30, 904);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(183, 90);
+            this.btnSave.TabIndex = 2;
+            this.btnSave.Text = "保存报警灯";
+            this.btnSave.UseVisualStyleBackColor = true;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(932, 768);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(183, 90);
+            this.button1.TabIndex = 3;
+            this.button1.Text = "保存报警灯";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
             // FrmSetting
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(2021, 1124);
+            this.Controls.Add(this.button1);
             this.Controls.Add(this.btnSave);
             this.Controls.Add(this.groupBox1);
             this.Name = "FrmSetting";
@@ -139,5 +151,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Green;
         private System.Windows.Forms.DataGridViewTextBoxColumn Yellow;
         private System.Windows.Forms.DataGridViewTextBoxColumn Red;
+        private System.Windows.Forms.Button button1;
     }
 }

NDSD-Screwdriver/FrmSetting.cs

@@ -14,6 +14,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using NDSD_TouchSocket;
+using NewLife;
+using TouchSocket.Core;
 
 namespace NDSD_Screwdriver
 {
@@ -22,8 +25,16 @@ namespace NDSD_Screwdriver
         public FrmSetting()
         {
             InitializeComponent();
+
+
+            var body = "00 03 08 E0 04 01 50 B8 C1 39 3A".ToHex();
+
+            var ssss = CRC16.ToModbus(body).ToHex(" ");
+
             SqlLiteTool.CreateTable(AppTool.GetDb());
             Init();
+            
+            SerialPortClientFactory.Init();
         }
 
 
@@ -34,8 +45,7 @@ namespace NDSD_Screwdriver
             dataGridView1.AutoGenerateColumns = false;
             var ctx = SqlLiteTool.GetDb(AppTool.GetDb());
             var list=  ctx.Query<RfidSetting>().Where(x => x.IsEnable == true).ToList();
-
-          //  dataGridView1.DataSource = list;//DataGridView的行可以添加删除（只有允许添加行、删除行）
+            
             dataGridView1.DataSource = new BindingList<RfidSetting>(list);//DataGridView的行可以添加删除（只有允许添加行、删除行）
             dataGridView1.AllowUserToAddRows = true;
           
@@ -185,5 +195,11 @@ namespace NDSD_Screwdriver
             int b = 16;
             return x >= a && x <= b;
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            byte [] bytes=new byte[]{0x00,0x03,0x00,0x1C,0x00,0x04,0x84,0x1E};
+            SerialPortClientFactory.Send(bytes);
+        }
     }
 }

NDSD-Screwdriver/NDSD_Screwdriver.csproj

@@ -33,26 +33,47 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Chloe, Version=5.25.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Chloe.5.25.0\lib\net46\Chloe.dll</HintPath>
+    <Reference Include="Chloe, Version=5.26.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Chloe.5.26.0\lib\net46\Chloe.dll</HintPath>
     </Reference>
-    <Reference Include="Chloe.SQLite, Version=5.25.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Chloe.SQLite.5.25.0\lib\net46\Chloe.SQLite.dll</HintPath>
+    <Reference Include="Chloe.SQLite, Version=5.26.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Chloe.SQLite.5.26.0\lib\net46\Chloe.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="mscorlib" />
     <Reference Include="NewLife.Core, Version=10.10.2024.803, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
       <HintPath>..\packages\NewLife.Core.10.10.2024.803\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>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SQLite">
       <HintPath>..\Dll\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Ports, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Ports.8.0.0\lib\net462\System.IO.Ports.dll</HintPath>
+    </Reference>
     <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
@@ -66,6 +87,12 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="TouchSocket, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5f39d7da98dac6a9, processorArchitecture=MSIL">
+      <HintPath>..\packages\TouchSocket.2.1.0-rc.10\lib\net472\TouchSocket.dll</HintPath>
+    </Reference>
+    <Reference Include="TouchSocket.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=d6c415a2f58eda72, processorArchitecture=MSIL">
+      <HintPath>..\packages\TouchSocket.Core.2.1.0-rc.10\lib\net472\TouchSocket.Core.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AppTool.cs" />
@@ -139,6 +166,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ndsd.db" />
+    <Content Include="read.json" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -146,5 +174,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.10\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

NDSD-Screwdriver/packages.config

@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Chloe" version="5.25.0" targetFramework="net48" />
-  <package id="Chloe.SQLite" version="5.25.0" targetFramework="net48" />
+  <package id="Chloe" version="5.26.0" targetFramework="net48" />
+  <package id="Chloe.SQLite" version="5.26.0" targetFramework="net48" />
   <package id="NewLife.Core" version="10.10.2024.803" 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="8.0.0" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
+  <package id="TouchSocket" version="2.1.0-rc.10" targetFramework="net48" />
+  <package id="TouchSocket.Core" version="2.1.0-rc.10" targetFramework="net48" />
 </packages>

NDSD-TouchSocket/NDSD_TouchSocket.csproj

@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="NewLife.Core, Version=10.10.2024.803, Culture=neutral, PublicKeyToken=8343210f0b524456, processorArchitecture=MSIL">
+      <HintPath>..\packages\NewLife.Core.10.10.2024.803\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>
     </Reference>
@@ -39,6 +43,11 @@
       <HintPath>..\NDSD-Screwdriver\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Ports, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Ports.8.0.0\lib\net462\System.IO.Ports.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\NDSD-Screwdriver\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
@@ -47,11 +56,16 @@
       <HintPath>..\NDSD-Screwdriver\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\NDSD-Screwdriver\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\NDSD-Screwdriver\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -59,10 +73,10 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="TouchSocket, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5f39d7da98dac6a9, processorArchitecture=MSIL">
-      <HintPath>..\packages\TouchSocket.2.1.0-rc.9\lib\net472\TouchSocket.dll</HintPath>
+      <HintPath>..\packages\TouchSocket.2.1.0-rc.10\lib\net472\TouchSocket.dll</HintPath>
     </Reference>
     <Reference Include="TouchSocket.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=d6c415a2f58eda72, processorArchitecture=MSIL">
-      <HintPath>..\packages\TouchSocket.Core.2.1.0-rc.9\lib\net472\TouchSocket.Core.dll</HintPath>
+      <HintPath>..\packages\TouchSocket.Core.2.1.0-rc.10\lib\net472\TouchSocket.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -77,7 +91,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.9\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
+    <Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.10\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

NDSD-TouchSocket/SerialPortClient.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using NewLife;
-using TouchSocket.Core;
-using TouchSocket.SerialPorts;
-using TouchSocket.Sockets;
-
-namespace NDSD_TouchSocket
-{
-    public class SerialPortClientFactory
-    {
-         static SerialPortClient client = new SerialPortClient();
-
-         public static void Send(string str)
-         {
-             client.Send(str);
-         }
-         
-         
-         public static void Send(ReadOnlyMemory<byte> memory)
-         {
-             client.Send(memory);
-         }
-         
-        public static void Init()
-        {
-            
-            client.Connecting = (client, e) => { return EasyTask.CompletedTask; };//即将连接到端口
-            client.Connected = (client, e) => { return EasyTask.CompletedTask; };//成功连接到端口
-            client.Received =  (c, e) =>
-            {
-                var mes = e.ByteBlock.Span.ToArray();
-                byte[] subArray = null;
-                if (mes.Length == 12)
-                {
-                    var i = mes[1].ToInt();
-                    subArray = new byte[i];
-                    Array.Copy(mes, 1, subArray, 3, i);
-                }
-
-                if (mes.Length == 13)
-                {
-                    var i = mes[2].ToInt();
-                    subArray = new byte[i];
-                    Array.Copy(mes, 2, subArray, 2, i);
-                }
-
-                if (subArray != null)
-                {
-                    string message = subArray.ToHex(" ");
-                }
-                
-                return Task.CompletedTask;
-                
-            };
-
-            client.Setup(new TouchSocket.Core.TouchSocketConfig()
-                .SetSerialPortOption(new SerialPortOption()
-                {
-                    BaudRate = 9600,//波特率
-                    DataBits = 8,//数据位
-                    Parity = System.IO.Ports.Parity.None,//校验位
-                    PortName = "COM13",//COM
-                    StopBits = System.IO.Ports.StopBits.One//停止位
-                }));
-
-            client.Connect();
-            Console.WriteLine("连接成功");
-        }
-    }
-}

NDSD-TouchSocket/Utils.cs

@@ -52,6 +52,8 @@ namespace NDSD_TouchSocket
             }
             return builder.ToString().Trim();
         }
+
+      
     }
 
     public static class CRC16
@@ -129,5 +131,40 @@ namespace NDSD_TouchSocket
 
             return (uchCRCHi << 8) | uchCRCLo; // 返回校验值
         }
+        
+      
+        
+        /// <summary>
+        /// CRC16_Modbus效验
+        /// </summary>
+        /// <param name="byteData">要进行计算的字节数组</param>
+        /// <returns>计算后的数组</returns>
+        public static byte[] ToModbus(byte[] byteData)
+        {
+            byte[] CRC = new byte[2];
+
+            UInt16 wCrc = 0xFFFF;
+            for (int i = 0; i < byteData.Length; i++)
+            {
+                wCrc ^= Convert.ToUInt16(byteData[i]);
+                for (int j = 0; j < 8; j++)
+                {
+                    if ((wCrc & 0x0001) == 1)
+                    {
+                        wCrc >>= 1;
+                        wCrc ^= 0xA001;//异或多项式
+                    }
+                    else
+                    {
+                        wCrc >>= 1;
+                    }
+                }
+            }
+
+            CRC[1] = (byte)((wCrc & 0xFF00) >> 8);//高位在后
+            CRC[0] = (byte)(wCrc & 0x00FF);       //低位在前
+            return CRC;
+
+        }
     }
 }

NDSD-TouchSocket/packages.config

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="NewLife.Core" version="10.10.2024.803" 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="8.0.0" targetFramework="net48" />
   <package id="System.Memory" version="4.5.5" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
-  <package id="TouchSocket" version="2.1.0-rc.9" targetFramework="net48" />
-  <package id="TouchSocket.Core" version="2.1.0-rc.9" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
+  <package id="TouchSocket" version="2.1.0-rc.10" targetFramework="net48" />
+  <package id="TouchSocket.Core" version="2.1.0-rc.10" targetFramework="net48" />
 </packages>