From 984343d84b48d489f88131e94991d425af1c8126 Mon Sep 17 00:00:00 2001
From: Luc Vandenbroucke <lvandenb@sckcen.be>
Date: Wed, 28 Apr 2021 10:33:02 +0200
Subject: [PATCH] badge robuster

---
 eDosStation/EntryBadge.xaml.cs | 22 ++++++++++++++++------
 eDosStation/eDosStation.csproj |  8 ++++----
 eDosStation/packages.config    |  2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 077232f..e7b79b7 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -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)));
+            }
         }
     }
 }
diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj
index dfb0806..72ef211 100644
--- a/eDosStation/eDosStation.csproj
+++ b/eDosStation/eDosStation.csproj
@@ -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>
\ No newline at end of file
diff --git a/eDosStation/packages.config b/eDosStation/packages.config
index fbea87e..7bb63f9 100644
--- a/eDosStation/packages.config
+++ b/eDosStation/packages.config
@@ -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" />