From a2aff33576e0c0c829013ad9d0e14e9af1bafcfa Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 10 Nov 2017 17:22:51 +0100 Subject: [PATCH] Modifica x gestione download e "copia latest" delle build --- MP-Tablet/WebUserControls/mod_title.ascx | 7 ----- MP-Tablet/WebUserControls/mod_title.ascx.cs | 30 ------------------- .../mod_title.ascx.designer.cs | 27 ----------------- MP/Controllers/HomeController.cs | 14 ++++----- 4 files changed, 7 insertions(+), 71 deletions(-) diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index e623a229..c3ee44e2 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -16,13 +16,6 @@ | - -
- - - - -
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.cs b/MP-Tablet/WebUserControls/mod_title.ascx.cs index 80a70b20..38439ae7 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.cs @@ -149,36 +149,6 @@ namespace MoonProTablet.WebUserControls lblData.Text = string.Format("{0:dd/MM/yyyy - HH:mm:ss}", DateTime.Now); } /// - /// Effettua verifica versione... - /// - /// - /// - protected void lbtCheckUpdate_Click(object sender, EventArgs e) - { - // controllo versione - Version remoteVersion = UpdateMan.obj.getUpdateInfo(updateUrl).CurrentVersion; - // se c'รจ update mostro download... - if (remoteVersion > currVersion) - { - lbtDownloadUpdate.Text = string.Format("DOWNLOAD --> {0}", remoteVersion); - lbtDownloadUpdate.Visible = true; - lbtCheckUpdate.Visible = false; - } - } - /// - /// Richeista download ZIP update - /// - /// - /// - protected void lbtDownloadUpdate_Click(object sender, EventArgs e) - { - // scarico... - UpdateMan.obj.downloadLatest(updateUrl, localDownloadPath); - // nascondo button download - lbtDownloadUpdate.Visible = false; - lbtCheckUpdate.Visible = true; - } - /// /// Path locale dove scaricare gli installer /// protected string localDownloadPath diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs index c98a60fb..229e18a7 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs @@ -57,33 +57,6 @@ namespace MoonProTablet.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblVers; - /// - /// Controllo divCheckVers. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCheckVers; - - /// - /// Controllo lbtCheckUpdate. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtCheckUpdate; - - /// - /// Controllo lbtDownloadUpdate. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtDownloadUpdate; - /// /// Controllo Timer1. /// diff --git a/MP/Controllers/HomeController.cs b/MP/Controllers/HomeController.cs index f2b07b97..209b4170 100644 --- a/MP/Controllers/HomeController.cs +++ b/MP/Controllers/HomeController.cs @@ -157,12 +157,12 @@ namespace MP.Controllers stopWatch.Start(); int done = 0; // scarico TUTTI... - done += UpdateMan.obj.downloadLatest(updateUrl("ADM"), localDownloadPath("ADM")); - done += UpdateMan.obj.downloadLatest(updateUrl("IO"), localDownloadPath("IO")); - done += UpdateMan.obj.downloadLatest(updateUrl("LAND"), localDownloadPath("LAND")); - done += UpdateMan.obj.downloadLatest(updateUrl("MON"), localDownloadPath("MON")); - done += UpdateMan.obj.downloadLatest(updateUrl("SITE"), localDownloadPath("SITE")); - done += UpdateMan.obj.downloadLatest(updateUrl("TAB"), localDownloadPath("TAB")); + done += UpdateMan.obj.downloadLatest(updateUrl("ADM"), localDownloadPath("ADM"), "ADM"); + done += UpdateMan.obj.downloadLatest(updateUrl("IO"), localDownloadPath("IO"), "IO"); + done += UpdateMan.obj.downloadLatest(updateUrl("LAND"), localDownloadPath("LAND"), "LAND"); + done += UpdateMan.obj.downloadLatest(updateUrl("MON"), localDownloadPath("MON"),"MON"); + done += UpdateMan.obj.downloadLatest(updateUrl("SITE"), localDownloadPath("SITE"),"SITE"); + done += UpdateMan.obj.downloadLatest(updateUrl("TAB"), localDownloadPath("TAB"), "TAB"); stopWatch.Stop(); // calcolo elapsed time come TimeSpan value. TimeSpan ts = stopWatch.Elapsed; @@ -171,7 +171,7 @@ namespace MP.Controllers else { // scarico singolo target... - UpdateMan.obj.downloadLatest(updateUrl(caller), localDownloadPath(caller)); + UpdateMan.obj.downloadLatest(updateUrl(caller), localDownloadPath(caller), caller); resultsMsg = string.Format("OK: {0} DOWNLOADED | {1} --> {2}", caller, updateUrl(caller), localDownloadPath(caller)); } }