From 54f4c75834a9315d527e650126dd9be2de2b8fa2 Mon Sep 17 00:00:00 2001
From: SoulStar <gxhsoulstar@163.com>
Date: Wed, 25 Dec 2024 15:56:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20-=20=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HighWayIot.Plc/HighWayIot.Plc.csproj         |  7 ++---
 HighWayIot.Plc/PlcConnect.cs                 | 33 +++++++++-----------
 HighWayIot.Plc/packages.config               |  5 +++
 HighWayIot.Winform/App.config                | 14 ++++++++-
 HighWayIot.Winform/HighWayIot.Winform.csproj |  5 ---
 5 files changed, 36 insertions(+), 28 deletions(-)
 create mode 100644 HighWayIot.Plc/packages.config

diff --git a/HighWayIot.Plc/HighWayIot.Plc.csproj b/HighWayIot.Plc/HighWayIot.Plc.csproj
index 0dcc92f..dd306dc 100644
--- a/HighWayIot.Plc/HighWayIot.Plc.csproj
+++ b/HighWayIot.Plc/HighWayIot.Plc.csproj
@@ -32,10 +32,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HslCommunication, Version=12.1.3.0, Culture=neutral, PublicKeyToken=3d72ad3b6b5ec0e3, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\HighWayIot.Library\HslCommunication.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -63,5 +59,8 @@
   <ItemGroup>
     <Folder Include="Impl\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/HighWayIot.Plc/PlcConnect.cs b/HighWayIot.Plc/PlcConnect.cs
index 7c71b05..46ddacf 100644
--- a/HighWayIot.Plc/PlcConnect.cs
+++ b/HighWayIot.Plc/PlcConnect.cs
@@ -37,11 +37,7 @@ namespace HighWayIot.Plc
                     IsPersistentConnection = true,
                 };
                 var a = plc.ConnectServer();
-                logHelper.Info($"Plc连接 信息：[{a.Message}] 是否成功：[{a.IsSuccess.ToString()}]   错误代码：[{a.ErrorCode}]");
-                if (!reslt.IsSuccess)
-                {
-                    logHelper.Info("链接失败:"+reslt.Message);
-                }
+                logHelper.Info($"Plc连接 信息：[{a.Message}] 是否成功：[{a.IsSuccess.ToString()}] 错误代码：[{a.ErrorCode}]");
             }
             catch (Exception ex)
             {
@@ -54,22 +50,23 @@ namespace HighWayIot.Plc
             return plc;
         }
 
-        ///// <summary>
-        ///// plc 是不是保持链接
-        ///// </summary>
-        //public static bool IsConnect
-        //{
-        //    get
-        //    {
-        //        if (MelsecInstance == null) return false;
-        //        var result = MelsecInstance.ReadPlcType();
-        //        logHelper.Info($"PLC型号：{result.Content}");
-        //        return result.IsSuccess;
-        //    }
-        //}
+        /// <summary>
+        /// plc 是不是保持链接
+        /// </summary>
+        public static bool IsConnect
+        {
+            get
+            {
+                if (MelsecInstance == null) return false;
+                var result = MelsecInstance.ReadPlcType();
+                logHelper.Info($"PLC型号 信息:[{result.Message}] 内容:[{result.Message}]");
+                return result.IsSuccess;
+            }
+        }
 
         public static int Test()
         {
+            var s = IsConnect;
             return MelsecInstance.ReadInt16("D1").Content;
         }
 
diff --git a/HighWayIot.Plc/packages.config b/HighWayIot.Plc/packages.config
new file mode 100644
index 0000000..277ca52
--- /dev/null
+++ b/HighWayIot.Plc/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="HslCommunication" version="12.1.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/HighWayIot.Winform/App.config b/HighWayIot.Winform/App.config
index 193aecc..98452d4 100644
--- a/HighWayIot.Winform/App.config
+++ b/HighWayIot.Winform/App.config
@@ -1,6 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.122.21.1" newVersion="4.122.21.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/HighWayIot.Winform/HighWayIot.Winform.csproj b/HighWayIot.Winform/HighWayIot.Winform.csproj
index f042a9b..309ccc6 100644
--- a/HighWayIot.Winform/HighWayIot.Winform.csproj
+++ b/HighWayIot.Winform/HighWayIot.Winform.csproj
@@ -312,10 +312,5 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="HslCommunication">
-      <Version>12.1.3</Version>
-    </PackageReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file