From f52302d69d60ce15b0d5b100e30082c5a6e9caa1 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 03 七月 2020 18:38:44 +0800
Subject: [PATCH] merge
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index d7d1a41..2ea2a37 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -27,12 +27,14 @@
public abstract void ResetAlarm();
public abstract ResponseMessage Run(IOperationConfig config);
- public void ExcuteMonitorInvoke(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet)
+ public virtual void ExcuteMonitorInvoke(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet)
{
- OnMonitorInvoke?.BeginInvoke(dateTime, invokeDevice, device, monitorSet, null, null);
+ OnMonitorInvoke?.BeginInvoke(dateTime, invokeDevice, device, monitorSet, OnMethodInvoked, null);
}
- public void ExcuteMonitorAlarm(DateTime dateTime, IDevice device, IWarningSet warningSet)
+ public abstract void OnMethodInvoked(IAsyncResult ar);
+
+ public virtual void ExcuteMonitorAlarm(DateTime dateTime, IDevice device, IWarningSet warningSet)
{
OnMonitorAlarm?.BeginInvoke(dateTime, device, warningSet, null, null);
}
@@ -140,6 +142,10 @@
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
public List<IORefrenceItem> PreCheckIOCollection { get; set; } = new List<IORefrenceItem>();
+ [Category("IO鎿嶄綔閰嶇疆")]
+ [Description("瓒呮椂璁剧疆锛屽崟浣嶏細ms")]
+ [DisplayName("IO棰勬鏌ヨ秴鏃�")]
+ public int PreCheckIOTimeout { get; set; } = 0;
[Category("IO鎿嶄綔閰嶇疆")]
[DisplayName("IO杈撳嚭瀹氫箟闆嗗悎")]
@@ -152,6 +158,10 @@
[Description("IO纭瀹氫箟闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
public List<IORefrenceItem> IOConfirmCollection { get; set; } = new List<IORefrenceItem>();
+ [Category("IO鎿嶄綔閰嶇疆")]
+ [Description("瓒呮椂璁剧疆锛屽崟浣嶏細ms")]
+ [DisplayName("IO纭瓒呮椂")]
+ public int IOConfirmTimeout { get; set; } = 0;
[Category("鏉垮崱杩愬姩閰嶇疆")]
[DisplayName("杩愬姩閰嶇疆闆嗗悎")]
@@ -159,6 +169,10 @@
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();
+ [Category("鏉垮崱杩愬姩閰嶇疆")]
+ [Description("瓒呮椂璁剧疆锛屽崟浣嶏細ms")]
+ [DisplayName("杩愬姩瓒呮椂")]
+ public int MovingTimeout { get; set; } = 0;
public string GetDisplayText()
{
--
Gitblit v1.8.0