maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

连接指纹机去掉开线程调用。指纹机注册事件移到登录构造函数内

This commit is contained in:
maqiao 2024-11-26 18:49:06 +08:00
parent 5e27e28a96
commit 5dbf4f8e15
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DM_Weight/Finger/FingerprintUtil.cs
View File

@ -32,10 +32,10 @@ namespace DM_Weight.Finger
{ {
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
logger.Info($"进入构造器，开始连接指纹机"); logger.Info($"进入构造器，开始连接指纹机");
Task.Run(() => // Task.Run(() =>
{ //{
ConnectionMain(); ConnectionMain();
}); //});
} }
public void ConnectionMain() public void ConnectionMain()

8
DM_Weight/ViewModels/LoginWindowViewModel.cs
View File

@ -114,12 +114,14 @@ namespace DM_Weight.ViewModels
// _regionManager = regionManager; // _regionManager = regionManager;
// _eventAggregator = eventAggregator; // _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; _portUtil = portUtil;
_regionManager = regionManager; _regionManager = regionManager;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
FingerMsg = !_fingerprintUtil.bIsConnected;
_eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
} }
private DelegateCommand? _loginCommand; private DelegateCommand? _loginCommand;
@ -444,7 +446,7 @@ _exitCommand ??= new DelegateCommand(Exit);
//接收导航传过来的参数 现在是在此处初始化了表格数据 //接收导航传过来的参数 现在是在此处初始化了表格数据
public void OnNavigatedTo(NavigationContext navigationContext) public void OnNavigatedTo(NavigationContext navigationContext)
{ {
FingerMsg = false;// !_fingerprintUtil.bIsConnected; FingerMsg = !_fingerprintUtil.bIsConnected;
_eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent); _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
} }