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);
}
+ ///
+ /// 网口连接标识
+ ///
+ 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().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 @@
+