Ancora refactoring

This commit is contained in:
Samuele E. Locatelli
2019-03-07 14:20:03 +01:00
parent 6e1a02dbcd
commit 877d50d3a8
3 changed files with 71 additions and 72 deletions
+10 -10
View File
@@ -333,28 +333,28 @@ namespace MConnectSDK
{
// init in stato ND...
isHmiEnrolled = false,
cloudConnection = false,
localConnection = false,
source = Result.Source.offline,
callSuccess = false
cloudStatus = false,
localStatus = false,
source = Source.offline,
callResult = false
};
// verifico REDIS in primis
answ.localConnection = checkRedisAlive();
if (answ.localConnection)
answ.localStatus = checkRedisAlive();
if (answ.localStatus)
{
// cerco i TOKEN in REDIS...
answ.isAuth = !string.IsNullOrEmpty(refresh_token);
answ.isHmiEnrolled = enrollDate < DateTime.Now;
answ.source = Result.Source.local;
answ.source = Source.local;
}
// verifico chiamata server...
if (_currParam.testMode)
{
// Fingo che tutto vada bene e di conseguenza setto risposta...
answ.cloudConnection = true;
answ.source = Result.Source.cloud;
answ.callSuccess = true;
answ.cloudStatus = true;
answ.source = Source.cloud;
answ.callResult = true;
// attesa random...
Random r = new Random();
Thread.Sleep(100 + r.Next(0, 100));
+57 -58
View File
@@ -154,57 +154,6 @@
/// </summary>
public class Result
{
/// <summary>
/// Enum delle sorgenti di comunicazione
/// </summary>
public enum Source
{
/// <summary>
/// Piattaforma Cloud MaestroConnect
/// </summary>
cloud = 0,
/// <summary>
/// Storage cache locale
/// </summary>
local,
/// <summary>
/// Offline
/// </summary>
offline
}
/// <summary>
/// Enum per status
/// </summary>
public enum Status
{
KO = 0,
OK = 1
}
/// <summary>
/// Classe errore chiamata
/// </summary>
public class Error
{
/// <summary>
/// Enum per causali errori
/// </summary>
public enum Reason
{
NotFound = 0,
PwdMismatch
}
/// <summary>
/// Classe causale errore
/// </summary>
public Reason reason;
/// <summary>
/// Messaggio di dettaglio errore
/// </summary>
public string message;
}
/// <summary>
/// indica se l'applicazione abbia token di auth validi
/// </summary>
@@ -216,11 +165,11 @@
/// <summary>
/// Indica lo stato di disponibilità del CLOUD (= connesso)
/// </summary>
public bool cloudConnection = false;
public bool cloudStatus = false;
/// <summary>
/// Indica la disponibilità dello storage LOCALE (= connesso)
/// </summary>
public bool localConnection = false;
public bool localStatus = false;
/// <summary>
/// Sorgente da cui deriva l'esito dell'operazione
/// </summary>
@@ -228,15 +177,65 @@
/// <summary>
/// Indica se la chiamata sia andata a buon fine (success) oppure ci siano stati errori/problemi
/// </summary>
public bool callSuccess = false;
/// <summary>
/// Payload associato alla chiamata
/// </summary>
public PayLoad payLoad;
public bool callResult = false;
/// <summary>
/// Property class associata ad eventuale errore riscontrato
/// </summary>
public Error error;
/// <summary>
/// Payload associato alla chiamata
/// </summary>
public PayLoad payLoad;
}
/// <summary>
/// Enum delle sorgenti di comunicazione
/// </summary>
public enum Source
{
/// <summary>
/// Piattaforma Cloud MaestroConnect
/// </summary>
cloud = 0,
/// <summary>
/// Storage cache locale
/// </summary>
local,
/// <summary>
/// Offline
/// </summary>
offline
}
/// <summary>
/// Enum per status
/// </summary>
public enum Status
{
KO = 0,
OK = 1
}
/// <summary>
/// Classe errore chiamata
/// </summary>
public class Error
{
/// <summary>
/// Enum per causali errori
/// </summary>
public enum Reason
{
NotFound = 0,
PwdMismatch
}
/// <summary>
/// Classe causale errore
/// </summary>
public Reason reason;
/// <summary>
/// Messaggio di dettaglio errore
/// </summary>
public string message;
}
/// <summary>
+4 -4
View File
@@ -119,9 +119,9 @@ namespace TestClient
sb.AppendLine("-------------------------");
sb.AppendLine("isAuth: " + reqStatus.isAuth);
sb.AppendLine("isHmiEnrolled: " + reqStatus.isHmiEnrolled);
sb.AppendLine("cloudConnection: " + reqStatus.cloudConnection);
sb.AppendLine("localConnection: " + reqStatus.localConnection);
sb.AppendLine("callSuccess: " + reqStatus.callSuccess);
sb.AppendLine("cloudConnection: " + reqStatus.cloudStatus);
sb.AppendLine("localConnection: " + reqStatus.localStatus);
sb.AppendLine("callSuccess: " + reqStatus.callResult);
sb.AppendLine("-------------------------");
lblReqStatus.Text = sb.ToString();
sb.AppendLine("");
@@ -141,7 +141,7 @@ namespace TestClient
{
// aggiorno console...
lblConsole.Text = authData.outMessage;
// verifico se sia AUTH (altrimenti NON mostro codice e QR...)
// verifico se sia AUTH (altrimenti NON mostro codice e QR...)
if (authData.hasAuth || reqStatus.isAuth)
{
var currColor = Color.Orange;