From ea476590da735a649fd936404de13fb15ba8d110 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Fri, 24 Jan 2025 08:46:21 +0800
Subject: [PATCH] =?UTF-8?q?105040=20Update=20=E5=A2=9E=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/CableLectotypeUserControl.xaml.cs    | 15 ++++++++--
 .../View/Dialog/NotSavedWarningWindow.xaml    |  6 ++--
 .../View/LectotypeWindow.xaml.cs              | 29 ++++++++++---------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml.cs
index 894413b..e84022d 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/CableLectotypeUserControl.xaml.cs
@@ -21,6 +21,7 @@ using static Sinvo.EplanHpD.Plugin.WPFUI.Utils.LectotypeManager;
 using System.Linq;
 using EPLAN.Harness.ProjectCore.Occurrences;
 using Sinvo.EplanHpD.Plugin.WPFUI.Extension;
+using Sinvo.EplanHpD.Plugin.Service.Model;
 
 namespace Sinvo.EplanHpD.Plugin.WPFUI.View
 {
@@ -95,11 +96,12 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
             //var motor = Motor as MotorModel;
             if(Motor is CableLectotypeViewModel motor)
             {
-                WeakReferenceMessenger.Default.Send<LectotypeMessage>(new LectotypeMessage
+                WeakReferenceMessenger.Default.Send<LectotypeMessage,string>(new LectotypeMessage
                 (new System.Collections.Generic.Dictionary<string, string>
                 {
                     {motor.Motor.MotorModelStr,motor.Motor.AxisNo}
-                }));
+                }), "Lectotype"
+                ); 
             }
         }
 
@@ -131,6 +133,15 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
             {
                 if (ViewModel.SaveToDb())
                 {
+                    if (Motor is CableLectotypeViewModel motor)
+                    {
+                        WeakReferenceMessenger.Default.Send(new LectotypeMessage
+                        (new System.Collections.Generic.Dictionary<string, string>
+                        {
+                            {motor.Motor.MotorModelStr,motor.Motor.AxisNo}
+                        }), "LectotypeSaved"
+                        );
+                    }
                     Growl.Success("保存成功", "CableLectotypeMessage");
                 }
                 else
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/Dialog/NotSavedWarningWindow.xaml b/Sinvo.EplanHpD.Plugin.WPFUI/View/Dialog/NotSavedWarningWindow.xaml
index 34f3ec1..f49d2b1 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/Dialog/NotSavedWarningWindow.xaml
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/Dialog/NotSavedWarningWindow.xaml
@@ -43,11 +43,13 @@
                 <Button
                     Width="100"
                     Click="btnOK_Click"
-                    Content="是" />
+                    Content="是"
+                    Style="{StaticResource ButtonDanger}" />
                 <Button
                     Width="100"
                     Click="btnCancel_Click"
-                    Content="否" />
+                    Content="否"
+                    Style="{StaticResource ButtonInfo}" />
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
index 332e3ab..c47e648 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
@@ -45,6 +45,10 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
             this.DataContext = ViewModel = new LectotypeViewModel(docId);
             Application.Current.SetMainWindow(this);
 
+            RegisterEvent();
+        }
+        public void RegisterEvent()
+        {
             WeakReferenceMessenger.Default.Register<CommonMessage>("RowDetailsVisibility", (sender, message) =>
             {
                 if (System.Enum.IsDefined(typeof(DataGridRowDetailsVisibilityMode), message.Value))
@@ -60,23 +64,29 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
                     DrawPDFDrawer.IsOpen = true;
                 }
             });
-            WeakReferenceMessenger.Default.Register<LectotypeMessage>("Lectotype", (sender, message) =>
+            WeakReferenceMessenger.Default.Register<LectotypeMessage,string>("Lectotype", "Lectotype", (sender, message) =>
             {
                 if (message.Value != null)
                 {
                     ViewModel.AddNotSavedLectotype(message.Value);
                 }
             });
-            WeakReferenceMessenger.Default.Register<LectotypeMessage>("LectotypeSaved", (sender, message) =>
+            WeakReferenceMessenger.Default.Register<LectotypeMessage,string>("LectotypeSaved", "LectotypeSaved", (sender, message) =>
             {
-                if(message.Value != null)
+                if (message.Value != null)
                 {
                     ViewModel.RemoveNotSavedLectotype(message.Value);
                 }
             });
             Growl.Register("CableLectotypeMessage", GrowlParent);
         }
-
+        public void UnRegisterEvent()
+        {
+            WeakReferenceMessenger.Default.Unregister<CommonMessage>("RowDetailsVisibility");
+            WeakReferenceMessenger.Default.Unregister<OpenDrawMessage>("OpenDraw");
+            WeakReferenceMessenger.Default.Unregister<LectotypeMessage>("Lectotype");
+            WeakReferenceMessenger.Default.Unregister<LectotypeMessage>("LectotypeSaved");
+        }
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             try
@@ -197,16 +207,9 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
         private void Window_Closed(object sender, System.EventArgs e)
         {
             //DrawPDFHelper.ClearCache();
-            
-            WeakReferenceMessenger.Default.Unregister<CommonMessage>("RowDetailsVisibility");
-            WeakReferenceMessenger.Default.Unregister<OpenDrawMessage>("OpenDraw");
-            WeakReferenceMessenger.Default.Unregister<LectotypeMessage>("Lectotype");
-            WeakReferenceMessenger.Default.Unregister<LectotypeMessage>("LectotypeSaved");
-
+            UnRegisterEvent();
             MotorExcelHelper.Instance.CloseStream();
-        }
-
-
+        } 
         private void ViewDrawingButton_Click(object sender, RoutedEventArgs e)
         {
             if (sender is Button btn && btn.Tag != null)