Merge branch 'master' of http://175.27.215.92:3000/wangsr/NDSD-RFIDLight

NDSD-Screwdriver/MainForm.cs

@@ -1,5 +1,7 @@
 using DNSD_DB;
 using NDSD_Screwdriver.Entity;
+using NDSD_Screwdriver.Tool;
+
 using NDSD_TouchSocket;
 using System;
 using System.Collections.Generic;
@@ -9,6 +11,7 @@ using System.Drawing;
 using System.Drawing.Text;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -55,6 +58,11 @@ namespace NDSD_Screwdriver
             "5555222233334444"
         };
 
+
+        SerialPortFactory serialPort;
+        
+        private CancellationTokenSource cancellationTokenSource;
+
         public MainForm()
         {
             InitializeComponent();
@@ -64,7 +72,24 @@ namespace NDSD_Screwdriver
                 MessageBox.Show("服务端打开失败！");
             }
 
+            serialPort=new SerialPortFactory();
+
+            StartLongRunningTask();
         }
+        
+        private void StartLongRunningTask()
+        {
+            cancellationTokenSource = new CancellationTokenSource();
+            Task.Run(() => 
+            {
+                while (!cancellationTokenSource.Token.IsCancellationRequested)
+                {
+                    // 这里是你的长期运行逻辑
+                    Thread.Sleep(1000); // 模拟一些长时间的工作
+                }
+            }, cancellationTokenSource.Token);
+        }
+        
 
         /// <summary>
         /// 打开DO测试
@@ -73,6 +98,9 @@ namespace NDSD_Screwdriver
         /// <param name="e"></param>
         private void DOTest_Click(object sender, EventArgs e)
         {
+
+           string str= serialPort.Read();
+
             ScrewdriverTest screwdriverTest = new ScrewdriverTest(server, DOperate);
             screwdriverTest.Show();
         }

NDSD-Screwdriver/NDSD_Screwdriver.csproj

@@ -39,6 +39,9 @@
     <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="log4net">
+      <HintPath>..\Dll\log4net.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">

NDSD-Screwdriver/Tool/SerialPortFactory.cs

@@ -20,13 +20,16 @@ namespace NDSD_Screwdriver.Tool
         public string Read()
         {
 
+
+          
+           
+
             if (!serialPortModbus.IsOpen)
             {
                 serialPortModbus.Open();
-                var b= reader.Connect(serialPortModbus, 2000, 0);
             }
-            
+
-           
+            var b = reader.Connect(serialPortModbus, 2000, 0);
             string str2 = "";
             ushort[] array6 = reader.ReadTagMemory(ref str2, 28, 4);