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().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().Subscribe(LoginEvent); }