From ed9491634c277891d4473c986f34510ae3d37ed0 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 26 Nov 2024 18:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E7=BA=B9=E6=9C=BA=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BC=80=E7=BA=BF=E7=A8=8B=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E5=8C=96=E3=80=82=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E4=B8=8D?=
 =?UTF-8?q?=E7=94=A8=E5=BC=80=E7=BA=BF=E7=A8=8B=E3=80=82=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=A2=E9=98=85=E4=BA=8B=E4=BB=B6=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0=E5=86=85=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C?=
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 | 8 +++++---
 2 files changed, 8 insertions(+), 6 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 37b9864..db7d239 100644
--- a/DM_Weight/ViewModels/LoginWindowViewModel.cs
+++ b/DM_Weight/ViewModels/LoginWindowViewModel.cs
@@ -115,13 +115,15 @@ 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;
             //_chkFunction= chcFunction;
             _regionManager = regionManager;
             _eventAggregator = eventAggregator;
+             FingerMsg = !_fingerprintUtil.bIsConnected;
+            _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
         }
         private DelegateCommand? _loginCommand;
 
@@ -446,7 +448,7 @@ _exitCommand ??= new DelegateCommand(Exit);
         //接收导航传过来的参数  现在是在此处初始化了表格数据
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
-            FingerMsg = false;// !_fingerprintUtil.bIsConnected;
+            FingerMsg = !_fingerprintUtil.bIsConnected;
             _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
         }