Egalware/limanapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update display multiline x KeyGen da MachineInfo

Browse Source
This commit is contained in:
Samuele Locatelli
2022-06-08 14:58:58 +02:00
parent bf8f455c0c
commit ecaabd56ec
9 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/MachineDataValidator.cs
+24 -9
View File
@@ -98,15 +98,15 @@ namespace Core
try
{
// calcolo hashKey da alcuni valori solamente
sb.Append($"{machTestData["SystemName"]}|");
sb.Append($"{machTestData["ProcessorId"]}|");
sb.Append($"{machTestData["PartNumber"]}|");
sb.Append($"{machTestData["MACAddress"]}|");
sb.Append($"{machTestData["SerialNumber"]}|");
sb.Append($"{machTestData["Architecture"]}|");
sb.Append($"{machTestData["SoftwareElementID"]}|");
sb.Append($"{machTestData["SystemBiosMajorVersion"]}|");
sb.Append($"{machTestData["SystemBiosMinorVersion"]}|");
sb.Append($"{getDictVal("SystemName")}|");
sb.Append($"{getDictVal("ProcessorId")}|");
sb.Append($"{getDictVal("PartNumber")}|");
sb.Append($"{getDictVal("MACAddress")}|");
sb.Append($"{getDictVal("SerialNumber")}|");
sb.Append($"{getDictVal("Architecture")}|");
sb.Append($"{getDictVal("SoftwareElementID")}|");
sb.Append($"{getDictVal("SystemBiosMajorVersion")}|");
sb.Append($"{getDictVal("SystemBiosMinorVersion")}|");
if (sb.Length > 0)
{
answ = sb.ToString();
@@ -119,6 +119,21 @@ namespace Core
return answ;
}
/// <summary>
/// Recupera info da dictionary
/// </summary>
/// <param name="keyName"></param>
/// <returns></returns>
private string getDictVal(string keyName)
{
string answ = $"{keyName}{keyName}";
if (machTestData.ContainsKey(keyName))
{
answ = machTestData[keyName];
}
return answ;
}
/// <summary>
/// Esegue reverse delal stringa
/// </summary>
LiMan.Transfer/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 1.1.2206.0812</h4>
<h4>Versione: 1.1.2206.0814</h4>
<br />
Note di rilascio:
<ul>
LiMan.Transfer/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2206.0812
1.1.2206.0814
LiMan.Transfer/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2206.0812</version>
<version>1.1.2206.0814</version>
<url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
LiMan.UI/Components/MachineKeyGen.razor
+23 -11
View File
@@ -2,27 +2,37 @@
<div class="row">
@if (!string.IsNullOrEmpty(@rawData))
{
@if (!string.IsNullOrEmpty(@keyGen))
{
<div class="col-12">
<CopyToClipboard Text="@keyGen" ShowText="true" />
</div>
}
<div class="col-8">
@if (!string.IsNullOrEmpty(@keyGen))
{
<p>Click to Copy Generated Key to Clipboard</p>
}
</div>
<div class="col-4 text-right">
<button class="btn btn-outline-success" type="button" @onclick="() => GenerateKey()">Generate Key from data <i class="fas fa-key"></i></button>
</div>
}
<div class="col-12">
Paste File Content Here
<div class="input-group mb-2">
<input type="text" rows="6" class="form-control" placeholder="license key" aria-label="license key" @bind-value="@rawData">
<textarea @bind="rawData" @bind:event="oninput" rows="12" class="form-control" placeholder="paste machine data here" aria-label="paste machine data here" @onchange="() => GenerateKey()" />
</div>
<p class="text-danger">@errorMsg</p>
</div>
<div class="col-12 text-right">
<button class="btn btn-outline-success" type="button" @onclick="() => GenerateKey()">Generate Key from data <i class="fas fa-key"></i></button>
</div>
@if (!string.IsNullOrEmpty(@keyGen))
{
<div class="col-12">
Click to Copy Generated Key to Clipboard
<CopyToClipboard Text="@keyGen" ShowText="true" />
</div>
}
</div>
@code {
private string rawData { get; set; } = "";
private string keyGen { get; set; } = "";
private string errorMsg { get; set; } = "";
private async Task GenerateKey()
{
@@ -33,10 +43,12 @@
if (cMDV.hasValidData)
{
keyGen = cMDV.machineKeyHash;
errorMsg = "";
}
else
{
keyGen = "";
errorMsg = "Invalid Content Value!!!";
}
}
await Task.Delay(1);
LiMan.UI/LiMan.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>1.1.2206.0812</Version>
<Version>1.1.2206.0814</Version>
<RootNamespace>LiMan.UI</RootNamespace>
<AssemblyName>LiMan.UI</AssemblyName>
</PropertyGroup>
LiMan.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 1.1.2206.0812</h4>
<h4>Versione: 1.1.2206.0814</h4>
<br /> Note di rilascio:
<ul>
<li>
LiMan.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2206.0812
1.1.2206.0814
LiMan.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2206.0812</version>
<version>1.1.2206.0814</version>
<url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>