From 5dbf4f8e15f528d6e6d3c94ed0504b33e3944c3c Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 26 Nov 2024 18:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=8C=87=E7=BA=B9=E6=9C=BA?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BC=80=E7=BA=BF=E7=A8=8B=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E3=80=82=E6=8C=87=E7=BA=B9=E6=9C=BA=E6=B3=A8=E5=86=8C=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=A7=BB=E5=88=B0=E7=99=BB=E5=BD=95=E6=9E=84=E9=80=A0?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Finger/FingerprintUtil.cs          |  6 +++---
 DM_Weight/ViewModels/LoginWindowViewModel.cs | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/DM_Weight/Finger/FingerprintUtil.cs b/DM_Weight/Finger/FingerprintUtil.cs
index 0aae4d8..349ff39 100644
--- a/DM_Weight/Finger/FingerprintUtil.cs
+++ b/DM_Weight/Finger/FingerprintUtil.cs
@@ -32,10 +32,10 @@ namespace DM_Weight.Finger
         {
             _eventAggregator = eventAggregator;
             logger.Info($"进入构造器，开始连接指纹机");
-            Task.Run(() =>
-           {
+           // Task.Run(() =>
+           //{
                ConnectionMain();
-           });
+           //});
         }
 
         public void ConnectionMain()
diff --git a/DM_Weight/ViewModels/LoginWindowViewModel.cs b/DM_Weight/ViewModels/LoginWindowViewModel.cs
index 44f6087..3a293f4 100644
--- a/DM_Weight/ViewModels/LoginWindowViewModel.cs
+++ b/DM_Weight/ViewModels/LoginWindowViewModel.cs
@@ -114,12 +114,14 @@ namespace DM_Weight.ViewModels
         //    _regionManager = regionManager;
         //    _eventAggregator = eventAggregator;
         //}
-        public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil)
+        public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil, FingerprintUtil fingerprintUtil)
         {
-            //_fingerprintUtil = fingerprintUtil;
+            _fingerprintUtil = fingerprintUtil;
             _portUtil = portUtil;
             _regionManager = regionManager;
-            _eventAggregator = eventAggregator;
+            _eventAggregator = eventAggregator; 
+            FingerMsg = !_fingerprintUtil.bIsConnected;
+            _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
         }
         private DelegateCommand? _loginCommand;
 
@@ -444,7 +446,7 @@ _exitCommand ??= new DelegateCommand(Exit);
         //接收导航传过来的参数  现在是在此处初始化了表格数据
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
-            FingerMsg = false;// !_fingerprintUtil.bIsConnected;
+            FingerMsg =  !_fingerprintUtil.bIsConnected;
             _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
         }