From 6b02c0fa68dd84e178a23e9292d9a3e34ee0f8b9 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Fri, 28 Mar 2025 16:47:05 +0800
Subject: [PATCH] =?UTF-8?q?105040=20Update=20=E5=A2=9E=E5=8A=A0=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs         | 14 +++++++++++---
 Sinvo.EplanHpD.Plugin/PluginEntry.cs               | 12 ++++++++----
 Sinvo.EplanHpD.Plugin/ScanPluginEntry.cs           |  9 ++++++---
 Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj |  4 ++++
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs b/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs
index c6ca5d5..5da1882 100644
--- a/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs
+++ b/Sinvo.EplanHpD.Plugin/DesignPluginEntry.cs
@@ -1,6 +1,7 @@
 using EPLAN.Harness.API;
 using EPLAN.Harness.API.Plugins.Core;
 using EPLAN.Harness.AppCore;
+using Sinvo.EplanHpD.Plugin.DynaClient;
 using Sinvo.EplanHpD.Plugin.Service;
 using Sinvo.EplanHpD.Plugin.WPFUI;
 using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
@@ -85,9 +86,16 @@ namespace Sinvo.EplanHpD.Plugin
 
         public void Initialize()
         {
-            AppDomainDllLoader.SetLaoder();
-            ApplicationExt.InitApplication();
-            Consts.InitConfigs();
+            if (!AppDomainDllLoader.isLoaded)
+            {
+                AppDomainDllLoader.SetLaoder();
+                ApplicationExt.InitApplication();
+                Consts.InitConfigs();
+#if DEBUG
+                var client = new DynaServerClient();
+                client.Login("105040", "blank", "ADMINISTRATOR", "ADMINISTRATOR", "EPLAN");
+#endif
+            }
         }
 
 
diff --git a/Sinvo.EplanHpD.Plugin/PluginEntry.cs b/Sinvo.EplanHpD.Plugin/PluginEntry.cs
index 2a0e0d0..c159494 100644
--- a/Sinvo.EplanHpD.Plugin/PluginEntry.cs
+++ b/Sinvo.EplanHpD.Plugin/PluginEntry.cs
@@ -3,6 +3,7 @@ using EPLAN.Harness.API.Plugins;
 using EPLAN.Harness.API.Plugins.Core;
 using EPLAN.Harness.Core.Controls;
 using EPLAN.Harness.ProjectCore;
+using Sinvo.EplanHpD.Plugin.DynaClient; 
 using Sinvo.EplanHpD.Plugin.WPFUI;
 using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
 using Sinvo.EplanHpD.Plugin.WPFUI.Utils;
@@ -147,10 +148,13 @@ namespace Sinvo.EplanHpD.Plugin
 
         public void Initialize()
         {
-            //throw new NotImplementedException();
-            AppDomainDllLoader.SetLaoder();
-            ApplicationExt.InitApplication();
-            Consts.InitConfigs();
+            if (!AppDomainDllLoader.isLoaded)
+            { 
+                //throw new NotImplementedException();
+                AppDomainDllLoader.SetLaoder();
+                ApplicationExt.InitApplication();
+                Consts.InitConfigs();
+            }
         }
 
         public void Terminate()
diff --git a/Sinvo.EplanHpD.Plugin/ScanPluginEntry.cs b/Sinvo.EplanHpD.Plugin/ScanPluginEntry.cs
index 383b700..3caffa9 100644
--- a/Sinvo.EplanHpD.Plugin/ScanPluginEntry.cs
+++ b/Sinvo.EplanHpD.Plugin/ScanPluginEntry.cs
@@ -80,9 +80,12 @@ namespace Sinvo.EplanHpD.Plugin
 
         public void Initialize()
         {
-            AppDomainDllLoader.SetLaoder();
-            ApplicationExt.InitApplication();
-            Consts.InitConfigs();
+            if (!AppDomainDllLoader.isLoaded)
+            {
+                AppDomainDllLoader.SetLaoder();
+                ApplicationExt.InitApplication();
+                Consts.InitConfigs();
+            }
         }
 
         public void Terminate()
diff --git a/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj b/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj
index 82971c9..a802982 100644
--- a/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj
+++ b/Sinvo.EplanHpD.Plugin/Sinvo.EplanHpD.Plugin.csproj
@@ -217,6 +217,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Sinvo.EplanHpD.Plugin.DynaClient\Sinvo.EplanHpD.Plugin.DynaClient.csproj">
+      <Project>{E87593A3-CA93-4563-AFF6-B10413C18E64}</Project>
+      <Name>Sinvo.EplanHpD.Plugin.DynaClient</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Sinvo.EplanHpD.Plugin.Service\Sinvo.EplanHpD.Plugin.Service.csproj">
       <Project>{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}</Project>
       <Name>Sinvo.EplanHpD.Plugin.Service</Name>