diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 4f1b7c7e..408c12bd 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -12,14 +12,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/MP.Mon/Components/CmpHeader.razor b/MP.Mon/Components/CmpHeader.razor index 38798b9d..7df6bdf4 100644 --- a/MP.Mon/Components/CmpHeader.razor +++ b/MP.Mon/Components/CmpHeader.razor @@ -1,6 +1,6 @@ 
- MP MONitor + MP MONitor
diff --git a/MP.Mon/Components/LoadingData.razor b/MP.Mon/Components/LoadingData.razor index db79a629..0735bc7f 100644 --- a/MP.Mon/Components/LoadingData.razor +++ b/MP.Mon/Components/LoadingData.razor @@ -1,6 +1,10 @@ -
-
+
+
+

MAPO MON

+ EgalWare MES suite +
+

loading data

- +
\ No newline at end of file diff --git a/MP.Mon/Data/MpDataService.cs b/MP.Mon/Data/MpDataService.cs index a866fd02..be311e0d 100644 --- a/MP.Mon/Data/MpDataService.cs +++ b/MP.Mon/Data/MpDataService.cs @@ -122,7 +122,7 @@ namespace MP.Mon.Data List? result = new List(); // cerco in redis... RedisValue rawData = await redisDb.StringGetAsync(redisMseKey); - if (rawData != RedisValue.Null || rawData != RedisValue.EmptyString) + if (!string.IsNullOrEmpty($"{rawData}")) { result = JsonConvert.DeserializeObject>($"{rawData}"); stopWatch.Stop(); diff --git a/MP.Mon/Pages/Index.razor b/MP.Mon/Pages/Index.razor index df68c4fa..29bdbd95 100644 --- a/MP.Mon/Pages/Index.razor +++ b/MP.Mon/Pages/Index.razor @@ -5,7 +5,6 @@ MP MON
- @if (listMSE == null) {
diff --git a/MP.Mon/Pages/Index.razor.cs b/MP.Mon/Pages/Index.razor.cs index a553f713..360792f6 100644 --- a/MP.Mon/Pages/Index.razor.cs +++ b/MP.Mon/Pages/Index.razor.cs @@ -20,11 +20,11 @@ namespace MP.Mon.Pages public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e) { listMSE = null; - await Task.Delay(1); + await Task.Delay(10); Log.Info("Elapsed Slow Timer --> full page reload"); // dispongo i vari timers... disposeTimers(); - await Task.Delay(1); + await Task.Delay(10); // reload pagina NavManager.NavigateTo(NavManager.Uri); } @@ -157,12 +157,14 @@ namespace MP.Mon.Pages protected override async Task OnInitializedAsync() { await setupConf(); - //await ReloadData(); MMDataService.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; MMDataService.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage; + Random rnd = new Random(); + await Task.Delay(rnd.Next(1000, 1200)); StartTimer(); } + #endregion Protected Methods #region Private Fields @@ -211,7 +213,6 @@ namespace MP.Mon.Pages /// private void DataPipe_EA_NewMessage(object? sender, EventArgs e) { - //fastTimer.Stop(); PubSubEventArgs currArgs = (PubSubEventArgs)e; // conversione on-the-fly List --> allarmi if (!string.IsNullOrEmpty(currArgs.newMessage)) @@ -239,12 +240,13 @@ namespace MP.Mon.Pages } InvokeAsync(() => { +#if false // attesa random 0-50ms... Random rnd = new Random(); - Task.Delay(rnd.Next(5, 50)); + Task.Delay(rnd.Next(5, 50)); +#endif StateHasChanged(); }); - //fastTimer.Start(); } private void disposeTimers() diff --git a/MP.Mon/Shared/MainLayout.razor.css b/MP.Mon/Shared/MainLayout.razor.css index f46e7c65..6ee8c02b 100644 --- a/MP.Mon/Shared/MainLayout.razor.css +++ b/MP.Mon/Shared/MainLayout.razor.css @@ -13,14 +13,14 @@ main { /*border-bottom: 1px solid #696969;*/ color: #696969; font-size: 1.4em; - height: 3rem; + height: 2.6rem; display: flex; align-items: center; justify-content: space-evenly; } .mainHead{ - font-size: 1.7rem; + font-size: 1.6rem; } .top-row ::deep a, diff --git a/MP.Mon/wwwroot/css/site.css b/MP.Mon/wwwroot/css/site.css index 77ec9693..86c39b13 100644 --- a/MP.Mon/wwwroot/css/site.css +++ b/MP.Mon/wwwroot/css/site.css @@ -308,7 +308,7 @@ a, /* Gestione size caratteri */ .mainHead, .logoImg { - height: 1.6em; + height: 1.5em; } @media all and (min-width: 425px) { .mainHead {