Commit 3a63a7b5 authored by 姜春辉's avatar 姜春辉

增加北洋通道无卡离开/进入提示

parent a1d7a62d
......@@ -55,6 +55,20 @@ namespace GS.Terminal.Identification.Enterprise.Logic
#endif
if (string.IsNullOrEmpty(cardNum)) return;
//通道机 无卡闯入 0000000000000000
if (cardNum == "0000000000000000")
{
ViewModel.ShowError = true;
ViewModel.ErrorText = $"无卡{(cardMsg.OperaDeviceData.Tag == "I" ? "进入" : "离开")}";
return;
}
else
{
ViewModel.ShowError = false;
ViewModel.ErrorText = "";
}
try
{
ViewModel.IsStandby = false;
......
......@@ -8,7 +8,7 @@
<add key="UpdateUrl" value="http://192.168.1.210/Soft/update" />
<add key="ServerIP" value="192.168.1.210" />
<add key="tCode" value="D1" />
<add key="WebPath" value="http://192.168.1.210/" />
<add key="WebPath" value="http://192.168.1.150:666/" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<system.web>
......
......@@ -19,6 +19,8 @@ namespace IdentificationViewModels
{
ActiveHuman = new Human { IsCard = false, IsVisitor = false };
IsStandby = true;
ShowError = false;
ErrorText = "";
}
#endregion
......@@ -29,6 +31,9 @@ namespace IdentificationViewModels
private string _Footer;
private int _AutoResetTime;
private bool _IsStandby = true;
private string _VersionString = "-";
private bool _ShowError;
private string _ErrorText;
#endregion
#region 属性
......@@ -96,7 +101,7 @@ namespace IdentificationViewModels
set { _tCode = value; RaisePropertyChanged("tCode"); }
}
private string _VersionString = "-";
public string VersionString
{
......@@ -104,6 +109,23 @@ namespace IdentificationViewModels
set { _VersionString = value; RaisePropertyChanged("VersionString"); }
}
public bool ShowError
{
get { return _ShowError; }
set { _ShowError = value; RaisePropertyChanged("ShowError"); }
}
public string ErrorText
{
get { return _ErrorText; }
set { _ErrorText = value; RaisePropertyChanged("ErrorText"); }
}
#endregion
}
......
......@@ -112,6 +112,12 @@
</StackPanel>
</Grid>
</Border>
<Border Visibility="{Binding ShowError, Converter={StaticResource BooleanToVisibilityConverter}}"
Grid.Row="1" Width="881" Margin="84,0,84,31"
CornerRadius="25" BorderThickness="2"
Background="#FF0000" BorderBrush="#4Cffffff">
<TextBlock Text="{Binding ErrorText}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="64" Foreground="white"/>
</Border>
</Grid>
</Border>
<!--Main 下-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment