From ea4ad17ad2a09946bd13a59089e9e6ec6ed4f72c Mon Sep 17 00:00:00 2001 From: lihanbo Date: Mon, 20 Jan 2025 17:06:08 +0800 Subject: [PATCH] =?UTF-8?q?105040=20Update=20=E7=A7=BB=E9=99=A4=E4=B8=8B?= =?UTF-8?q?=E6=A0=87=E5=8F=98=E5=8C=96=E4=BA=8B=E4=BB=B6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E8=A7=A6=E5=8F=91=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/ScannerWindow.xaml.cs | 12 +----------- .../ViewModel/ScannerViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml.cs index a880ca2..3e95005 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/ScannerWindow.xaml.cs @@ -49,8 +49,6 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View InitializeComponent(); _viewModel = new ScannerViewModel(); this.DataContext = _viewModel; - - } private void TopMostWindow_Checked(object sender, RoutedEventArgs e) @@ -100,17 +98,9 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View _viewModel.GetCurrentDoc(); _viewModel.GetAllCables(); - ScannerInfo scannerInfo = new ScannerInfo(_viewModel); + ScannerInfo scannerInfo = new(_viewModel); this.Closing += scannerInfo.ScannerInfoClosed; scannerInfo.Show(); - WeakReferenceMessenger.Default.Register(sender, "ScanedIndexChanged", (r, m) => - { - Dispatcher.BeginInvoke(new Action(() => - { - CableList.ScrollIntoView(CableList.SelectedItem); - })); - } - ); } private void Button_Click(object sender, RoutedEventArgs e) diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs index 9f623ce..efadec8 100644 --- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs +++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/ScannerViewModel.cs @@ -45,7 +45,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel { _scanedIndex = value; OnPropertyChanged(nameof(ScanedIndex)); - WeakReferenceMessenger.Default.Send(new CommonMessage(value), "ScanedIndexChanged"); + //WeakReferenceMessenger.Default.Send(new CommonMessage(value), "ScanedIndexChanged"); } } private string _inputCode;