diff --git a/RFiDGear/DataAccessLayer/Local/CustomConverter.cs b/RFiDGear/DataAccessLayer/Local/CustomConverter.cs index 77b396d..da6acf4 100644 --- a/RFiDGear/DataAccessLayer/Local/CustomConverter.cs +++ b/RFiDGear/DataAccessLayer/Local/CustomConverter.cs @@ -352,7 +352,7 @@ public static IEnumerable GenerateStringSequence(int n1, int n2) { while (n1 <= n2) { - yield return n1++.ToString(); + yield return n1++.ToString(CultureInfo.CurrentCulture); } } diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/DatabaseReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/DatabaseReaderWriter.cs index dd26bed..f087fb7 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromFile/DatabaseReaderWriter.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromFile/DatabaseReaderWriter.cs @@ -70,7 +70,7 @@ public DatabaseReaderWriter() foreach(string file in Directory.GetFiles(appDataPath)) { FileInfo fi = new FileInfo(file); - if (fi.Extension.ToLower().Contains("rfprj")) + if (fi.Extension.ToLower(CultureInfo.CurrentCulture).Contains("rfprj")) { fi.Delete(); } diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs index 05673b3..84eab00 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromFile/SettingsReaderWriter.cs @@ -4,6 +4,7 @@ using Log4CSharp; using System; +using System.Globalization; using System.IO; using System.Reflection; using System.Text; @@ -101,7 +102,7 @@ public SettingsReaderWriter() doc.DocumentElement.AppendChild(PayLoadElem); doc.DocumentElement.AppendChild(InfoTextElem); - CheckIntervalElem.InnerText = _updateInterval.ToString(); + CheckIntervalElem.InnerText = _updateInterval.ToString(CultureInfo.CurrentCulture); RemoteConfigUriElem.InnerText = _updateURL; SecurityTokenElem.InnerText = _securityToken; BaseUriElem.InnerText = _baseUri; diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs index f300d12..f0cb4f1 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs @@ -122,24 +122,29 @@ public override ERROR WriteMifareClassicSingleBlock(int _blockNumber, string _aK return WriteMifareClassicSingleSector( CustomConverter.GetSectorNumberFromChipBasedDataBlockNumber(_blockNumber), _aKey, _bKey, buffer); } + public override ERROR ReadMifareClassicSingleSector(int sectorNumber, string aKey, string bKey) { return readWriteAccessOnClassicSector(sectorNumber, aKey, bKey, null); } + public override ERROR WriteMifareClassicSingleSector(int sectorNumber, string aKey, string bKey, byte[] buffer) { return readWriteAccessOnClassicSector(sectorNumber, aKey, bKey, buffer); } + public override ERROR WriteMifareClassicWithMAD(int _madApplicationID, int _madStartSector, string _aKeyToUse, string _bKeyToUse, string _aKeyToWrite, string _bKeyToWrite, - string _madAKeyToUse, string _madBKeyToUse, string _madAKeyToWrite, string _madBKeyToWrite, - byte[] buffer, byte _madGPB, SectorAccessBits _sab, bool _useMADToAuth = false, bool _keyToWriteUseMAD = false) + string _madAKeyToUse, string _madBKeyToUse, string _madAKeyToWrite, + string _madBKeyToWrite, byte[] buffer, byte _madGPB, SectorAccessBits _sab, + bool _useMADToAuth, bool _keyToWriteUseMAD) { throw new NotImplementedException(); } + public override ERROR ReadMifareClassicWithMAD(int madApplicationID, string _aKeyToUse, string _bKeyToUse, string _madAKeyToUse, string _madBKeyToUse, int _length, byte _madGPB, - bool _useMADToAuth = true, bool _aiToUseIsMAD = false) + bool _useMADToAuth, bool _aiToUseIsMAD) { throw new NotImplementedException(); } @@ -239,6 +244,7 @@ public override ERROR GetMiFareDESFireChipAppIDs(string _appMasterKey, DESFireKe return ERROR.NoError; } + public override ERROR CreateMifareDesfireFile(string _appMasterKey, DESFireKeyType _keyTypeAppMasterKey, FileType_MifareDesfireFileType _fileType, DESFireAccessRights _accessRights, EncryptionMode _encMode, int _appID, int _fileNo, int _fileSize, int _minValue = 0, int _maxValue = 1000, int _initValue = 0, bool _isValueLimited = false, @@ -246,6 +252,7 @@ public override ERROR CreateMifareDesfireFile(string _appMasterKey, DESFireKeyTy { throw new NotImplementedException(); } + public override ERROR ReadMiFareDESFireChipFile(string _appMasterKey, DESFireKeyType _keyTypeAppMasterKey, string _appReadKey, DESFireKeyType _keyTypeAppReadKey, int _readKeyNo, string _appWriteKey, DESFireKeyType _keyTypeAppWriteKey, int _writeKeyNo, @@ -254,6 +261,7 @@ public override ERROR ReadMiFareDESFireChipFile(string _appMasterKey, DESFireKey { throw new NotImplementedException(); } + public override ERROR WriteMiFareDESFireChipFile(string _cardMasterKey, DESFireKeyType _keyTypeCardMasterKey, string _appMasterKey, DESFireKeyType _keyTypeAppMasterKey, string _appReadKey, DESFireKeyType _keyTypeAppReadKey, int _readKeyNo, diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/LibLogicalAccessProvider.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/LibLogicalAccessProvider.cs index 8ad8416..4a2bd7c 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromIO/LibLogicalAccessProvider.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromIO/LibLogicalAccessProvider.cs @@ -1746,7 +1746,6 @@ public override ERROR ChangeMifareDesfireApplicationKey( }; CustomConverter.FormatMifareDesfireKeyStringWithSpacesEachByte(_applicationMasterKeyTarget); applicationMasterKeyTarget.Value = CustomConverter.DesfireKeyToCheck; - //applicationMasterKeyTarget.KeyVersion = applicationMasterKeyTarget.KeyVersion = 1; if (readerUnit.ConnectToReader()) { diff --git a/RFiDGear/Properties/AssemblyInfo.cs b/RFiDGear/Properties/AssemblyInfo.cs index d54d89c..8e228ec 100644 --- a/RFiDGear/Properties/AssemblyInfo.cs +++ b/RFiDGear/Properties/AssemblyInfo.cs @@ -1,3 +1,4 @@ +using System.Resources; #region Using directives using System; using System.Reflection; @@ -12,7 +13,7 @@ [assembly: AssemblyConfiguration("x86")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("RFiDGear")] -[assembly: AssemblyCopyright("Copyright 2016")] +[assembly: AssemblyCopyright("Copyright 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] // This sets the default COM visibility of types in the assembly to invisible. @@ -24,5 +25,6 @@ // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.1.*")] [assembly: Guid("a34bc413-e349-4fd1-8b90-2eb95a333436")] +[assembly: NeutralResourcesLanguage("en")] diff --git a/RFiDGear/RFiDGear.csproj b/RFiDGear/RFiDGear.csproj index 3451d1a..fec7cf7 100644 --- a/RFiDGear/RFiDGear.csproj +++ b/RFiDGear/RFiDGear.csproj @@ -26,6 +26,7 @@ Resources\logo.ico + false publish\ true Disk @@ -37,8 +38,7 @@ false true 0 - 1.0.0.%2a - false + 1.1.0.%2a false true diff --git a/RFiDGear/RFiDGear.csproj.user b/RFiDGear/RFiDGear.csproj.user index b5a0c5e..9480e51 100644 --- a/RFiDGear/RFiDGear.csproj.user +++ b/RFiDGear/RFiDGear.csproj.user @@ -5,7 +5,7 @@ D:\Seafile\Dokumente Privat\Steven\Projekte\Software\Windows\RFIDGear\RFiDGear\bin\Debug\ - + publish\ diff --git a/RFiDGear/View/AboutView.xaml b/RFiDGear/View/AboutView.xaml index 2cc884b..bfe049d 100644 --- a/RFiDGear/View/AboutView.xaml +++ b/RFiDGear/View/AboutView.xaml @@ -8,8 +8,9 @@ xmlns:v="clr-namespace:RFiDGear.View" Title="{Binding Caption}" Width="300" - Height="400" + ResizeMode="NoResize" + SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen"> @@ -17,8 +18,9 @@ - - + + + @@ -28,7 +30,7 @@ + + + Changelog + + + + Source="/Resources/splash.png" Margin="0.4,27,0,26.2" />