diff --git a/Common/.shared/SharedAssemblyInfo.cs b/Common/.shared/SharedAssemblyInfo.cs index 3e8af694..406978ab 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.6.4.*")] -[assembly: AssemblyFileVersion("2.6.4.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.6.5.*")] +[assembly: AssemblyFileVersion("2.6.5.0")] \ No newline at end of file diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs index fc4a7b9b..7d4cc8b8 100644 --- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs +++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs @@ -962,6 +962,7 @@ this.Controls.Add(this.mainMenu); this.MainMenuStrip = this.mainMenu; this.Name = "FrmFwUpdateBuilder"; + this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmFwUpdateBuilder_FormClosing); ((System.ComponentModel.ISupportInitialize)(this.picBoxLogo)).EndInit(); this.grpLanguageSelection.ResumeLayout(false); diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs index dbdc7a52..edc2b10c 100644 --- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs +++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs @@ -1017,17 +1017,6 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder // Check for the file in the application exe path and the application configuration path if (File.Exists(nLogConfigSourcePathName) && !File.Exists(NLogConfigurationDestPathFile)) SystemControl.CopyFile(nLogConfigSourcePathName, NLogConfigurationDestPathFile); - - //var rulerPathName = Path.Combine(fwUpdateBuilderLibraryPath, - // FwUpdateConfig.MeterFwUpdateRulerConfigFileName); - //if (!File.Exists(rulerPathName)) - // rulerPathName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, - // FwUpdateConfig.MeterFwUpdateRulerConfigFileName); - //if (File.Exists(rulerPathName)) - //{ - // var rulerFile = File.ReadAllText(rulerPathName, Encoding.UTF8); - // _meterFwUpdateRuler = JsonConvert.DeserializeObject>(rulerFile); - //} } catch (Exception) { @@ -4961,49 +4950,19 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder } /// - /// Get Cordonel Fa update configuration files from DB. - /// The configuration files contain the latest MeterFwUpdateRuler.json (needed for the FwUpdateBuilder), - /// the latest configuration.json and the latest MeterEraseRestore.json (needed for the FwUpdateSw). - /// Copies the MeterFwUpdateRuler.json to the [exe-root] or [exe-root]/Library of the FwUpdateBuilder. + /// Get Cordonel FW update configuration files from DB. + /// The configuration files contain the latest configuration.json + /// and the latest MeterEraseRestore.json (needed for the FwUpdateSw). /// /// /// - Initial. /// + /// + /// - Removed FUpdateRuler, all data are going to be taken from DB. + /// private void GetFwUpdateConfigFilesFromDb() { - if (_fwUpdateDbAccess == null || - !_fwUpdateDbAccess.DownloadFwUpdateConfigurationFilesFromDb() || - _fwUpdateDbAccess.DbFwUpdateConfigFiles.Count == 0) - return; - - try - { - // extract the MeterFwUpdateRuler - foreach (var f in _fwUpdateDbAccess.DbFwUpdateConfigFiles) - { - if (f.FileName == FwUpdateConfig.MeterFwUpdateRulerConfigFileName) - { - // Copy MeterFwUpdateRuler either to exe-path or if existing to Library-subfolder - var fwUpdateBuilderExePath = AppDomain.CurrentDomain.BaseDirectory; - var fwUpdateBuilderLibraryPath = Path.Combine(fwUpdateBuilderExePath, - FwUpdateConfig.LibrarySubFolderName); - - // check the Library path existence (will be used in Release build) - var meterFwUpdateRulerPath = Directory.Exists(fwUpdateBuilderLibraryPath) ? - fwUpdateBuilderLibraryPath : fwUpdateBuilderExePath; - - var sourceFile = Path.Combine(meterFwUpdateRulerPath, f.FileName); - var fs = File.Open(sourceFile, FileMode.Create); - fs.Write(f.FileContent, 0, f.FileContent.Length); - fs.Close(); - } - } - } - - catch (Exception) - { - // nothing to do - } + _fwUpdateDbAccess?.DownloadFwUpdateConfigurationFilesFromDb(); } /// @@ -5372,7 +5331,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder foreach (var f in fwPackage) { - // load the ADF + // load the ADF (application description file, containing the information of each application) if (f.FileName.Contains("product") && f.FileName.EndsWith(".txt")) { _fwUpdatePackage.PackageDescriptionFile.FileName = f.FileName; @@ -5380,7 +5339,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder _fwUpdatePackage.PackageDescriptionFile.FileContent = f.FileContent.ToArray(); } - // load the binaries + // load the binaries (application files) if (f.FileName.Contains("binfile") && f.FileName.EndsWith(".bin")) { var filePart = new FilePart @@ -5489,7 +5448,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder resources.ApplyResources(this, "$this"); ControlExtensions.ChangeControlText(resources, Controls); - var rm = new ComponentResourceManager(this.GetType()); + var rm = new ComponentResourceManager(GetType()); foreach (var control in this.AllControls()) { if (control is ToolStrip) diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.de.resx b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.de.resx index d37011ab..d98bd64d 100644 --- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.de.resx +++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.de.resx @@ -182,9 +182,6 @@ wxRrtSJFACqo7AAAAUUUVhvqzsSSVkf/2Q== - - Sprache - 65, 17 @@ -197,38 +194,38 @@ Englisch + + Sprache + Datenbankverbindung - - 46, 20 - - - &Datei - 120, 22 &Beenden + + 46, 20 + + + &Datei + 66, 20 &Assistent - - &Hilfe - 137, 22 &Information - - Kundenauswahl + + &Hilfe 191, 9 @@ -242,8 +239,38 @@ Starte Suche - - FW-Paketauswahl + + Kundenauswahl + + + 107, 13 + + + KUNDENAUSWAHL + + + Starte Suche + + + 136, 9 + + + 124, 13 + + + Produktionsnummer-Pos: + + + 390, 9 + + + 112, 13 + + + Kundenseriennummer: + + + Cordonelauswahl 152, 9 @@ -278,35 +305,8 @@ Kern: - - Cordonelauswahl - - - 107, 13 - - - KUNDENAUSWAHL - - - Starte Suche - - - 136, 9 - - - 124, 13 - - - Produktionsnummer-Pos: - - - 390, 9 - - - 112, 13 - - - Kundenseriennummer: + + FW-Paketauswahl Updateoperatorauswahl @@ -323,9 +323,6 @@ FW-Updateberichte - - 527, 151 - Kundenname: @@ -356,6 +353,9 @@ Vorausgewählte FW-Pakete: + + 527, 151 + /9j/4AAQSkZJRgABAQEAYABgAAD/4QC8RXhpZgAATU0AKgAAAAgABAESAAMAAAABAAEAAAE7AAIAAAAH @@ -491,6 +491,9 @@ None + + Safe Erstellen + None @@ -500,9 +503,6 @@ 214, 59 - - Safe Erstellen - 149, 17