UCS/UCS_schermsoftware
2
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Update last recieved data time

Browse Source
This commit is contained in:
Martijn Scheepers
2022-01-03 10:49:12 +01:00
parent e4bfd108f3
commit 870966f145
6 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
UCS.RemoteIDList/IMonitorObject.cs
View File

@@ -41,6 +41,7 @@ namespace UCS.RemoteIDList
event EventHandler<object> SendDataEvent;
event EventHandler OnlineEvent;
event EventHandler OfflineEvent;
event EventHandler UpdateLastData;
void SendStartupMessage();
void SetLastData(string data);

4
UCS.RemoteIDList/IOTMonitor.cs
View File

@@ -30,7 +30,8 @@ namespace UCS.RemoteIDList
public event EventHandler<object> SendDataEvent;
public event EventHandler OnlineEvent;
public event EventHandler OfflineEvent;
public event EventHandler UpdateLastData;
public IOTMonitor(RemoteIdListLine remoteIdListLine)
{
@@ -78,6 +79,7 @@ namespace UCS.RemoteIDList
ConnectionState = true;
OnlineEvent?.Invoke(this, null);
}
UpdateLastData?.Invoke(this, null);
}
public void StopMonitor()

3
UCS.RemoteIDList/RemoteIDList.cs
View File

@@ -18,6 +18,7 @@ namespace UCS.RemoteIDList
public static event EventHandler<object> SendDataEvent;
public static event EventHandler OnlineEvent;
public static event EventHandler OfflineEvent;
public static event EventHandler UpdateLastData;
public static void InitRemoteIdList(ref List<RemoteIdListLine> Remote_IDList)
@@ -44,6 +45,7 @@ namespace UCS.RemoteIDList
uDPMonitor.SendDataEvent += SendDataEvent;
uDPMonitor.OnlineEvent += OnlineEvent;
uDPMonitor.OfflineEvent += OfflineEvent;
uDPMonitor.UpdateLastData += UpdateLastData;
MonitorList.Add(uDPMonitor);
break;
case CommType.X:
@@ -108,6 +110,7 @@ namespace UCS.RemoteIDList
foreach (var item in MonitorList.Where(x => x.TxCom == type && x.RemoteId == remoteBoxID))
{
item.SetLastData(rxData);
//UpdateLastData?.Invoke(null, null);
}
}

4
UCS.RemoteIDList/UDPMonitor.cs
View File

@@ -31,6 +31,7 @@ namespace UCS.RemoteIDList
public event EventHandler<object> SendDataEvent;
public event EventHandler OnlineEvent;
public event EventHandler OfflineEvent;
public event EventHandler UpdateLastData;
private AutoResetEvent waitFordata = new AutoResetEvent(false);
@@ -103,6 +104,9 @@ namespace UCS.RemoteIDList
ConnectionState = true;
OnlineEvent?.Invoke(this, null);
}
UpdateLastData?.Invoke(this, null);
waitFordata.Set();
_timer.Start();
}

3
UCS.RemoteIDList/URLMonitor.cs
View File

@@ -37,6 +37,7 @@ namespace UCS.RemoteIDList
}
public event EventHandler OnlineEvent;
public event EventHandler OfflineEvent;
public event EventHandler UpdateLastData;
public URLMonitor(RemoteIdListLine remoteIdListLine)
{
@@ -98,6 +99,8 @@ namespace UCS.RemoteIDList
{
LastData = data;
LastDataDate = DateTime.Now;
UpdateLastData?.Invoke(this, null);
}
public void StopMonitor()

7
UCS/frmMain.vb
View File

@@ -223,6 +223,7 @@ Public Class FrmMain
AddHandler RemoteIDList.RemoteIDList.SendDataEvent, AddressOf RemoteIdListSendDataEventHandler
AddHandler RemoteIDList.RemoteIDList.OnlineEvent, AddressOf RemoteIdListOnlineEventHandler
AddHandler RemoteIDList.RemoteIDList.OfflineEvent, AddressOf RemoteIdListOfflineEventHandler
AddHandler RemoteIDList.RemoteIDList.UpdateLastData, AddressOf RemoteIdListUpdateLastDatahandler
RemoteIDList.RemoteIDList.InitRemoteIdList(UCSConfigFile.Remote_IDList)
'---------- Telemetry
@@ -722,7 +723,6 @@ Public Class FrmMain
'UCS.URLPost.URLPost.SendPing(monitorObject.RemoteId, Convert.ToInt64(data))
End If
End Sub
Friend Sub RemoteIdListOnlineEventHandler(sender As Object, e As EventArgs)
Dim monitorObject As IMonitorObject = DirectCast(sender, IMonitorObject)
@@ -749,6 +749,11 @@ Public Class FrmMain
Telemetry.Telemetry.UpdateConnectionState(monitorObject.UserInfo, monitorObject.RemoteId, monitorObject.ConnectionState, monitorObject.LastDataDate)
Telemetry.Telemetry.SendTelemetry()
End Sub
Friend Sub RemoteIdListUpdateLastDatahandler(sender As Object, e As EventArgs)
Dim monitorObject As IMonitorObject = DirectCast(sender, IMonitorObject)
Telemetry.Telemetry.UpdateConnectionState(monitorObject.UserInfo, monitorObject.RemoteId, monitorObject.ConnectionState, monitorObject.LastDataDate)
End Sub
Friend Sub ReceiveIotServerObjectHandler(sender As Object, message As IOTServer.PrtgMessage)
For Each channel In message.PrtgData.Result