Aggiunta ritardi in login e check lastOpenedPage x TAB3 e win11

2024-02-21 10:19:39 +01:00
parent 0097b48ba5
commit 9d74e8dcb0
6 changed files with 10 additions and 7 deletions
@@ -81,13 +81,13 @@ namespace MP_TAB3.Components
                {
                    done = await MsgServ.DoLogIn(decodValue, true);
                }
-                if (done )
+                if (done && !string.IsNullOrEmpty(LastOpenedPage))
                {
-                    if (!string.IsNullOrEmpty(LastOpenedPage) && !string.IsNullOrEmpty(CurrMacc))
+                    if (!string.IsNullOrEmpty(CurrMacc))
                    {
                        NavMan.NavigateTo(LastOpenedPage);
                    }
-                    else if(!NavMan.Uri.Contains(LastOpenedPage))
+                    else
                    {
                        NavMan.NavigateTo("status-map");
                    }
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
-      <Version>6.16.2402.1919</Version>
+      <Version>6.16.2402.2110</Version>
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>MP_TAB3</RootNamespace>
  </PropertyGroup>
@@ -94,6 +94,7 @@ namespace MP_TAB3.Pages
                var deHash = TDService.DecryptData(authKey);
                rigaOpr = await TDService.OperatoreSearch(matrOpr, deHash);
            }
+            await Task.Delay(50);
            if (rigaOpr != null && rigaOpr.MatrOpr > 0)
            {
                userTknDTO newUserTkn = new userTknDTO()
@@ -105,9 +106,11 @@ namespace MP_TAB3.Pages
                var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
                string hash = TDService.EncryptData(jsonTkn);
                MsgServ.RigaOper = rigaOpr;
+                await Task.Delay(50);
                await MsgServ.SetCurrOperDtoLSAsync(hash);
                await MsgServ.SetLastMatrOprAsync(rigaOpr.MatrOpr);
                await TDService.OperatoreSetRedis(matrOpr, hash, devGuid);
+                await Task.Delay(50);
                NavMan.NavigateTo("status-map", true);
            }
            else
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2402.1919</h4>
+    <h4>Versione: 6.16.2402.2110</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2402.1919
+6.16.2402.2110
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2402.1919</version>
+  <version>6.16.2402.2110</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>