From f2973cb0beb9279e41d663783b2f0680756b976f Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sat, 9 Jul 2022 10:30:08 +0200
Subject: [PATCH] Update refresh sincronizzato

---
 MP.Mon/Components/CmpFooter.razor.cs |  2 +-
 MP.Mon/Components/DetailMSE.razor.cs | 26 ++++++++++++++++++++++-
 MP.Mon/MP.Mon.csproj                 |  2 +-
 MP.Mon/Pages/Index.razor             |  5 ++---
 MP.Mon/Pages/Index.razor.cs          | 31 ++++++++++++++++++----------
 MP.Mon/Resources/ChangeLog.html      |  2 +-
 MP.Mon/Resources/VersNum.txt         |  2 +-
 MP.Mon/Resources/manifest.xml        |  2 +-
 8 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/MP.Mon/Components/CmpFooter.razor.cs b/MP.Mon/Components/CmpFooter.razor.cs
index 73e92bc2..bf322b8f 100644
--- a/MP.Mon/Components/CmpFooter.razor.cs
+++ b/MP.Mon/Components/CmpFooter.razor.cs
@@ -26,7 +26,7 @@ namespace MP.Mon.Components
 
         public void StartTimer()
         {
-            int tOutPeriod = 1000;
+            int tOutPeriod = 5000;
             //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
             aTimer = new System.Timers.Timer(tOutPeriod);
             aTimer.Elapsed += ElapsedTimer;
diff --git a/MP.Mon/Components/DetailMSE.razor.cs b/MP.Mon/Components/DetailMSE.razor.cs
index 39157140..11f58d24 100644
--- a/MP.Mon/Components/DetailMSE.razor.cs
+++ b/MP.Mon/Components/DetailMSE.razor.cs
@@ -32,6 +32,24 @@ namespace MP.Mon.Components
         [Parameter]
         public string showArt { get; set; } = "";
 
+
+        [Parameter]
+        public bool doBlink { get; set; } = false;
+        //{
+        //    set
+        //    {
+        //        // se true --> ricarica
+        //        if (value)
+        //        {
+        //            var pUpd = Task.Run(async () =>
+        //            {
+        //                await InvokeAsync(() => StateHasChanged());
+        //            });
+        //            pUpd.Wait();
+        //        }
+        //    }
+        //}
+
         #endregion Public Properties
 
         #region Public Methods
@@ -157,7 +175,7 @@ namespace MP.Mon.Components
 
         protected override async Task OnInitializedAsync()
         {
-            StartTimer();
+            //StartTimer();
             Random rnd = new Random();
             await Task.Delay(rnd.Next(5));
             setupConf();
@@ -228,11 +246,17 @@ namespace MP.Mon.Components
             string answ = $"{baseCss}{codColore}";
             if (doAnimate && codColore != "Ve")
             {
+#if false
                 // blink se secondo pari...
                 DateTime adesso = DateTime.Now;
                 int resto = 0;
                 Math.DivRem(adesso.Second, 2, out resto);
                 if (resto == 0)
+                {
+                    answ += "_b";
+                } 
+#endif
+                if (doBlink)
                 {
                     answ += "_b";
                 }
diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj
index 553800c1..29e1984c 100644
--- a/MP.Mon/MP.Mon.csproj
+++ b/MP.Mon/MP.Mon.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2207.909</Version>
+    <Version>6.15.2207.910</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.Mon/Pages/Index.razor b/MP.Mon/Pages/Index.razor
index 9a424e02..68661693 100644
--- a/MP.Mon/Pages/Index.razor
+++ b/MP.Mon/Pages/Index.razor
@@ -26,7 +26,7 @@
         int currIdx = 0;
         foreach (var recordIob in ListMSE)
         {
-            <DetailMSE CurrRecord="@recordIob" currTagConf="@getIobTag(recordIob.IdxMacchina)" currTagVal="@getTagVal(recordIob.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt"></DetailMSE>
+            <DetailMSE CurrRecord="@recordIob" currTagConf="@getIobTag(recordIob.IdxMacchina)" currTagVal="@getTagVal(recordIob.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink"></DetailMSE>
             currIdx++;
             if (currIdx >= maxCol)
             {
@@ -38,8 +38,7 @@
         int currNum = (currIdx % maxCol);
         while (currNum < (maxCol))
         {
-            @((MarkupString)"<div class=\"col machBlock\">&nbsp;</div>")
-            ;
+            @((MarkupString)"<div class=\"col machBlock\">&nbsp;</div>");
             currNum++;
 
         }
diff --git a/MP.Mon/Pages/Index.razor.cs b/MP.Mon/Pages/Index.razor.cs
index 9d4cae75..9c08d648 100644
--- a/MP.Mon/Pages/Index.razor.cs
+++ b/MP.Mon/Pages/Index.razor.cs
@@ -12,21 +12,34 @@ namespace MP.Mon.Pages
 
         public void Dispose()
         {
-            //fastTimer.Elapsed -= ElapsedFastTimer;
             fastTimer.Stop();
             fastTimer.Dispose();
-            //slowTimer.Elapsed -= ElapsedSlowTimer;
             slowTimer.Stop();
             slowTimer.Dispose();
         }
 
+        private bool doBlink = false;
+
         public void ElapsedFastTimer(object? source, System.Timers.ElapsedEventArgs e)
         {
             var pUpd = Task.Run(async () =>
             {
-                await ReloadData();
+                // secondi pari --> blink, secondi dispari --> ricarica
+                DateTime adesso = DateTime.Now;
+                int resto = 0;
+                Math.DivRem(adesso.Second, 2, out resto);
+                if (resto == 0)
+                {
+                    doBlink = true;
+                    Log.Trace("Elapsed Fast Timer Blink");
+                }
+                else
+                {
+                    doBlink = false;
+                    await ReloadData();
+                    Log.Trace("Elapsed Fast Timer reload");
+                }
                 await Task.Delay(1);
-                Log.Trace("Elapsed Fast Timer");
                 await InvokeAsync(StateHasChanged);
             });
             pUpd.Wait();
@@ -36,7 +49,7 @@ namespace MP.Mon.Pages
         {
             ListMSE = null;
             await Task.Delay(1);
-            Log.Trace("Elapsed Slow Timer");
+            Log.Info("Elapsed Slow Timer --> full page reload");
             NavManager.NavigateTo(NavManager.Uri);
         }
 
@@ -59,7 +72,6 @@ namespace MP.Mon.Pages
         #region Protected Fields
 
         protected bool doAnimate = true;
-        protected int fastRefreshSec = 10;
         protected int keepAliveMin = 1;
         protected List<MappaStatoExpl>? ListMSE = null;
         protected int maxCol = 4;
@@ -70,11 +82,8 @@ namespace MP.Mon.Pages
 
         #region Protected Properties
 
-        protected int fastRefreshMs
-        {
-            get => 1000 * fastRefreshSec;
-        }
-
+        protected int fastRefreshMs= 1000;
+        
         [Inject]
         protected MpDataService MMDataService { get; set; } = null!;
 
diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html
index 870e3194..b932a34a 100644
--- a/MP.Mon/Resources/ChangeLog.html
+++ b/MP.Mon/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.15.2207.909</h4>
+    <h4>Versione: 6.15.2207.910</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt
index f1cbf975..816ffbf1 100644
--- a/MP.Mon/Resources/VersNum.txt
+++ b/MP.Mon/Resources/VersNum.txt
@@ -1 +1 @@
-6.15.2207.909
+6.15.2207.910
diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml
index 3266ea92..b4dc5c25 100644
--- a/MP.Mon/Resources/manifest.xml
+++ b/MP.Mon/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2207.909</version>
+  <version>6.15.2207.910</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>