From c01cce7ac1dc691c6b667b298ce0637b924102ea Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 14 七月 2020 16:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Process/ProcessControl.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 948b3c0..ca587d2 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -21,7 +21,7 @@
using System.Threading.Tasks;
using static Bro.Common.Helper.EnumHelper;
-namespace Bro.Process
+namespace Bro.Process
{
[Process("", DeviceAttributeType.Device)]
public partial class ProcessControl : IProcess
@@ -527,7 +527,7 @@
object res = null;
int reTryTimes = config.ReTryTimes;
IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == deviceId);
- LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}寮�濮�", "");
+ LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}寮�濮�", "");
Stopwatch sw = new Stopwatch();
sw.Start();
@@ -603,8 +603,8 @@
#endregion
sw.Stop();
- LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
- TimeRecordCSV(DateTime.Now, device.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
+ LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
+ TimeRecordCSV(DateTime.Now, device?.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
}
/// <summary>
@@ -626,7 +626,7 @@
#endregion
#region 鍥惧儚澶勭悊
- protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
+ protected IImageSet CollectHImage(CameraBase camera, IOperationConfig opConfig, [CallerMemberName]string methodCode = "")
{
IImageSet set = null;
@@ -675,8 +675,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set?.Id;
- return set.HImage;
+ return set;
}
protected async void CameraUpdateImage(CameraBase camera, Bitmap image, string setId)
--
Gitblit v1.8.0