From 00ebb2f69d673628aa58748b978dd1663d56fed0 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Tue, 8 Aug 2023 13:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=81=AF=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Mesnac.DoUtils/DoControl.cs          | 12 +++++++-----
 Mesnac.DoUtils/Mesnac.DoUtils.csproj |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Mesnac.DoUtils/DoControl.cs b/Mesnac.DoUtils/DoControl.cs
index 4e90369..e5b8f6c 100644
--- a/Mesnac.DoUtils/DoControl.cs
+++ b/Mesnac.DoUtils/DoControl.cs
@@ -13,7 +13,7 @@ namespace Mesnac.DoUtils
     /// <summary>
     /// 报警灯控制类
     /// </summary>
-    public class DoControl
+    public sealed class DoControl
     {
         public SerialPort serialPort = new SerialPort("COM5");
         private static readonly Lazy<DoControl> lazy = new Lazy<DoControl>(() => new DoControl());
@@ -136,12 +136,14 @@ namespace Mesnac.DoUtils
         /// <param name="dOOnOff">启停状态</param>
         public void DOControl(DOName dOName, DOOnOff dOOnOff)
         {
-            //ComOn();
-            if (!serialPort.IsOpen)
+            if (serialPort.IsOpen)
+            {
+                serialPort.Write(new byte[] { 0xE3, 0x01, 0x09, (byte)dOName, (byte)dOOnOff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0, 12);
+            }
+            else
             {
-                serialPort.Open();
+                ComOn();
             }
-            serialPort.Write(new byte[] { 0xE3, 0x01, 0x09, (byte)dOName, (byte)dOOnOff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0, 12);
         }
 
         /// <summary>
diff --git a/Mesnac.DoUtils/Mesnac.DoUtils.csproj b/Mesnac.DoUtils/Mesnac.DoUtils.csproj
index fae43aa..4806769 100644
--- a/Mesnac.DoUtils/Mesnac.DoUtils.csproj
+++ b/Mesnac.DoUtils/Mesnac.DoUtils.csproj
@@ -35,10 +35,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.Core">
-      <HintPath>Z:\Desktop\日常代码\榄菊项目\程序设计\lj_plc\PlugInPlatform\ICSharpCode.Core.dll</HintPath>
+      <HintPath>..\PlugInPlatform\ICSharpCode.Core.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.Data.Core">
-      <HintPath>Z:\Desktop\日常代码\榄菊项目\程序设计\lj_plc\PlugInPlatform\ICSharpCode.Data.Core.dll</HintPath>
+      <HintPath>..\PlugInPlatform\ICSharpCode.Data.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />