From e462d2c145800cfe3662b9ce5cc5c6f6a55d68a2 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 8 Jul 2022 07:35:45 +0200 Subject: [PATCH] updating and splash test screen remove + updated itext librarys + removed "test" splash screen on "remove tasks" button + changed to .net 4.7 --- .../Remote/FromFile/ReportReaderWriter.cs | 1 - .../Remote/FromIO/RFiDDevice.cs | 5 ++ .../MifareDesfire/MifareDesfireChipModel.cs | 3 +- RFiDGear/RFiDGear.csproj | 47 ++++++++++--------- RFiDGear/ViewModel/MainWindowViewModel.cs | 17 ++++--- RFiDGear/app.config | 12 +++++ RFiDGear/packages.config | 8 ++-- 7 files changed, 59 insertions(+), 34 deletions(-) diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs index d6d33c6..5a998d8 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs @@ -103,7 +103,6 @@ public ObservableCollection GetReportFields() { PdfFormField _fieldValue = _form.Value; temp.Add(_form.Key); - } } diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs index 15bfbeb..17c7279 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs @@ -119,6 +119,8 @@ public RFiDDevice(ReaderTypes _readerType = ReaderTypes.None) readerDevice.ReadChipPublic(); } + + AppIDList = new uint[0]; } } catch (Exception e) @@ -187,6 +189,9 @@ public ERROR ReadChipPublic() //CardInfo = new CARD_INFO((CARD_TYPE)Enum.Parse(typeof(CARD_TYPE), card.Type), card.ChipIdentifier); //readerUnit.Disconnect(); GenericChip = new GenericChipModel(card.ChipIdentifier, (CARD_TYPE)Enum.Parse(typeof(CARD_TYPE), card.Type)); + //ISO15693Commands commands = card.Commands as ISO15693Commands; + //SystemInformation si = commands.GetSystemInformation(); + //var block=commands.ReadBlock(21, 4); return ERROR.NoError; } catch (Exception e) { diff --git a/RFiDGear/Model/MifareDesfire/MifareDesfireChipModel.cs b/RFiDGear/Model/MifareDesfire/MifareDesfireChipModel.cs index 95f899d..4c77b12 100644 --- a/RFiDGear/Model/MifareDesfire/MifareDesfireChipModel.cs +++ b/RFiDGear/Model/MifareDesfire/MifareDesfireChipModel.cs @@ -8,12 +8,13 @@ namespace RFiDGear.Model /// public class MifareDesfireChipModel : GenericChipModel { - private readonly List _appList = new List(); public List AppList { get { return _appList; } + set { _appList = value; } } + private List _appList; public MifareDesfireChipModel() { diff --git a/RFiDGear/RFiDGear.csproj b/RFiDGear/RFiDGear.csproj index bf31601..31ae045 100644 --- a/RFiDGear/RFiDGear.csproj +++ b/RFiDGear/RFiDGear.csproj @@ -56,8 +56,14 @@ Project - - ..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll + + ..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll + + + ..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll + + + ..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll ..\packages\CommonServiceLocator.2.0.6\lib\net47\CommonServiceLocator.dll @@ -74,33 +80,32 @@ ..\packages\Ionic.Zip-1.9.1.8.1.9.1.8\lib\Ionic.Zip.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.barcodes.dll - False + + ..\packages\itext7.7.1.17\lib\net45\itext.barcodes.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.forms.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.forms.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.io.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.io.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.kernel.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.kernel.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.layout.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.layout.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.pdfa.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.pdfa.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.sign.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.sign.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.styledxmlparser.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.styledxmlparser.dll - - ..\packages\itext7.7.1.14\lib\net40\itext.svg.dll + + ..\packages\itext7.7.1.17\lib\net45\itext.svg.dll 4.0 diff --git a/RFiDGear/ViewModel/MainWindowViewModel.cs b/RFiDGear/ViewModel/MainWindowViewModel.cs index a38e05d..973618d 100644 --- a/RFiDGear/ViewModel/MainWindowViewModel.cs +++ b/RFiDGear/ViewModel/MainWindowViewModel.cs @@ -954,12 +954,6 @@ private void OnNewResetTaskStatusCommand() private void OnNewRemoveAllTasksCommand() { taskHandler.TaskCollection.Clear(); - - Dialogs.Add(new SplashScreenViewModel() { - Caption = "test", - OnOk = (sender) => { sender.Close(); }, - - }); } /// @@ -1054,7 +1048,8 @@ private void OnNewWriteToChipOnceCommand(bool _runSelectedOnly = false) Task thread = new Task(() => { GenericChipModel GenericChip = new GenericChipModel("", CARD_TYPE.Unspecified); - MifareDesfireChipModel DesfireChip = new MifareDesfireChipModel("", CARD_TYPE.Unspecified); ; + MifareDesfireChipModel DesfireChip = new MifareDesfireChipModel("", CARD_TYPE.Unspecified); + MifareClassicChipModel ClassicChip = new MifareClassicChipModel("", CARD_TYPE.Unspecified); try { @@ -1073,6 +1068,14 @@ private void OnNewWriteToChipOnceCommand(bool _runSelectedOnly = false) if(GenericChip.CardType == CARD_TYPE.DESFireEV1 || GenericChip.CardType == CARD_TYPE.DESFireEV2) { DesfireChip = new MifareDesfireChipModel(GenericChip.UID, GenericChip.CardType); + DesfireChip.AppList = new List(); + if (device.AppIDList.Any()) + { + foreach (uint appID in device.AppIDList) + { + DesfireChip.AppList.Add(new MifareDesfireAppModel(appID)); + } + } device.GetMiFareDESFireChipAppIDs(); } } diff --git a/RFiDGear/app.config b/RFiDGear/app.config index 7382d6a..a100ba7 100644 --- a/RFiDGear/app.config +++ b/RFiDGear/app.config @@ -13,6 +13,18 @@ + + + + + + + + + + + + diff --git a/RFiDGear/packages.config b/RFiDGear/packages.config index 74ce46e..69bee90 100644 --- a/RFiDGear/packages.config +++ b/RFiDGear/packages.config @@ -1,12 +1,12 @@  - - + + - + - + \ No newline at end of file