From fd77a3629679194f77721566d35ad5b2e9c5e353 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 27 Nov 2024 09:10:41 +0800
Subject: [PATCH] =?UTF-8?q?MainWindow=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BDFingerprintUtil=E3=80=82login=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2OnNavigatedTo=E5=8E=BB=E6=8E=89=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E6=8C=87=E7=BA=B9=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/LoginWindowViewModel.cs | 4 ++--
 DM_Weight/ViewModels/MainWindowViewModel.cs  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DM_Weight/ViewModels/LoginWindowViewModel.cs b/DM_Weight/ViewModels/LoginWindowViewModel.cs
index 3a293f4..e588253 100644
--- a/DM_Weight/ViewModels/LoginWindowViewModel.cs
+++ b/DM_Weight/ViewModels/LoginWindowViewModel.cs
@@ -446,8 +446,8 @@ _exitCommand ??= new DelegateCommand(Exit);
         //接收导航传过来的参数  现在是在此处初始化了表格数据
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
-            FingerMsg =  !_fingerprintUtil.bIsConnected;
-            _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
+            //FingerMsg =  !_fingerprintUtil.bIsConnected;
+            //_eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
         }
 
 
diff --git a/DM_Weight/ViewModels/MainWindowViewModel.cs b/DM_Weight/ViewModels/MainWindowViewModel.cs
index 007258f..173a791 100644
--- a/DM_Weight/ViewModels/MainWindowViewModel.cs
+++ b/DM_Weight/ViewModels/MainWindowViewModel.cs
@@ -62,17 +62,17 @@ namespace DM_Weight.ViewModels
         //    this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
         //    _screenUtil = screenUtil;
         //}
-        private FingerprintUtil _fingerprintUtil;
+        //private FingerprintUtil _fingerprintUtil;
         IRegionManager _regionManager;
         IUnityContainer _container;
         //private CHKFunction _cHKFunction;
         private readonly ILog logger = LogManager.GetLogger(typeof(PortUtil));
-        public MainWindowViewModel(IRegionManager regionManager, IUnityContainer container, IEventAggregator eventAggregator, FingerprintUtil fingerprintUtil)
+        public MainWindowViewModel(IRegionManager regionManager, IUnityContainer container, IEventAggregator eventAggregator)
         {
             //_portUtil = portUtil;
             this.eventAggregator = eventAggregator;
             this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
-            _fingerprintUtil = fingerprintUtil;
+            //_fingerprintUtil = fingerprintUtil;
             _regionManager = regionManager;
             _container = container;
             //_cHKFunction = cHKFunction;