diff --git a/DM_Weight/Finger/FingerprintUtil.cs b/DM_Weight/Finger/FingerprintUtil.cs index 6388b71..0c7c66e 100644 --- a/DM_Weight/Finger/FingerprintUtil.cs +++ b/DM_Weight/Finger/FingerprintUtil.cs @@ -1,4 +1,5 @@ -using log4net; + +using log4net; using log4net.Repository.Hierarchy; using Microsoft.Data.SqlClient.Server; using Newtonsoft.Json; @@ -20,22 +21,22 @@ namespace DM_Weight.Finger { private readonly ILog logger = LogManager.GetLogger(typeof(FingerprintUtil)); - public zkemkeeper.CZKEMClass axCZKEM1;// = new zkemkeeper.CZKEMClass(); + public zkemkeeper.CZKEMClass axCZKEM1; //= new zkemkeeper.CZKEMClass(); public bool bIsConnected = false; - private string fingerIp = ConfigurationManager.AppSettings["fingerIp"]?.ToString() ?? ""; + private string fingerIp = ConfigurationManager.AppSettings["fingerIp"].ToString(); private int fingerPort = 4370; - private int machineNumber = Convert.ToInt32(ConfigurationManager.AppSettings["machineNumber"]?.ToString() ?? "0"); - private int machineType = Convert.ToInt32(ConfigurationManager.AppSettings["machineType"]?.ToString() ?? "0"); + private int machineNumber = Convert.ToInt32(ConfigurationManager.AppSettings["machineNumber"].ToString()); + private int machineType = Convert.ToInt32(ConfigurationManager.AppSettings["machineType"].ToString()); private readonly IEventAggregator _eventAggregator; public FingerprintUtil(IEventAggregator eventAggregator) { _eventAggregator = eventAggregator; logger.Info($"进入构造器,开始连接指纹机"); - // Task.Factory.StartNew(() => - //{ - ConnectionMain(); - //}); + // Task.Run(() => + //{ + ConnectionMain(); + //}); } public void ConnectionMain() @@ -179,4 +180,4 @@ namespace DM_Weight.Finger } -} +} \ No newline at end of file diff --git a/DM_Weight/ViewModels/LoginWindowViewModel.cs b/DM_Weight/ViewModels/LoginWindowViewModel.cs index 6a4310c..2ed9559 100644 --- a/DM_Weight/ViewModels/LoginWindowViewModel.cs +++ b/DM_Weight/ViewModels/LoginWindowViewModel.cs @@ -446,8 +446,8 @@ _exitCommand ??= new DelegateCommand(Exit); //接收导航传过来的参数 现在是在此处初始化了表格数据 public void OnNavigatedTo(NavigationContext navigationContext) { - FingerMsg = !_fingerprintUtil.bIsConnected; - _eventAggregator.GetEvent().Subscribe(LoginEvent); + //FingerMsg = !_fingerprintUtil.bIsConnected; + //_eventAggregator.GetEvent().Subscribe(LoginEvent); } diff --git a/DM_Weight/msg/LoginOutEvent.cs b/DM_Weight/msg/LoginOutEvent.cs new file mode 100644 index 0000000..1828caa --- /dev/null +++ b/DM_Weight/msg/LoginOutEvent.cs @@ -0,0 +1,13 @@ +using Prism.Events; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DM_Weight.msg +{ + public class LoginOutEvent : PubSubEvent + { + } +}