Smart card reader detection embedded inside try { ... } catch( ), ver. 2.18.895
This commit is contained in:
@@ -100,33 +100,45 @@ namespace TBF.Forms
|
||||
smartCardReader = null; /// null = No smart card reader detected
|
||||
|
||||
#if TURA_IPERL || TURA_SPECIAL
|
||||
card = new CardNative();
|
||||
cardReaders = card.ListReaders();
|
||||
foreach (var crd in cardReaders)
|
||||
try
|
||||
{
|
||||
if (crd.Contains("NFC"))
|
||||
card = new CardNative();
|
||||
|
||||
/// Find NFC smart card reader
|
||||
cardReaders = card.ListReaders();
|
||||
foreach (var crd in cardReaders)
|
||||
{
|
||||
smartCardReader = crd; /// NFC smart card reader detected
|
||||
if (crd.Contains("NFC"))
|
||||
{
|
||||
smartCardReader = crd; /// NFC smart card reader detected
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(smartCardReader))
|
||||
{
|
||||
/// Reader found, initialize NFC smart card reader
|
||||
|
||||
card.OnCardInserted += delegate(object sndr, CardInsertedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardInsertedEventArgs>(OnCardInserted), sndr, args); }
|
||||
else OnCardInserted(sndr, args);
|
||||
};
|
||||
|
||||
card.OnCardRemoved += delegate(object sndr, CardRemovedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardRemovedEventArgs>(OnCardRemoved), sndr, args); }
|
||||
else OnCardRemoved(sndr, args);
|
||||
};
|
||||
|
||||
card.StartCardEvents(smartCardReader);
|
||||
|
||||
Text += " (NFC)";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(smartCardReader))
|
||||
catch (Exception)
|
||||
{
|
||||
card.OnCardInserted += delegate(object sndr, CardInsertedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardInsertedEventArgs>(OnCardInserted), sndr, args); }
|
||||
else OnCardInserted(sndr, args);
|
||||
};
|
||||
|
||||
card.OnCardRemoved += delegate(object sndr, CardRemovedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardRemovedEventArgs>(OnCardRemoved), sndr, args); }
|
||||
else OnCardRemoved(sndr, args);
|
||||
};
|
||||
|
||||
card.StartCardEvents(smartCardReader);
|
||||
smartCardReader = null;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
[assembly: AssemblyVersion("2.18.894.0")]
|
||||
[assembly: AssemblyFileVersion("2.18.894.0")]
|
||||
[assembly: AssemblyVersion("2.18.895.0")]
|
||||
[assembly: AssemblyFileVersion("2.18.895.0")]
|
||||
|
||||
@@ -57,36 +57,47 @@ namespace Users.Forms
|
||||
smartCardReader = null; /// null = No smart card reader detected
|
||||
|
||||
#if TURA_IPERL || TURA_SPECIAL
|
||||
card = new CardNative();
|
||||
cardReaders = card.ListReaders();
|
||||
foreach (var crd in cardReaders)
|
||||
try
|
||||
{
|
||||
if (crd.Contains("NFC"))
|
||||
card = new CardNative();
|
||||
|
||||
/// Find NFC smart card reader
|
||||
cardReaders = card.ListReaders();
|
||||
foreach (var crd in cardReaders)
|
||||
{
|
||||
smartCardReader = crd; /// NFC smart card reader detected
|
||||
if (crd.Contains("NFC"))
|
||||
{
|
||||
smartCardReader = crd; /// NFC smart card reader detected
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(smartCardReader))
|
||||
{
|
||||
/// Reader found, initialize NFC smart card reader
|
||||
|
||||
card.OnCardInserted += delegate(object sndr, CardInsertedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardInsertedEventArgs>(OnCardInserted), sndr, args); }
|
||||
else OnCardInserted(sndr, args);
|
||||
};
|
||||
|
||||
card.OnCardRemoved += delegate(object sndr, CardRemovedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardRemovedEventArgs>(OnCardRemoved), sndr, args); }
|
||||
else OnCardRemoved(sndr, args);
|
||||
};
|
||||
|
||||
card.StartCardEvents(smartCardReader);
|
||||
|
||||
Text += " (NFC)";
|
||||
break;
|
||||
txtTag.Enabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(smartCardReader))
|
||||
catch (Exception)
|
||||
{
|
||||
card.OnCardInserted += delegate(object sndr, CardInsertedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardInsertedEventArgs>(OnCardInserted), sndr, args); }
|
||||
else OnCardInserted(sndr, args);
|
||||
};
|
||||
|
||||
card.OnCardRemoved += delegate(object sndr, CardRemovedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardRemovedEventArgs>(OnCardRemoved), sndr, args); }
|
||||
else OnCardRemoved(sndr, args);
|
||||
};
|
||||
|
||||
card.StartCardEvents(smartCardReader);
|
||||
smartCardReader = null;
|
||||
}
|
||||
|
||||
txtTag.Enabled = true;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
+33
-21
@@ -88,33 +88,45 @@ namespace Users.Forms
|
||||
smartCardReader = null; /// null = No smart card reader detected
|
||||
|
||||
#if TURA_IPERL || TURA_SPECIAL
|
||||
card = new CardNative();
|
||||
cardReaders = card.ListReaders();
|
||||
foreach (var crd in cardReaders)
|
||||
try
|
||||
{
|
||||
if (crd.Contains("NFC"))
|
||||
card = new CardNative();
|
||||
|
||||
/// Find NFC smart card reader
|
||||
cardReaders = card.ListReaders();
|
||||
foreach (var crd in cardReaders)
|
||||
{
|
||||
smartCardReader = crd; /// NFC smart card reader detected
|
||||
if (crd.Contains("NFC"))
|
||||
{
|
||||
smartCardReader = crd; /// NFC smart card reader detected
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(smartCardReader))
|
||||
{
|
||||
/// Reader found, initialize NFC smart card reader
|
||||
|
||||
card.OnCardInserted += delegate(object sndr, CardInsertedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardInsertedEventArgs>(OnCardInserted), sndr, args); }
|
||||
else OnCardInserted(sndr, args);
|
||||
};
|
||||
|
||||
card.OnCardRemoved += delegate(object sndr, CardRemovedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardRemovedEventArgs>(OnCardRemoved), sndr, args); }
|
||||
else OnCardRemoved(sndr, args);
|
||||
};
|
||||
|
||||
card.StartCardEvents(smartCardReader);
|
||||
|
||||
Text += " (NFC)";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(smartCardReader))
|
||||
catch (Exception)
|
||||
{
|
||||
card.OnCardInserted += delegate(object sndr, CardInsertedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardInsertedEventArgs>(OnCardInserted), sndr, args); }
|
||||
else OnCardInserted(sndr, args);
|
||||
};
|
||||
|
||||
card.OnCardRemoved += delegate(object sndr, CardRemovedEventArgs args)
|
||||
{
|
||||
if (InvokeRequired) { Invoke(new EventHandler<CardRemovedEventArgs>(OnCardRemoved), sndr, args); }
|
||||
else OnCardRemoved(sndr, args);
|
||||
};
|
||||
|
||||
card.StartCardEvents(smartCardReader);
|
||||
smartCardReader = null;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("2.18.893.0")]
|
||||
[assembly: AssemblyFileVersion("2.18.893.0")]
|
||||
[assembly: AssemblyVersion("2.18.895.0")]
|
||||
[assembly: AssemblyFileVersion("2.18.895.0")]
|
||||
|
||||
Reference in New Issue
Block a user