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

MainWindow页面去掉加载FingerprintUtil。login页面OnNavigatedTo去掉订阅指纹事件

This commit is contained in:
maqiao 2024-11-27 09:10:41 +08:00
parent 5dbf4f8e15
commit fd77a36296
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DM_Weight/ViewModels/LoginWindowViewModel.cs
View File

@ -446,8 +446,8 @@ _exitCommand ??= new DelegateCommand(Exit);
//接收导航传过来的参数 现在是在此处初始化了表格数据 //接收导航传过来的参数 现在是在此处初始化了表格数据
public void OnNavigatedTo(NavigationContext navigationContext) public void OnNavigatedTo(NavigationContext navigationContext)
{ {
FingerMsg = !_fingerprintUtil.bIsConnected; //FingerMsg = !_fingerprintUtil.bIsConnected;
_eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent); //_eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
} }

6
DM_Weight/ViewModels/MainWindowViewModel.cs
View File

@ -62,17 +62,17 @@ namespace DM_Weight.ViewModels
// this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2); // this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
// _screenUtil = screenUtil; // _screenUtil = screenUtil;
//} //}
private FingerprintUtil _fingerprintUtil; //private FingerprintUtil _fingerprintUtil;
IRegionManager _regionManager; IRegionManager _regionManager;
IUnityContainer _container; IUnityContainer _container;
//private CHKFunction _cHKFunction; //private CHKFunction _cHKFunction;
private readonly ILog logger = LogManager.GetLogger(typeof(PortUtil)); 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; //_portUtil = portUtil;
this.eventAggregator = eventAggregator; this.eventAggregator = eventAggregator;
this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2); this.eventAggregator.GetEvent<SnackbarEvent>().Subscribe(doMyPrismEvent2);
_fingerprintUtil = fingerprintUtil; //_fingerprintUtil = fingerprintUtil;
_regionManager = regionManager; _regionManager = regionManager;
_container = container; _container = container;
//_cHKFunction = cHKFunction; //_cHKFunction = cHKFunction;