From 0ffde6db57e1662342519173d45879e93142a476 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 26 Feb 2024 18:09:48 +0100 Subject: [PATCH] Continuo porting pagine a gestione TabDataFeeder --- MP-TAB3/Components/ProdStopMan.razor | 2 +- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Pages/Declarations.razor | 1 - MP-TAB3/Pages/Declarations.razor.cs | 38 ++++++++++++++++++++- MP-TAB3/Pages/MachineDetail.razor | 1 - MP-TAB3/Pages/MachineDetail.razor.cs | 41 ++++++++++++++++++++++- MP-TAB3/Pages/ODL.razor | 1 - MP-TAB3/Pages/ODL.razor.cs | 39 +++++++++++++++++++++- MP-TAB3/Pages/Parameters.razor | 2 -- MP-TAB3/Pages/Parameters.razor.cs | 38 ++++++++++++++++++++- MP-TAB3/Pages/ProdStop.razor | 2 -- MP-TAB3/Pages/ProdStop.razor.cs | 41 ++++++++++++++++++++++- MP-TAB3/Pages/StatusMap.razor | 1 - MP-TAB3/Pages/StatusMap.razor.cs | 49 ---------------------------- MP-TAB3/Pages/TechSheet.razor | 2 -- MP-TAB3/Pages/TechSheet.razor.cs | 37 ++++++++++++++++++++- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- MP.Data/Services/StatusData.cs | 2 +- MP.Data/Services/TabDataFeeder.cs | 32 ++++++------------ 21 files changed, 244 insertions(+), 93 deletions(-) diff --git a/MP-TAB3/Components/ProdStopMan.razor b/MP-TAB3/Components/ProdStopMan.razor index fc8b18af..4c503858 100644 --- a/MP-TAB3/Components/ProdStopMan.razor +++ b/MP-TAB3/Components/ProdStopMan.razor @@ -1,4 +1,4 @@ -
+
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 4fb5a719..fb4223f8 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2402.2616 + 6.16.2402.2618 enable MP_TAB3 diff --git a/MP-TAB3/Pages/Declarations.razor b/MP-TAB3/Pages/Declarations.razor index bdb96323..4a5b1042 100644 --- a/MP-TAB3/Pages/Declarations.razor +++ b/MP-TAB3/Pages/Declarations.razor @@ -1,6 +1,5 @@ @page "/declarations" - @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) { diff --git a/MP-TAB3/Pages/Declarations.razor.cs b/MP-TAB3/Pages/Declarations.razor.cs index ab991087..70c8c136 100644 --- a/MP-TAB3/Pages/Declarations.razor.cs +++ b/MP-TAB3/Pages/Declarations.razor.cs @@ -1,6 +1,8 @@ using global::Microsoft.AspNetCore.Components; +using MP.Data; using MP.Data.DatabaseModels; using MP.Data.Services; +using Newtonsoft.Json; namespace MP_TAB3.Pages { @@ -12,7 +14,7 @@ namespace MP_TAB3.Pages { IdxMacc = ""; CurrMSE = null; - //GC.Collect(); + TDFeeder.dataPipe.EA_NewMessage -= DataPipe_EA_NewMessage; } #endregion Public Methods @@ -20,11 +22,15 @@ namespace MP_TAB3.Pages #region Protected Properties protected MappaStatoExpl? CurrMSE { get; set; } = null; + protected string IdxMacc { get; set; } = ""; [Inject] protected MessageService MsgServ { get; set; } = null!; + [Inject] + protected TabDataFeeder TDFeeder { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -32,6 +38,7 @@ namespace MP_TAB3.Pages protected override async Task OnInitializedAsync() { await ReloadData(); + TDFeeder.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; } protected async Task RefreshData(List newList) @@ -67,6 +74,35 @@ namespace MP_TAB3.Pages #region Private Methods + /// + /// Ricevuto nuovi dati da mostrare! + /// + /// + /// + /// + private void DataPipe_EA_NewMessage(object? sender, EventArgs e) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + // conversione on-the-fly List --> allarmi + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + List? dataList = JsonConvert.DeserializeObject>(currArgs.newMessage); + if (dataList != null) + { + InvokeAsync(() => RefreshData(dataList)); + } + } + catch + { } + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + private async Task ReloadData() { if (string.IsNullOrEmpty(IdxMacc)) diff --git a/MP-TAB3/Pages/MachineDetail.razor b/MP-TAB3/Pages/MachineDetail.razor index 08344cab..594b3b6c 100644 --- a/MP-TAB3/Pages/MachineDetail.razor +++ b/MP-TAB3/Pages/MachineDetail.razor @@ -1,6 +1,5 @@ @page "/machine-detail" - @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) { diff --git a/MP-TAB3/Pages/MachineDetail.razor.cs b/MP-TAB3/Pages/MachineDetail.razor.cs index a74043db..54b1a59a 100644 --- a/MP-TAB3/Pages/MachineDetail.razor.cs +++ b/MP-TAB3/Pages/MachineDetail.razor.cs @@ -1,6 +1,8 @@ using Microsoft.AspNetCore.Components; +using MP.Data; using MP.Data.DatabaseModels; using MP.Data.Services; +using Newtonsoft.Json; using NLog; namespace MP_TAB3.Pages @@ -13,7 +15,7 @@ namespace MP_TAB3.Pages { IdxMacc = ""; CurrMSE = null; - //GC.Collect(); + TDFeeder.dataPipe.EA_NewMessage -= DataPipe_EA_NewMessage; } #endregion Public Methods @@ -21,6 +23,7 @@ namespace MP_TAB3.Pages #region Protected Properties protected MappaStatoExpl? CurrMSE { get; set; } = null; + protected string IdxMacc { get; set; } = ""; [Inject] @@ -32,6 +35,9 @@ namespace MP_TAB3.Pages [Inject] protected TabDataService TabServ { get; set; } = null!; + [Inject] + protected TabDataFeeder TDFeeder { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -39,6 +45,7 @@ namespace MP_TAB3.Pages protected override async Task OnInitializedAsync() { await ReloadData(); + TDFeeder.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; if (enableSchedaTecnica) { checkLottiOdl(); @@ -81,8 +88,11 @@ namespace MP_TAB3.Pages #region Private Fields private static Logger Log = LogManager.GetCurrentClassLogger(); + private bool enableMagLotti = false; + private bool enableSchedaTecnica = false; + private string IdxMaccSubSel = ""; #endregion Private Fields @@ -113,6 +123,35 @@ namespace MP_TAB3.Pages #endif } + /// + /// Ricevuto nuovi dati da mostrare! + /// + /// + /// + /// + private void DataPipe_EA_NewMessage(object? sender, EventArgs e) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + // conversione on-the-fly List --> allarmi + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + List? dataList = JsonConvert.DeserializeObject>(currArgs.newMessage); + if (dataList != null) + { + InvokeAsync(() => RefreshData(dataList)); + } + } + catch + { } + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + private async Task ReloadData() { try diff --git a/MP-TAB3/Pages/ODL.razor b/MP-TAB3/Pages/ODL.razor index 85cdcb6b..0ea5c0ad 100644 --- a/MP-TAB3/Pages/ODL.razor +++ b/MP-TAB3/Pages/ODL.razor @@ -1,6 +1,5 @@ @page "/odl" - @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) { diff --git a/MP-TAB3/Pages/ODL.razor.cs b/MP-TAB3/Pages/ODL.razor.cs index 238d4da1..e1cdeb48 100644 --- a/MP-TAB3/Pages/ODL.razor.cs +++ b/MP-TAB3/Pages/ODL.razor.cs @@ -1,6 +1,8 @@ using global::Microsoft.AspNetCore.Components; +using MP.Data; using MP.Data.DatabaseModels; using MP.Data.Services; +using Newtonsoft.Json; using NLog; namespace MP_TAB3.Pages @@ -13,7 +15,7 @@ namespace MP_TAB3.Pages { IdxMacc = ""; CurrMSE = null; - //GC.Collect(); + TDFeeder.dataPipe.EA_NewMessage -= DataPipe_EA_NewMessage; } #endregion Public Methods @@ -21,11 +23,15 @@ namespace MP_TAB3.Pages #region Protected Properties protected MappaStatoExpl? CurrMSE { get; set; } = null; + protected string IdxMacc { get; set; } = ""; [Inject] protected MessageService MsgServ { get; set; } = null!; + [Inject] + protected TabDataFeeder TDFeeder { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -33,6 +39,7 @@ namespace MP_TAB3.Pages protected override async Task OnInitializedAsync() { await ReloadData(); + TDFeeder.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; } protected async Task RefreshData(List newList) @@ -71,12 +78,42 @@ namespace MP_TAB3.Pages #region Private Fields private static Logger Log = LogManager.GetCurrentClassLogger(); + private string IdxMaccSubSel = ""; #endregion Private Fields #region Private Methods + /// + /// Ricevuto nuovi dati da mostrare! + /// + /// + /// + /// + private void DataPipe_EA_NewMessage(object? sender, EventArgs e) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + // conversione on-the-fly List --> allarmi + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + List? dataList = JsonConvert.DeserializeObject>(currArgs.newMessage); + if (dataList != null) + { + InvokeAsync(() => RefreshData(dataList)); + } + } + catch + { } + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + private async Task ReloadData() { try diff --git a/MP-TAB3/Pages/Parameters.razor b/MP-TAB3/Pages/Parameters.razor index 3ecd6b07..0d437754 100644 --- a/MP-TAB3/Pages/Parameters.razor +++ b/MP-TAB3/Pages/Parameters.razor @@ -1,7 +1,5 @@ @page "/parameters" - - @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) { diff --git a/MP-TAB3/Pages/Parameters.razor.cs b/MP-TAB3/Pages/Parameters.razor.cs index b4cddaaa..49daa78a 100644 --- a/MP-TAB3/Pages/Parameters.razor.cs +++ b/MP-TAB3/Pages/Parameters.razor.cs @@ -1,6 +1,8 @@ using global::Microsoft.AspNetCore.Components; +using MP.Data; using MP.Data.DatabaseModels; using MP.Data.Services; +using Newtonsoft.Json; namespace MP_TAB3.Pages { @@ -12,7 +14,7 @@ namespace MP_TAB3.Pages { IdxMacc = ""; CurrMSE = null; - //GC.Collect(); + TDFeeder.dataPipe.EA_NewMessage -= DataPipe_EA_NewMessage; } #endregion Public Methods @@ -20,11 +22,15 @@ namespace MP_TAB3.Pages #region Protected Properties protected MappaStatoExpl? CurrMSE { get; set; } = null; + protected string IdxMacc { get; set; } = ""; [Inject] protected MessageService MsgServ { get; set; } = null!; + [Inject] + protected TabDataFeeder TDFeeder { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -32,6 +38,7 @@ namespace MP_TAB3.Pages protected override async Task OnInitializedAsync() { await ReloadData(); + TDFeeder.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; } protected async Task RefreshData(List newList) @@ -56,6 +63,35 @@ namespace MP_TAB3.Pages #region Private Methods + /// + /// Ricevuto nuovi dati da mostrare! + /// + /// + /// + /// + private void DataPipe_EA_NewMessage(object? sender, EventArgs e) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + // conversione on-the-fly List --> allarmi + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + List? dataList = JsonConvert.DeserializeObject>(currArgs.newMessage); + if (dataList != null) + { + InvokeAsync(() => RefreshData(dataList)); + } + } + catch + { } + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + private async Task ReloadData() { if (string.IsNullOrEmpty(IdxMacc)) diff --git a/MP-TAB3/Pages/ProdStop.razor b/MP-TAB3/Pages/ProdStop.razor index 12aa29a2..60ddaeef 100644 --- a/MP-TAB3/Pages/ProdStop.razor +++ b/MP-TAB3/Pages/ProdStop.razor @@ -1,7 +1,5 @@ @page "/prod-stop" - - @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) { diff --git a/MP-TAB3/Pages/ProdStop.razor.cs b/MP-TAB3/Pages/ProdStop.razor.cs index 2a167041..e4a9f1ec 100644 --- a/MP-TAB3/Pages/ProdStop.razor.cs +++ b/MP-TAB3/Pages/ProdStop.razor.cs @@ -3,6 +3,7 @@ using MP.Data; using MP.Data.DatabaseModels; using MP.Data.Services; using MP_TAB3.Components; +using Newtonsoft.Json; using NLog; namespace MP_TAB3.Pages @@ -15,7 +16,7 @@ namespace MP_TAB3.Pages { IdxMacc = ""; CurrMSE = null; - //GC.Collect(); + TDFeeder.dataPipe.EA_NewMessage -= DataPipe_EA_NewMessage; } #endregion Public Methods @@ -23,10 +24,15 @@ namespace MP_TAB3.Pages #region Protected Fields protected int dltMinRealtime = 1; + protected bool isProcessing = false; + protected int minAnticipoRicalcolo = 1; + protected bool rdm_ChkOnly = false; + protected int rdm_nEvCheck = 1; + protected int rdm_nEvStep = 1; #endregion Protected Fields @@ -79,6 +85,9 @@ namespace MP_TAB3.Pages [Inject] protected TabDataService TabDServ { get; set; } = null!; + [Inject] + protected TabDataFeeder TDFeeder { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -231,6 +240,7 @@ namespace MP_TAB3.Pages rdm_ChkOnly = SMServ.GetConfBool("rdm_ChkOnly"); // leggo gli altri dati await ReloadData(); + TDFeeder.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; } protected async Task RefreshData(List newList) @@ -274,6 +284,35 @@ namespace MP_TAB3.Pages #region Private Methods + /// + /// Ricevuto nuovi dati da mostrare! + /// + /// + /// + /// + private void DataPipe_EA_NewMessage(object? sender, EventArgs e) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + // conversione on-the-fly List --> allarmi + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + List? dataList = JsonConvert.DeserializeObject>(currArgs.newMessage); + if (dataList != null) + { + InvokeAsync(() => RefreshData(dataList)); + } + } + catch + { } + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + private async Task ReloadData() { if (string.IsNullOrEmpty(IdxMacc)) diff --git a/MP-TAB3/Pages/StatusMap.razor b/MP-TAB3/Pages/StatusMap.razor index 026b4b6e..f159c690 100644 --- a/MP-TAB3/Pages/StatusMap.razor +++ b/MP-TAB3/Pages/StatusMap.razor @@ -1,6 +1,5 @@ @page "/status-map" -@* *@
@if (ListMSE == null || ListMSE.Count == 0 || isCalcSize) diff --git a/MP-TAB3/Pages/StatusMap.razor.cs b/MP-TAB3/Pages/StatusMap.razor.cs index 86c56f47..d4565b54 100644 --- a/MP-TAB3/Pages/StatusMap.razor.cs +++ b/MP-TAB3/Pages/StatusMap.razor.cs @@ -19,7 +19,6 @@ namespace MP_TAB3.Pages { ListMSE = null; TDFeeder.dataPipe.EA_NewMessage -= DataPipe_EA_NewMessage; - TDFeeder.blinkPipe.EA_NewMessage -= BlinkPipe_EA_NewMessage; GC.Collect(); } @@ -134,13 +133,11 @@ namespace MP_TAB3.Pages } } - protected override async Task OnInitializedAsync() { ListMSE = null; setDefaults(); TDFeeder.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; - TDFeeder.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage; Random rnd = new Random(); await Task.Delay(rnd.Next(10, 20)); SetupConf(); @@ -183,29 +180,6 @@ namespace MP_TAB3.Pages #region Private Methods - private void BlinkPipe_EA_NewMessage(object? sender, EventArgs e) - { - PubSubEventArgs currArgs = (PubSubEventArgs)e; - // conversione on-the-fly List --> allarmi - if (!string.IsNullOrEmpty(currArgs.newMessage)) - { - try - { - var dataRaw = JsonConvert.DeserializeObject(currArgs.newMessage); - if (dataRaw != null) - { - bool.TryParse($"{dataRaw}", out doBlink); - } - } - catch - { } - InvokeAsync(() => - { - StateHasChanged(); - }); - } - } - /// /// Ricevuto nuovi dati da mostrare! /// @@ -223,23 +197,6 @@ namespace MP_TAB3.Pages List? dataList = JsonConvert.DeserializeObject>(currArgs.newMessage); if (dataList != null) { -#if false - // se ho filtro macchine --> tengo solo quelle che mi tornano... - if (listMacchine != null && listMacchine.Count > 0) - { - List listaFilt = new List(); - foreach (var item in listMacchine) - { - var rigaFilt = dataList.FirstOrDefault(x => x.IdxMacchina == item.IdxMacchina); - if (rigaFilt != null) - { - listaFilt.Add(rigaFilt); - } - } - dataList = listaFilt; - } - ListMSE = dataList; -#endif SaveData(dataList); } } @@ -248,11 +205,6 @@ namespace MP_TAB3.Pages } InvokeAsync(() => { -#if false - // attesa random 0-50ms... - Random rnd = new Random(); - Task.Delay(rnd.Next(5, 50)); -#endif StateHasChanged(); }); } @@ -266,7 +218,6 @@ namespace MP_TAB3.Pages isCalcSize = true; } - private void SetupConf() { // sistemo i parametri opzionali... diff --git a/MP-TAB3/Pages/TechSheet.razor b/MP-TAB3/Pages/TechSheet.razor index 5c37ccea..0ef96f07 100644 --- a/MP-TAB3/Pages/TechSheet.razor +++ b/MP-TAB3/Pages/TechSheet.razor @@ -1,7 +1,5 @@ @page "/tech-sheet" - - @if (string.IsNullOrEmpty(IdxMacc) || CurrMSE == null) { diff --git a/MP-TAB3/Pages/TechSheet.razor.cs b/MP-TAB3/Pages/TechSheet.razor.cs index e46cc31c..7ea742a9 100644 --- a/MP-TAB3/Pages/TechSheet.razor.cs +++ b/MP-TAB3/Pages/TechSheet.razor.cs @@ -1,6 +1,8 @@ using global::Microsoft.AspNetCore.Components; +using MP.Data; using MP.Data.DatabaseModels; using MP.Data.Services; +using Newtonsoft.Json; namespace MP_TAB3.Pages { @@ -12,7 +14,7 @@ namespace MP_TAB3.Pages { IdxMacc = ""; CurrMSE = null; - //GC.Collect(); + TDFeeder.dataPipe.EA_NewMessage -= DataPipe_EA_NewMessage; } #endregion Public Methods @@ -28,6 +30,9 @@ namespace MP_TAB3.Pages [Inject] protected TabDataService TabDServ { get; set; } = null!; + [Inject] + protected TabDataFeeder TDFeeder { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -35,6 +40,7 @@ namespace MP_TAB3.Pages protected override async Task OnInitializedAsync() { await ReloadData(); + TDFeeder.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; SetupConf(); } @@ -68,6 +74,35 @@ namespace MP_TAB3.Pages #region Private Methods + /// + /// Ricevuto nuovi dati da mostrare! + /// + /// + /// + /// + private void DataPipe_EA_NewMessage(object? sender, EventArgs e) + { + PubSubEventArgs currArgs = (PubSubEventArgs)e; + // conversione on-the-fly List --> allarmi + if (!string.IsNullOrEmpty(currArgs.newMessage)) + { + try + { + List? dataList = JsonConvert.DeserializeObject>(currArgs.newMessage); + if (dataList != null) + { + InvokeAsync(() => RefreshData(dataList)); + } + } + catch + { } + } + InvokeAsync(() => + { + StateHasChanged(); + }); + } + private async Task ReloadData() { if (string.IsNullOrEmpty(IdxMacc)) diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 6db9a4b9..1bd4c4f9 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2402.2616

+

Versione: 6.16.2402.2618


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index e0264aae..502eda9e 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2402.2616 +6.16.2402.2618 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index a61d4a2d..9889819e 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2402.2616 + 6.16.2402.2618 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP.Data/Services/StatusData.cs b/MP.Data/Services/StatusData.cs index f70bf9e6..067fc076 100644 --- a/MP.Data/Services/StatusData.cs +++ b/MP.Data/Services/StatusData.cs @@ -307,7 +307,7 @@ namespace MP.Data.Services /// /// Cache brevissima durata /// - private TimeSpan UltraFastCache = TimeSpan.FromMilliseconds(1000); + private TimeSpan UltraFastCache = TimeSpan.FromMilliseconds(1100); /// /// Cache lunga durata diff --git a/MP.Data/Services/TabDataFeeder.cs b/MP.Data/Services/TabDataFeeder.cs index 3a06692a..5d47434a 100644 --- a/MP.Data/Services/TabDataFeeder.cs +++ b/MP.Data/Services/TabDataFeeder.cs @@ -16,7 +16,9 @@ namespace MP.Data.Services // setup canali pub/sub dataPipe = new MessagePipe(redisConn, Constants.TAB_ACT_MSE_DATA_KEY, false); - blinkPipe = new MessagePipe(redisConn, Constants.TAB_ACT_BLINK_KEY, false); +#if false + blinkPipe = new MessagePipe(redisConn, Constants.TAB_ACT_BLINK_KEY, false); +#endif // avvio timers... startTimers(); @@ -26,7 +28,9 @@ namespace MP.Data.Services #region Public Properties - public MessagePipe blinkPipe { get; set; } = null!; +#if false + public MessagePipe blinkPipe { get; set; } = null!; +#endif public MessagePipe dataPipe { get; set; } = null!; @@ -89,26 +93,10 @@ namespace MP.Data.Services { var pUpd = Task.Run(async () => { - // secondi pari --> blink, secondi dispari --> ricarica - DateTime adesso = DateTime.Now; - int resto = 0; - Math.DivRem(adesso.Second, 2, out resto); - if (resto == 0) - { - // invio in channel blink il segnale - blinkPipe.sendMessage("true"); - Log.Debug("Elapsed Fast Timer Blink"); - } - else - { - // invio in channel blink segnale false - blinkPipe.sendMessage("false"); - // rileggo dati... - var newData = await MseGetAll(); - // invio tramite la pipe... - dataPipe.sendMessage(JsonConvert.SerializeObject(newData)); - Log.Debug("Elapsed Fast Timer reload"); - } + var newData = await MseGetAll(); + // invio tramite la pipe... + dataPipe.sendMessage(JsonConvert.SerializeObject(newData)); + Log.Debug("Elapsed Fast Timer reload"); }); pUpd.Wait(); }