From 679b1a42ff88f61c5b620ca26ca2216cd67c78a5 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 29 Nov 2024 09:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E7=BA=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=B8=8D=E5=90=8C=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Finger/FingerprintUtil.cs          | 21 ++++++++++----------
 DM_Weight/ViewModels/LoginWindowViewModel.cs |  4 ++--
 DM_Weight/msg/LoginOutEvent.cs               | 13 ++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 DM_Weight/msg/LoginOutEvent.cs

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<FingerprintEvent>().Subscribe(LoginEvent);
+            //FingerMsg = !_fingerprintUtil.bIsConnected;
+            //_eventAggregator.GetEvent<FingerprintEvent>().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
+    {
+    }
+}