From b4b1b831c065837713685bb6bdb30647cd8faba7 Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Wed, 8 Jun 2022 10:49:19 +0200 Subject: [PATCH] FwUpdateBuilder: - improved speed for safe view. FinalCheckController: - Added radio key as string for debug --- Common/.shared/SharedAssemblyInfo.cs | 4 ++-- .../MeterProcessState/Controllers/FinalCheckController.cs | 5 +++++ .../Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache | 2 +- .../Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Common/.shared/SharedAssemblyInfo.cs b/Common/.shared/SharedAssemblyInfo.cs index d54b7d0d..0e17b658 100644 --- a/Common/.shared/SharedAssemblyInfo.cs +++ b/Common/.shared/SharedAssemblyInfo.cs @@ -14,5 +14,5 @@ using System.Reflection; //[assembly: AssemblyVersion("1.2.*.0")] -[assembly: AssemblyVersion("2.2.6.*")] -[assembly: AssemblyFileVersion("2.2.6.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.2.7.*")] +[assembly: AssemblyFileVersion("2.2.7.0")] \ No newline at end of file diff --git a/Common/Service/MeterProcessState/Controllers/FinalCheckController.cs b/Common/Service/MeterProcessState/Controllers/FinalCheckController.cs index b367bb8c..58d733b0 100644 --- a/Common/Service/MeterProcessState/Controllers/FinalCheckController.cs +++ b/Common/Service/MeterProcessState/Controllers/FinalCheckController.cs @@ -76,6 +76,11 @@ namespace Service.MeterProcessState.Controllers var radio = OrderRadioParameter.GetRadioPramas(PcbID, GlobalConfig.connectionString.Value, withPressure ? "p" : ""); if (radio != null) { + var builder = new StringBuilder(); + foreach (var t in radio.EncryptionKey) + { + builder.Append(t.ToString("x2")); + } return Request.CreateResponse(HttpStatusCode.OK, radio); } else diff --git a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache index 133b97f0..0028f628 100644 --- a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache +++ b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0d85a5b3a7561b41163c20e5dc7713bcd0d65555 +f64d563def603c89cafafa61a3219ba97e1e344c diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs index c2c6fbd7..48c9a7b2 100644 --- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs +++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs @@ -3096,6 +3096,9 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder /// /// - Initial. /// + /// + /// - Removed coloring of safes depending bon valid date as it slows down the program dramatically. + /// private void FillDataGridWithFwUpdateSafesInfos() { grpLanguageSelection.Enabled = false; @@ -3157,7 +3160,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder column.SortMode = DataGridViewColumnSortMode.Automatic; } - FwUpdateSafesInfosStyleSet(); + //TODO THW FwUpdateSafesInfosStyleSet(); } catch (Exception) {