From 34ee2c9c1e7287ca1002ede66a70bdbf9268cd27 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 02 七月 2020 18:22:46 +0800
Subject: [PATCH] 合并
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index 44eee94..271562e 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -25,6 +25,24 @@
public abstract ResponseMessage MoveToPoint(IOperationConfig opConfig);
public abstract void ResetAlarm();
public abstract ResponseMessage Run(IOperationConfig config);
+
+ public void ExcuteMonitorInvok(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet)
+ {
+ OnMonitorInvoke?.BeginInvoke(dateTime, invokeDevice, device, monitorSet, null, null);
+ }
+
+ public void ExcuteMonitorAlarm(DateTime dateTime, IDevice device, IWarningSet warningSet)
+ {
+ OnMonitorAlarm?.BeginInvoke(dateTime, device, warningSet, null, null);
+ }
+
+ public virtual MotionCardInitialConfigBase IConfig
+ {
+ get
+ {
+ return InitialConfig as MotionCardInitialConfigBase;
+ }
+ }
}
public class MotionCardInitialConfigBase : InitialConfigBase, IMonitorConfig
@@ -111,17 +129,20 @@
public class MotionCardOperationConfigBase : OperationConfigBase, IComplexDisplay
{
[Category("IO鎿嶄綔閰嶇疆")]
+ [DisplayName("IO棰勬鏌ュ畾涔夐泦鍚�")]
[Description("IO棰勬鏌ュ畾涔夐泦鍚�")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(IORefrenceItemCollectionEditor),typeof(UITypeEditor))]
+ [Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
public List<IORefrenceItem> PreCheckIOCollection { get; set; } = new List<IORefrenceItem>();
[Category("IO鎿嶄綔閰嶇疆")]
+ [DisplayName("IO杈撳嚭瀹氫箟闆嗗悎")]
[Description("IO杈撳嚭瀹氫箟闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
public List<IORefrenceItem> IOOutputCollection { get; set; } = new List<IORefrenceItem>();
[Category("IO鎿嶄綔閰嶇疆")]
+ [DisplayName("IO纭瀹氫箟闆嗗悎")]
[Description("IO纭瀹氫箟闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
public List<IORefrenceItem> IOConfirmCollection { get; set; } = new List<IORefrenceItem>();
@@ -244,6 +265,5 @@
// base.DestroyInstance(instance);//閲嶈锛佽嚜鍔ㄥ垹闄ょ粍浠剁殑璁捐鏃朵唬鐮侊紒
//}
}
-
}
--
Gitblit v1.8.0