Egalware/mapo-mono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/20230331_UiRefreshMaint'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-03-31 15:06:13 +02:00
parent 3626ccad99 c3b2e7d0cf
commit 3b237db585
19 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.3112</Version>
<Version>1.2.2303.3114</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.ANALYZER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.3112</h4>
<h4>Version: 1.2.2303.3114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.3112
1.2.2303.3114
MP.MONO.ANALYZER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.3112</version>
<version>1.2.2303.3114</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.DECODER/MP.MONO.DECODER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.3112</Version>
<Version>1.2.2303.3114</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.DECODER/Program.cs
+3 -3
View File
@@ -1612,15 +1612,15 @@ void CounterRecvPipe_EA_NewMessage(object? sender, EventArgs e)
{
foreach (var item in incrSet)
{
// verifico i valori > soglia 1 minuto...
if (item.Value > 1)
// verifico i valori > soglia 5 minuti...
if (item.Value > 5)
{
// salvo
var countRec = countStatus.Where(x => x.CCode == item.Key || x.CodAlias == item.Key).FirstOrDefault();
if (countRec != null)
{
// attenzione valori in ore, incrementi in minuti!
countRec.ActualVal = Math.Round(countRec.ActualVal + item.Value/60, 3);
countRec.ActualVal = Math.Round(countRec.ActualVal + item.Value/60, 6);
// resetto
counterMan.resetAccum(item.Key);
}
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.3112</h4>
<h4>Version: 1.2.2303.3114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.3112
1.2.2303.3114
MP.MONO.DECODER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.3112</version>
<version>1.2.2303.3114</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.SIM/MP.MONO.SIM.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.3112</Version>
<Version>1.2.2303.3114</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.3112</h4>
<h4>Version: 1.2.2303.3114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.3112
1.2.2303.3114
MP.MONO.SIM/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.3112</version>
<version>1.2.2303.3114</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.UI/Components/ProgBar.razor
+13 -6
View File
@@ -1,17 +1,24 @@
@if (singleLine)
{
<div class="progress">
<div class="progress-bar @bgStyle" style="width:@(percWidth)%">@($"{currVal:N0} h | {percWidth}%")</div>
<div class="progress-bar @bgStyle" style="width:@(percWidthNum)%">@($"{currVal:N0} h | {percWidthNum}%")</div>
</div>
}
else
{
<div class="text-center @textStyle">
<span class="@warnClass"><i class="bi bi-exclamation-triangle-fill"></i></span> <b>@currVal.ToString("N0")</b> <span class="@warnClass"><i class="bi bi-exclamation-triangle-fill"></i></span>
<span class="@warnClass px-1"><i class="bi bi-exclamation-triangle-fill"></i></span> <b>@currVal.ToString("N0")</b> <sup>(@($"{maxVal:N0}"))</sup><span class="@warnClass px-1"><i class="bi bi-exclamation-triangle-fill"></i></span>
</div>
<div class="progress">
<div class="progress-bar @bgStyle" style="width:@(percWidth)%">@(percWidth)%</div>
<div class="progress-bar @bgStyle" style="width:@(percWidh)%;">
@if (percWidthNum > yelLim || percWidthNum <= 0)
{
<div>@(percWidthNum)%</div>
}
</div>
@if (percWidthNum <= yelLim && percWidthNum > 0)
{
<div>@(percWidthNum)%</div>
}
</div>
}
}
MP.MONO.UI/Components/ProgBar.razor.cs
+17 -1
View File
@@ -53,7 +53,23 @@ namespace MP.MONO.UI.Components
}
}
private int percWidth { get => (int)(100 * currVal / maxVal); }
private int percWidthNum { get => (int)(100 * currVal / maxVal); }
private int percWidh
{
get
{
int answ = percWidthNum;
if (answ <= 0)
{
answ = 100;
}
//else if (answ <= redLim)
//{
// answ = redLim;
//}
return answ;
}
}
private string textStyle
{
MP.MONO.UI/MP.MONO.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.3112</Version>
<Version>1.2.2303.3114</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.3112</h4>
<h4>Version: 1.2.2303.3114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.3112
1.2.2303.3114
MP.MONO.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.3112</version>
<version>1.2.2303.3114</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>