From 9cedbf3a4e9cc7c18df0b5424891f77c9dcb2988 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 11:21:43 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Process/ProcessControl.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index aa74dc0..35c3af7 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -484,7 +484,7 @@
#endregion
#region IMonitor鐩戝惉
- protected virtual void OnMonitorInvoke(DateTime dt, string deviceId, IDevice sourceDevice, MonitorSet monitorSet)
+ protected virtual void OnMonitorInvoke(DateTime dt, string deviceId, IDevice sourceDevice, IMonitorSet monitorSet)
{
string methodCode = monitorSet.MethodCode;
@@ -628,7 +628,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set.Id;
+ imgSetId = set?.Id;
return set.HImage;
}
@@ -642,9 +642,9 @@
#endregion
#region 鎶ヨ鍜孌ownTime
- ObservableCollection<WarningSet> _warningRemains = new ObservableCollection<WarningSet>();
+ ObservableCollection<IWarningSet> _warningRemains = new ObservableCollection<IWarningSet>();
- protected virtual void OnMonitorAlarm(DateTime dt, IDevice device, WarningSet warning)
+ protected virtual void OnMonitorAlarm(DateTime dt, IDevice device, IWarningSet warning)
{
if (warning.CurrentStatus)
{
--
Gitblit v1.8.0