luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

badge robuster

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-04-28 10:33:02 +02:00
parent 42698d510a
commit 984343d84b
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eDosStation/EntryBadge.xaml.cs
View file

@ -379,10 +379,10 @@ namespace eDosStation
}
public void showBadge(int persID, string csn)
{
CSN.Text = csn;
Site.Text = string.Empty;
Code.Text = persID.ToString();
Dispatcher.Invoke(CheckBadge);
CSN.Text = csn;
Site.Text = string.Empty;
Code.Text = persID.ToString();
Dispatcher.Invoke(CheckBadge);
}
public void endPage()
@ -581,7 +581,8 @@ namespace eDosStation
dfReader.SetReader(thisStation.Reader);
dfReader.Badged += DFReader_Badged;
dfReader.BadgeTO += DfReader_BadgeTO;
ReaderTask = dfReader.Wait(PageTimeout);
dfReader.BadgeError += DfReader_BadgeError;
ReaderTask = dfReader.Wait(PageTimeout,10);
//dfReader.WaitForBadge();
}
else
@ -600,6 +601,11 @@ namespace eDosStation
}
private void DfReader_BadgeError(LSWDesfirePublic.CCard Sender, LSWDesfirePublic.BadgeErrorEventArgs e)
{
endPage();
}
private void LeesCancel_Click(object sender, RoutedEventArgs e)
{
endPage();
@ -612,7 +618,11 @@ namespace eDosStation
private void DFReader_Badged(LSWDesfirePublic.CCard Sender, LSWDesfirePublic.BadgeEventArgs e)
{
this.Dispatcher.Invoke(new Action(() => showBadge(e.PersID,e.UID)));
if (e.PersID > 0)
{
Sender.WaitEnd();
this.Dispatcher.Invoke(new Action(() => showBadge(e.PersID, e.UID)));
}
}
}
}

8
eDosStation/eDosStation.csproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props" Condition="Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props')" />
<Import Project="..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props" Condition="Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -300,11 +300,11 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.props'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /sha1 857150b64ef7d3e679c8cbde425d2a0b5e58ffaa /fd sha256 /d "Integrity &amp; Authenticity" /tr "http://timestamp.digicert.com" $(TargetPath)</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets')" />
<Import Project="..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.3.3\build\LSWDesfirePublic.targets')" />
</Project>

2
eDosStation/packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LSWDesfirePublic" version="1.3.0" targetFramework="net48" />
<package id="LSWDesfirePublic" version="1.3.3" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net472" developmentDependency="true" />
<package id="SharpDX" version="4.2.0" targetFramework="net48" />
<package id="SharpDX.D3DCompiler" version="4.2.0" targetFramework="net48" />