From 879a7c2179d991f4b68a513f60de3472b2e64102 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 23 Mar 2020 23:50:13 +0200 Subject: Implemented cached entities using DataResolver. Implemented DataResolver Builder. Implemented offline gateway, authentication, machines... Implemented online checking. Moved FSEWebClient and Gateway to BL. Implemented blocking of machines outside of the organization. --- .../Web/Tango.MachineService/Controllers/FSEController.cs | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers') diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs index abcd1c41f..95a26d78e 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs @@ -44,9 +44,6 @@ namespace Tango.MachineService.Controllers client_version = new Version("1.0.0.0"); } - bool versionChangeRequired = false; - String requiredVersion = null; - var password = hash.Encrypt(request.Password); using (var db = ObservablesContextHelper.CreateContext()) @@ -104,8 +101,6 @@ namespace Tango.MachineService.Controllers { UserGuid = user.Guid, }, DateTime.UtcNow.AddDays(1)).AccessToken, - VersionChangeRequired = versionChangeRequired, - RequiredVersion = requiredVersion, PasswordChangeRequired = user.PasswordChangeRequired }; } -- cgit v1.3.1 From 4669cb92dda72b663543287e692090981fc7f2c4 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 24 Mar 2020 18:25:25 +0200 Subject: Integrated firmware version difference to PPC update. --- .../PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs | 1 + .../PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs | 1 + .../Web/Tango.MachineService/Controllers/PPCController.cs | 8 ++++++++ 3 files changed, 10 insertions(+) (limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs index 73a236dde..1d010ecfb 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs @@ -908,6 +908,7 @@ namespace Tango.PPC.Common.MachineUpdate CheckForUpdateRequest request = new CheckForUpdateRequest(); request.SerialNumber = serialNumber; request.Version = _app_manager.Version.ToString(); + request.FirmwareVersion = _app_manager.FirmwareVersion?.ToString(); try { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs index 0d86fa117..a93b30a59 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs @@ -11,6 +11,7 @@ namespace Tango.PPC.Common.Web { public String SerialNumber { get; set; } public String Version { get; set; } + public String FirmwareVersion { get; set; } public List Rmls { get; set; } public List HardwareVersions { get; set; } diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs index 71e540dbf..2049df665 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs @@ -344,6 +344,14 @@ namespace Tango.MachineService.Controllers response.IsUpdateAvailable = true; } + if (!String.IsNullOrWhiteSpace(request.FirmwareVersion)) + { + if (Version.Parse(latest_machine_version.FirmwareVersion) > Version.Parse(request.FirmwareVersion)) + { + response.IsUpdateAvailable = true; + } + } + response.Version = latest_machine_version.Version; response.FirmwareVersion = latest_machine_version.FirmwareVersion; -- cgit v1.3.1