tester
/
Reseter2
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

добавили форму истории

This commit is contained in:
klavirshik 2024-07-26 18:59:55 +02:00
parent face9ba963
commit adf1401a26
7 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Reseter2/PingResult.cs
View File

@ -13,11 +13,13 @@ namespace Reseter2
public long Ping { get; set; } public long Ping { get; set; }
public int TimeoutPing { get; set; } public int TimeoutPing { get; set; }
public IPAddress Ip; public IPAddress Ip;
public PingResult(long ping, int timeoutPing, IPAddress ip) public bool TimedOut;
public PingResult(long ping, int timeoutPing, IPAddress ip, bool timedOut)
{ {
Ping = ping; Ping = ping;
TimeoutPing = timeoutPing; TimeoutPing = timeoutPing;
Ip = ip; Ip = ip;
TimedOut = timedOut;
} }
} }
} }

2
Reseter2/Pinger.cs
View File

@ -47,7 +47,7 @@ namespace Reseter2
} }
} }
if (pingable) TimeoutCount++; if (pingable) TimeoutCount++;
return new PingResult(ping, TimeoutCount, Ip); return new PingResult(ping, TimeoutCount, Ip, pingable);
} }
} }

12
Reseter2/ReseteTask.cs
View File

@ -34,7 +34,17 @@ namespace Reseter2
if (task.IsCompleted){ if (task.IsCompleted){
//this.DataContrl(Ping().ToString(), Timeout().ToString()); //this.DataContrl(Ping().ToString(), Timeout().ToString());
pingResult = await task; pingResult = await task;
taskControl.DataContrl(pingResult.Ping.ToString() + "ms", pingResult.TimeoutPing.ToString(), pingResult.Ip, sw.Elapsed);
string p;
if (pingResult.TimedOut)
{
p = "----";
}
else
{
p = pingResult.Ping.ToString() + "ms";
}
taskControl.DataContrl(p, pingResult.TimeoutPing.ToString(), pingResult.Ip, sw.Elapsed);
StatusTask.Next(); StatusTask.Next();
task = Task.Run(StatusTask.Tick); task = Task.Run(StatusTask.Tick);
} }

4
Reseter2/Shutdown.cs
View File

@ -4,6 +4,7 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms;
namespace Reseter2 namespace Reseter2
{ {
@ -17,7 +18,8 @@ namespace Reseter2
{ {
if (param.Length > 0) if (param.Length > 0)
{ {
StartShutDown("-r -m \\\\" + param + "-f -t 5"); MessageBox.Show(@"-r -m \\" + param + " -f -t 5");
StartShutDown(@"-r -m \\" + param + " -f -t 5");
} }
} }

9
Reseter2/StatusReboot.cs
View File

@ -10,11 +10,12 @@ namespace Reseter2
internal class StatusReboot : AStatusTask internal class StatusReboot : AStatusTask
{ {
private int TimeCount; private int TimeCount;
private PingResult PingResult = new PingResult(0, 0, null);
private PingResult PingResult = new PingResult(0, 0, null, false);
public StatusReboot(ReseterTask reseterTask) : base(reseterTask) public StatusReboot(ReseterTask reseterTask) : base(reseterTask)
{ {
resetertask.SetNameStage("Отправляем команду перезагрузки"); resetertask.SetNameStage("Отправляем команду перезагрузки");
//Shutdown.RestartPC(reseterTask.Comp.GetName()); Shutdown.RestartPC(reseterTask.Comp.GetResetName());
} }
public override Task<PingResult> Tick() public override Task<PingResult> Tick()
@ -24,11 +25,11 @@ namespace Reseter2
} }
public override void Next() public override void Next()
{ {
if (PingResult.Ping == 0) if (PingResult.TimedOut == true)
{ {
TimeCount++; TimeCount++;
} }
if (TimeCount > 2) if (TimeCount > 3)
{ {
resetertask.StatusTask = new StatusRebooting(resetertask); resetertask.StatusTask = new StatusRebooting(resetertask);
} }

8
Reseter2/StatusRebooting.cs
View File

@ -9,7 +9,7 @@ namespace Reseter2
internal class StatusRebooting : AStatusTask internal class StatusRebooting : AStatusTask
{ {
private int TimeCount; private int TimeCount;
private PingResult PingResult = new PingResult(0, 0, null); private PingResult PingResult = new PingResult(0, 0, null, false);
public StatusRebooting(ReseterTask reseterTask) : base(reseterTask) public StatusRebooting(ReseterTask reseterTask) : base(reseterTask)
{ {
resetertask.SetNameStage("Перезагрузка"); resetertask.SetNameStage("Перезагрузка");
@ -23,13 +23,13 @@ namespace Reseter2
} }
public override void Next() public override void Next()
{ {
if (PingResult.Ping > 0) if (PingResult.TimedOut == false)
{ {
TimeCount++; TimeCount++;
} }
if (TimeCount > 10) if (TimeCount > 50)
{ {
resetertask.StatusTask = new StatusPreReboot(resetertask); resetertask.StatusTask = new StatusRebootSucces(resetertask);
} }
} }
} }

8
Reseter2/StausPreReboot.cs
View File

@ -9,7 +9,7 @@ namespace Reseter2
internal class StatusPreReboot : AStatusTask internal class StatusPreReboot : AStatusTask
{ {
private int time; private int time;
private PingResult PingResult = new PingResult(0,0,null); private PingResult PingResult = new PingResult(0,0,null, false);
public StatusPreReboot(ReseterTask reseterTask) : base(reseterTask) public StatusPreReboot(ReseterTask reseterTask) : base(reseterTask)
{ {
resetertask.SetNameStage("Проверка связи"); resetertask.SetNameStage("Проверка связи");
@ -26,13 +26,11 @@ namespace Reseter2
} }
public override void Next() public override void Next()
{ {
if (PingResult.Ping != null) if (!PingResult.TimedOut)
{
if (PingResult.Ping > 0)
{ {
resetertask.StatusTask = new StatusReboot(resetertask); resetertask.StatusTask = new StatusReboot(resetertask);
} }
}
} }