marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CUST: - FwUpdateBuilder removed FwUpdateRuler

Browse Source
This commit is contained in:
Thomas Wiedebusch 2023-10-06 15:15:35 +02:00
parent a4c1e25668
commit 5445677d8b
4 changed files with 64 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/.shared/SharedAssemblyInfo.cs
View File

@ -14,5 +14,5 @@ using System.Reflection;
//[assembly: AssemblyVersion("1.2.*.0")]
[assembly: AssemblyVersion("2.6.4.*")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyVersion("2.6.5.*")]
[assembly: AssemblyFileVersion("2.6.5.0")]

1
ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs generated
View File

@ -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);

61
ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs
View File

@ -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<List<MeterFwUpdateRuler>>(rulerFile);
//}
}
catch (Exception)
{
@ -4961,49 +4950,19 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
}
/// <summary>
/// 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).
/// </summary>
/// <remarks date="2021-Oct-27" author="Thomas Wiedebusch">
/// - Initial.
/// </remarks>
/// <remarks date="2023-Oct-06" author="Thomas Wiedebusch">
/// - Removed FUpdateRuler, all data are going to be taken from DB.
/// </remarks>
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();
}
/// <summary>
@ -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)

102
ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.de.resx
View File

@ -182,9 +182,6 @@
wxRrtSJFACqo7AAAAUUUVhvqzsSSVkf/2Q==
</value>
</data>
<data name="grpLanguageSelection.Text" xml:space="preserve">
<value>Sprache</value>
</data>
<data name="radioBtnGermanLanguage.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 17</value>
</data>
@ -197,38 +194,38 @@
<data name="radioBtnEnglishLanguage.Text" xml:space="preserve">
<value>Englisch</value>
</data>
<data name="grpLanguageSelection.Text" xml:space="preserve">
<value>Sprache</value>
</data>
<data name="lblStatusDbConnect.Text" xml:space="preserve">
<value>Datenbankverbindung</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Datei</value>
</data>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Beenden</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Datei</value>
</data>
<data name="wizardToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 20</value>
</data>
<data name="wizardToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Assistent</value>
</data>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Hilfe</value>
</data>
<data name="infoToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 22</value>
</data>
<data name="infoToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Information</value>
</data>
<data name="tabPageCustomerSelection.Text" xml:space="preserve">
<value>Kundenauswahl</value>
<data name="helpToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Hilfe</value>
</data>
<data name="lblCustomerMaskText.Location" type="System.Drawing.Point, System.Drawing">
<value>191, 9</value>
@ -242,8 +239,38 @@
<data name="btnSearchCustomer.Text" xml:space="preserve">
<value>Starte Suche</value>
</data>
<data name="tabPageFwPackageSelection.Text" xml:space="preserve">
<value>FW-Paketauswahl</value>
<data name="tabPageCustomerSelection.Text" xml:space="preserve">
<value>Kundenauswahl</value>
</data>
<data name="lblInfoSelectCustomer.Size" type="System.Drawing.Size, System.Drawing">
<value>107, 13</value>
</data>
<data name="lblInfoSelectCustomer.Text" xml:space="preserve">
<value>KUNDENAUSWAHL</value>
</data>
<data name="btnCordonelSearch.Text" xml:space="preserve">
<value>Starte Suche</value>
</data>
<data name="lblCordonelProductionNumberSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>136, 9</value>
</data>
<data name="lblCordonelProductionNumberSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 13</value>
</data>
<data name="lblCordonelProductionNumberSearch.Text" xml:space="preserve">
<value>Produktionsnummer-Pos:</value>
</data>
<data name="lblCordonelCustomerSerialNumberSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>390, 9</value>
</data>
<data name="lblCordonelCustomerSerialNumberSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 13</value>
</data>
<data name="lblCordonelCustomerSerialNumberSearch.Text" xml:space="preserve">
<value>Kundenseriennummer:</value>
</data>
<data name="tabPageCordonelSelection.Text" xml:space="preserve">
<value>Cordonelauswahl</value>
</data>
<data name="lblFwPackageSearchFrequency.Location" type="System.Drawing.Point, System.Drawing">
<value>152, 9</value>
@ -278,35 +305,8 @@
<data name="lblFwPackageSearchCore.Text" xml:space="preserve">
<value>Kern:</value>
</data>
<data name="tabPageCordonelSelection.Text" xml:space="preserve">
<value>Cordonelauswahl</value>
</data>
<data name="lblInfoSelectCustomer.Size" type="System.Drawing.Size, System.Drawing">
<value>107, 13</value>
</data>
<data name="lblInfoSelectCustomer.Text" xml:space="preserve">
<value>KUNDENAUSWAHL</value>
</data>
<data name="btnCordonelSearch.Text" xml:space="preserve">
<value>Starte Suche</value>
</data>
<data name="lblCordonelProductionNumberSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>136, 9</value>
</data>
<data name="lblCordonelProductionNumberSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 13</value>
</data>
<data name="lblCordonelProductionNumberSearch.Text" xml:space="preserve">
<value>Produktionsnummer-Pos:</value>
</data>
<data name="lblCordonelCustomerSerialNumberSearch.Location" type="System.Drawing.Point, System.Drawing">
<value>390, 9</value>
</data>
<data name="lblCordonelCustomerSerialNumberSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 13</value>
</data>
<data name="lblCordonelCustomerSerialNumberSearch.Text" xml:space="preserve">
<value>Kundenseriennummer:</value>
<data name="tabPageFwPackageSelection.Text" xml:space="preserve">
<value>FW-Paketauswahl</value>
</data>
<data name="tabPageUpdateOperator.Text" xml:space="preserve">
<value>Updateoperatorauswahl</value>
@ -323,9 +323,6 @@
<data name="tabPageReports.Text" xml:space="preserve">
<value>FW-Updateberichte</value>
</data>
<data name="tblPanelSafeInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>527, 151</value>
</data>
<data name="lblCustomerNameText.Text" xml:space="preserve">
<value>Kundenname:</value>
</data>
@ -356,6 +353,9 @@
<data name="lblSelectedFwPackagesText.Text" xml:space="preserve">
<value>Vorausgewählte FW-Pakete:</value>
</data>
<data name="tblPanelSafeInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>527, 151</value>
</data>
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QC8RXhpZgAATU0AKgAAAAgABAESAAMAAAABAAEAAAE7AAIAAAAH
@ -491,6 +491,9 @@
<data name="tblPanelStandardButtons.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
</data>
<data name="btnBuildFwUpdateSafe.Text" xml:space="preserve">
<value>Safe Erstellen</value>
</data>
<data name="tblPanelStandardButtons.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>None</value>
</data>
@ -500,9 +503,6 @@
<data name="tblPanelStandardButtons.Size" type="System.Drawing.Size, System.Drawing">
<value>214, 59</value>
</data>
<data name="btnBuildFwUpdateSafe.Text" xml:space="preserve">
<value>Safe Erstellen</value>
</data>
<data name="cbxAddDebugCordonels.Size" type="System.Drawing.Size, System.Drawing">
<value>149, 17</value>
</data>