From 67c0c0d55c193d00ef6f3481e1f081d236bcab13 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 10 七月 2020 12:55:32 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index 1ff6cd5..2825f26 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -237,35 +237,38 @@
[Device("MotionOperationSet", "杩愬姩鎿嶄綔閰嶇疆鍩虹被", EnumHelper.DeviceAttributeType.OperationConfig)]
public class MotionCardOperationSet : IComplexDisplay
{
- [Category("IO鎿嶄綔閰嶇疆")]
- [DisplayName("IO棰勬鏌ュ畾涔夐泦鍚�")]
+ [Category("1.IO鎿嶄綔閰嶇疆")]
+ [DisplayName("1.IO棰勬鏌�")]
[Description("IO棰勬鏌ュ畾涔夐泦鍚�")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
public List<IORefrenceItem> PreCheckIOCollection { get; set; } = new List<IORefrenceItem>();
- [Category("IO鎿嶄綔閰嶇疆")]
+ [Category("1.IO鎿嶄綔閰嶇疆")]
[Description("瓒呮椂璁剧疆锛屽崟浣嶏細ms")]
- [DisplayName("IO棰勬鏌ヨ秴鏃�")]
+ [DisplayName("2.IO棰勬鏌ヨ秴鏃�")]
public int PreCheckIOTimeout { get; set; } = 0;
- [Category("IO鎿嶄綔閰嶇疆")]
- [DisplayName("IO杈撳嚭瀹氫箟闆嗗悎")]
+ [Category("1.IO鎿嶄綔閰嶇疆")]
+ [DisplayName("3.IO杈撳嚭")]
[Description("IO杈撳嚭瀹氫箟闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
+ [Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
public List<IORefrenceItem> IOOutputCollection { get; set; } = new List<IORefrenceItem>();
- [Category("IO鎿嶄綔閰嶇疆")]
- [DisplayName("IO纭瀹氫箟闆嗗悎")]
+ [Category("1.IO鎿嶄綔閰嶇疆")]
+ [DisplayName("4.IO杈撳嚭纭")]
[Description("IO纭瀹氫箟闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
+ [Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
public List<IORefrenceItem> IOConfirmCollection { get; set; } = new List<IORefrenceItem>();
- [Category("IO鎿嶄綔閰嶇疆")]
+
+ [Category("1.IO鎿嶄綔閰嶇疆")]
[Description("瓒呮椂璁剧疆锛屽崟浣嶏細ms")]
- [DisplayName("IO纭瓒呮椂")]
+ [DisplayName("5.IO杈撳嚭纭瓒呮椂")]
public int IOConfirmTimeout { get; set; } = 0;
- [Category("鏉垮崱杩愬姩閰嶇疆")]
+ [Category("2.鏉垮崱杩愬姩閰嶇疆")]
[DisplayName("杩愬姩閰嶇疆闆嗗悎")]
[Description("MovingOps锛氳繍鍔ㄩ厤缃泦鍚�")]
[TypeConverter(typeof(CollectionCountConvert))]
@@ -378,13 +381,13 @@
if (itemType == typeof(IORefrenceItem))
{
IORefrenceItem item = new IORefrenceItem();
- if ((this.Context.Instance is IOperationConfig opConfig) && !string.IsNullOrWhiteSpace(opConfig.DeviceId))
+ if (this.Context.Instance is MotionCardOperationSet set)
{
using (var scope = GlobalVar.Container.BeginLifetimeScope())
{
List<IDevice> deviceList = scope.Resolve<List<IDevice>>();
- var device = deviceList.FirstOrDefault(u => u.Id == opConfig.DeviceId);
+ var device = deviceList.FirstOrDefault(u => u.Id == set.MotionCardId);
if (device != null && (device is MotionCardBase motionCard))
{
@@ -411,9 +414,9 @@
public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
{
- if (context.Instance is IOperationConfig opConfig)
+ if (context.Instance is MotionCardOperationSet set)
{
- if (string.IsNullOrWhiteSpace(opConfig.DeviceId))
+ if (string.IsNullOrWhiteSpace(set.MotionCardId))
{
return base.EditValue(context, provider, value);
}
@@ -422,7 +425,7 @@
{
List<IDevice> deviceList = scope.Resolve<List<IDevice>>();
- var device = deviceList.FirstOrDefault(u => u.Id == opConfig.DeviceId);
+ var device = deviceList.FirstOrDefault(u => u.Id == set.MotionCardId);
if (device == null)
{
--
Gitblit v1.8.0