login页面添加”网口连接失败“提示
This commit is contained in:
parent
d05801a802
commit
6b1a640995
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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="温湿度串口连接失败" />
|
||||
|
|
Loading…
Reference in New Issue