diff --git a/MP.MON.Client/Components/CmpFooter.razor.cs b/MP.MON.Client/Components/CmpFooter.razor.cs index 72943d35..d07d625e 100644 --- a/MP.MON.Client/Components/CmpFooter.razor.cs +++ b/MP.MON.Client/Components/CmpFooter.razor.cs @@ -9,10 +9,10 @@ namespace MP.MON.Client.Components #region Public Properties [Parameter] - public Version version { get; set; } = null!; + public int slowRefreshSec { get; set; } = 300; [Parameter] - public int slowRefreshSec { get; set; } = 300; + public Version version { get; set; } = null!; #endregion Public Properties @@ -27,16 +27,6 @@ namespace MP.MON.Client.Components } } - protected int slowRefreshMs - { - get - { - // tempo variabile tra +/- 10% del target - int answ = rnd.Next(900, 1100) * slowRefreshSec; - return answ; - } - } - private Random rnd; public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e) { // dispongo i vari timers... @@ -46,12 +36,6 @@ namespace MP.MON.Client.Components NavManager.NavigateTo(NavManager.Uri, true); } - private void disposeTimers() - { - aTimer.Elapsed -= ElapsedTimer; - aTimer.Stop(); - aTimer.Dispose(); - } public void StartTimer() { // timer lento @@ -85,6 +69,16 @@ namespace MP.MON.Client.Components [Inject] protected NavigationManager NavManager { get; set; } = null!; + protected int slowRefreshMs + { + get + { + // tempo variabile tra +/- 10% del target + int answ = rnd.Next(900, 1100) * slowRefreshSec; + return answ; + } + } + #endregion Protected Properties #region Protected Methods @@ -103,15 +97,15 @@ namespace MP.MON.Client.Components await getWDim(); StateHasChanged(); StartTimer(); - Console.WriteLine($"Dimensioni schermo: {Width}x{Height} - timer avviato"); + Console.WriteLine($"Footer | Dimensioni schermo: {Width}x{Height} | slowRefreshSec: {slowRefreshSec}"); } - //Console.WriteLine($"OnAfterRenderAsync completato"); + Console.WriteLine($"Footer | OnAfterRenderAsync completato"); } protected override void OnInitialized() { rnd = new Random(); - Console.WriteLine($"OnInitialized Footer completato | slowRefreshSec: {slowRefreshSec} "); + Console.WriteLine($"Footer | OnInitialized completato"); } #endregion Protected Methods @@ -119,6 +113,7 @@ namespace MP.MON.Client.Components #region Private Fields private static System.Timers.Timer aTimer = null!; + private Random rnd; #endregion Private Fields @@ -129,5 +124,16 @@ namespace MP.MON.Client.Components private int Width { get; set; } = 0; #endregion Private Properties + + #region Private Methods + + private void disposeTimers() + { + aTimer.Elapsed -= ElapsedTimer; + aTimer.Stop(); + aTimer.Dispose(); + } + + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.MON.Client/Components/CmpHeader.razor b/MP.MON.Client/Components/CmpHeader.razor index 28357073..2705a192 100644 --- a/MP.MON.Client/Components/CmpHeader.razor +++ b/MP.MON.Client/Components/CmpHeader.razor @@ -14,7 +14,5 @@ @($"{DateTime.Now:HH:mm:ss}") - @* - EgalWare *@ diff --git a/MP.MON.Client/Components/CmpHeader.razor.cs b/MP.MON.Client/Components/CmpHeader.razor.cs index f37f4852..c8dde3f3 100644 --- a/MP.MON.Client/Components/CmpHeader.razor.cs +++ b/MP.MON.Client/Components/CmpHeader.razor.cs @@ -8,7 +8,7 @@ namespace MP.MON.Client.Components protected override void OnInitialized() { StartTimer(); - Console.WriteLine($"OnInitialized Header completato"); + Console.WriteLine($"Header | OnInitialized completato"); } diff --git a/MP.MON.Client/Components/DetailMapSelector.razor b/MP.MON.Client/Components/DetailMapSelector.razor deleted file mode 100644 index a6911977..00000000 --- a/MP.MON.Client/Components/DetailMapSelector.razor +++ /dev/null @@ -1,44 +0,0 @@ -@using MP.Core.Conf -@using MP.Core.DTO; - -@if (useNewDisplay) -{ - -} -else -{ - -} - -@code { - - [Parameter] - public MappaStatoExplDTO? currRecord { get; set; } = null; - - [Parameter] - public List? currTagConf { get; set; } = null; - - [Parameter] - public Dictionary currTagVal { get; set; } = new Dictionary(); - - [Parameter] - public bool doAnimate { get; set; } = true; - - [Parameter] - public bool doBlink { get; set; } = false; - - [Parameter] - public int keepAliveMin { get; set; } = 5; - - [Parameter] - public int maxChar4Scroll { get; set; } = 20; - - [Parameter] - public string showArt { get; set; } = ""; - [Parameter] - public bool useNewDisplay { get; set; } = true; - - - [Parameter] - public string cssOverlayOff { get; set; } = ""; -} diff --git a/MP.MON.Client/wwwroot/lib/boot.js b/MP.MON.Client/wwwroot/lib/boot.js index baf62de9..35cc455a 100644 --- a/MP.MON.Client/wwwroot/lib/boot.js +++ b/MP.MON.Client/wwwroot/lib/boot.js @@ -1,16 +1,17 @@ (() => { - const maximumRetryCount = 3600; - const retryIntervalMilliseconds = 1000; - const reconnectModal = document.getElementById('reconnect-modal'); + const maximumRetryCount = 1800; + const retryIntervalMilliseconds = 2000; + const rectModalBox = document.getElementById('reconnect-modal'); + const recModal = document.getElementById('reconnect-modal-text'); const startReconnectionProcess = () => { - reconnectModal.style.display = 'block'; + rectModalBox.style.display = 'block'; let isCanceled = false; (async () => { for (let i = 0; i < maximumRetryCount; i++) { - reconnectModal.innerText = `Attempting to reconnect: ${i + 1} of ${maximumRetryCount}`; + recModal.innerText = `Tentativo riconnessione: ${i + 1} / ${maximumRetryCount}`; await new Promise(resolve => setTimeout(resolve, retryIntervalMilliseconds)); @@ -40,7 +41,7 @@ return { cancel: () => { isCanceled = true; - reconnectModal.style.display = 'none'; + rectModalBox.style.display = 'none'; }, }; }; @@ -50,10 +51,14 @@ Blazor.start({ circuit: { reconnectionHandler: { - onConnectionDown: () => currentReconnectionProcess ??= startReconnectionProcess(), + onConnectionDown: () => { + currentReconnectionProcess ??= startReconnectionProcess(); + console.log("Connection Lost!"); + }, onConnectionUp: () => { currentReconnectionProcess?.cancel(); currentReconnectionProcess = null; + console.log("Connection restored!"); } } } diff --git a/MP.MON/Components/App.razor b/MP.MON/Components/App.razor index 0ae8e7bc..f751408f 100644 --- a/MP.MON/Components/App.razor +++ b/MP.MON/Components/App.razor @@ -16,26 +16,22 @@ - + + + + Reconnecting... + + + + + mancanza di comunicazione con il server + + + @* *@ - @* *@