fix branch x check update

This commit is contained in:
Samuele E. Locatelli
2018-09-12 09:02:26 +02:00
parent d736d879bf
commit 355abb37b3
+22 -18
View File
@@ -1,20 +1,16 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using AutoUpdaterDotNET;
using AutoUpdaterDotNET;
using IOB_UT;
using NLog;
using NLog.Targets;
using NLog.Config;
using NLog.Targets;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Drawing;
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
using System.Windows.Forms;
namespace IOB_WIN
{
@@ -25,7 +21,7 @@ namespace IOB_WIN
/// <summary>
/// Ramo applicazione (x update)
/// </summary>
protected string branchName = "develop";
protected string branchName = "master";
/// <summary>
/// Indirizzo server
/// </summary>
@@ -87,8 +83,16 @@ namespace IOB_WIN
lblComStats.Text = string.Format("{0} PLC --> {1} (MP/IO)", numPLC, MPIP);
// colore secondo valori... server !="ND" è ok, PLC > 0 è OK
int score = 0;
if (serverOk) score++;
if (numPLC > 0) score++;
if (serverOk)
{
score++;
}
if (numPLC > 0)
{
score++;
}
switch (score)
{
case 0:
@@ -332,13 +336,13 @@ namespace IOB_WIN
IniFile fIni = new IniFile(iniConfFile);
// salvo valori letti da INI file...
branchName = fIni.ReadString("BRANCH", "NAME", "develop");
branchName = fIni.ReadString("BRANCH", "NAME", "master");
MPIP = fIni.ReadString("SERVER", "MPIP", "ND");
MPURL = fIni.ReadString("SERVER", "MPURL", "/MP/IO");
CMDALIVE = fIni.ReadString("SERVER", "CMDALIVE", "/IOB");
CMDREBO = fIni.ReadString("SERVER", "CMDREBO", "/IOB/sendRebootGateway?GWIP=");
CMDIOB2CALL = fIni.ReadString("SERVER", "CMDIOB2CALL", "/IOB/getIob2call?GWIP=");
MAXCNC= fIni.ReadInteger("IOB", "MAXCNC", 1);
MAXCNC = fIni.ReadInteger("IOB", "MAXCNC", 1);
string STARTLIST = fIni.ReadString("IOB", "STARTLIST", "");
if (STARTLIST != "")
{
@@ -436,7 +440,7 @@ namespace IOB_WIN
/// Apre la finestra child con conf
/// </summary>
protected void openChild(string IOB)
{
{
if (IOB == null)
{
throw new ArgumentNullException(nameof(IOB));
@@ -490,7 +494,7 @@ namespace IOB_WIN
{
reqIOB = utils.callUrl(urlIob2call);
}
catch(Exception exc)
catch (Exception exc)
{
reqIOB = utils.CRS("defIOB");
}