From 6b1a640995edbc48d474af773a6b3ab71ee9b79a Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 3 Jan 2025 17:55:31 +0800
Subject: [PATCH] =?UTF-8?q?login=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E2=80=9D=E7=BD=91=E5=8F=A3=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E2=80=9C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Port/SocketHelper.cs               |  3 ++-
 DM_Weight/ViewModels/LoginWindowViewModel.cs | 19 ++++++++++++++++---
 DM_Weight/Views/LoginWindow.xaml             |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/DM_Weight/Port/SocketHelper.cs b/DM_Weight/Port/SocketHelper.cs
index 9305e74..d1e0029 100644
--- a/DM_Weight/Port/SocketHelper.cs
+++ b/DM_Weight/Port/SocketHelper.cs
@@ -27,6 +27,7 @@ namespace DM_Weight.Port
         AsyncSocketConnector acceptor = new AsyncSocketConnector();
         IConnectFuture iConnectFuture;
         public bool OpenStatus=false;
+        public bool ConnectedStatus = false;
         //多线程退出标识
         public bool IsMultiThread = false;
         string ip = ConfigurationManager.AppSettings["modbusIp"].ToString();
@@ -110,7 +111,7 @@ namespace DM_Weight.Port
             {
                 i = 0;
             }
-
+            ConnectedStatus = iConnectFuture.Connected;
         }
 
         public void SendMessage(MyBaseMessage baseMessage)
diff --git a/DM_Weight/ViewModels/LoginWindowViewModel.cs b/DM_Weight/ViewModels/LoginWindowViewModel.cs
index ef2148f..b8fd421 100644
--- a/DM_Weight/ViewModels/LoginWindowViewModel.cs
+++ b/DM_Weight/ViewModels/LoginWindowViewModel.cs
@@ -40,6 +40,7 @@ namespace DM_Weight.ViewModels
 
         IRegionManager _regionManager;
         IEventAggregator _eventAggregator;
+        SocketHelper _socketHelper;
 
         private int loginMode = Convert.ToInt32(ConfigurationManager.AppSettings["loginMode"]?.ToString() ?? "1");
         private string firstLogin = ConfigurationManager.AppSettings["firstLogin"]?.ToString() ?? "operator";
@@ -90,6 +91,16 @@ namespace DM_Weight.ViewModels
             get => _fingerMsg;
             set => SetProperty(ref _fingerMsg, value);
         }
+        /// <summary>
+        /// 网口连接标识
+        /// </summary>
+        private bool _netMsg = false;
+
+        public bool NetMsg
+        {
+            get => _netMsg;
+            set => SetProperty(ref _netMsg, value);
+        }
         //public bool FridgePortMsg
         //{
         //    get => !_portUtil.fridgeSerial.IsOpen;
@@ -114,13 +125,15 @@ namespace DM_Weight.ViewModels
         //    _regionManager = regionManager;
         //    _eventAggregator = eventAggregator;
         //}
-        public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil,FingerprintUtil fingerprintUtil)
+        public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil,FingerprintUtil fingerprintUtil, SocketHelper socketHelper)
         {
             _fingerprintUtil = fingerprintUtil;
             _portUtil = portUtil;
             _regionManager = regionManager;
-            _eventAggregator = eventAggregator; 
-            //FingerMsg = !FingerprintUtil.bIsConnected;
+            _eventAggregator = eventAggregator;
+            _socketHelper = socketHelper;
+            FingerMsg = !_fingerprintUtil.bIsConnected;
+            NetMsg = !_socketHelper.ConnectedStatus;
             _eventAggregator.GetEvent<FingerprintEvent>().Subscribe(LoginEvent);
         }
         private DelegateCommand? _loginCommand;
diff --git a/DM_Weight/Views/LoginWindow.xaml b/DM_Weight/Views/LoginWindow.xaml
index ade724e..8ef7929 100644
--- a/DM_Weight/Views/LoginWindow.xaml
+++ b/DM_Weight/Views/LoginWindow.xaml
@@ -198,6 +198,7 @@
             <!--<TextBlock Visibility="{Binding DrawerPortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="抽屉串口连接失败" />
             <TextBlock Visibility="{Binding CanBusPortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="can总线串口连接失败" />-->
             <TextBlock Visibility="{Binding FingerMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="指纹机连接失败" />
+            <TextBlock Visibility="{Binding NetMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="网口连接失败" />
             <!--<TextBlock Visibility="{Binding HIKMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="录像机登录失败" />-->
             <!--<TextBlock Visibility="{Binding FridgePortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="冰箱串口连接失败" />-->
             <TextBlock Visibility="{Binding WSDPortMsg, Converter={StaticResource BooleanToVisibilityConverter}}" Text="温湿度串口连接失败" />