Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-11 c0d59e233882ad489f45abc8eb0193ffa4fb8988

 src/Bro.Common.Device/DeviceBase/PLCBase.cs

@@ -122,7 +122,7 @@
            //PLCIConfig.MonitorSetCollection.ForEach(set =>
            Parallel.ForEach(PLCIConfig.MonitorSetCollection, set =>
             {
                 MonitorSet monitorSet = set as MonitorSet;
                 PLCMonitorSet monitorSet = set as PLCMonitorSet;
                 if (monitorSet.TriggerIndex < 0 || monitorSet.TriggerIndex >= tempNew.Count)
                 {
                     return;
@@ -153,7 +153,7 @@

        private void OnMethodInvoked(IAsyncResult ar)
        {
            MonitorSet monitorSet = ar.AsyncState as MonitorSet;
            PLCMonitorSet monitorSet = ar.AsyncState as PLCMonitorSet;

            ProcessResponse resValues = monitorSet.Response;

@@ -211,7 +211,7 @@
        }

        object _alarmLock = new object();
        private async void SaveAlarmCSVAsync(DateTime now, string plcName, WarningSet ws)
        private async void SaveAlarmCSVAsync(DateTime now, string plcName, PLCWarningSet ws)
        {
            await Task.Run(() =>
            {
@@ -281,7 +281,7 @@
            return locations;
        }

        public bool MoveToPoint(IOperationConfig opConfig)
        public ResponseMessage MoveToPoint(IOperationConfig opConfig)
        {
            throw new NotImplementedException();
        }
@@ -309,14 +309,14 @@
        [DisplayName("警报配置")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(WarningSetsEditor), typeof(UITypeEditor))]
        public List<WarningSet> WarningSetCollection { get; set; } = new List<WarningSet>();
        public List<PLCWarningSet> WarningSetCollection { get; set; } = new List<PLCWarningSet>();

        #region IMonitorConfig
        [Category("监听设置")]
        [Description("监听操作配置集合")]
        [DisplayName("监听配置")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MonitorSet>), typeof(UITypeEditor))]
        [Editor(typeof(ComplexCollectionEditor<PLCMonitorSet>), typeof(UITypeEditor))]
        public List<IMonitorSet> MonitorSetCollection { get; set; } = new List<IMonitorSet>();

        [Category("监听设置")]
@@ -481,9 +481,9 @@
            }
        }

        private List<WarningSet> GetWarningSets()
        private List<PLCWarningSet> GetWarningSets()
        {
            List<WarningSet> wsList = new List<WarningSet>();
            List<PLCWarningSet> wsList = new List<PLCWarningSet>();

            OpenFileDialog ofd = new OpenFileDialog();
            ofd.Multiselect = false;
@@ -500,7 +500,7 @@

                        if (!string.IsNullOrWhiteSpace(list[1]))
                        {
                            WarningSet ws = new WarningSet();
                            PLCWarningSet ws = new PLCWarningSet();

                            ws.WarningCode = list[0];
                            ws.WarningDescription = list[1];
@@ -536,7 +536,7 @@
        /// <returns></returns> 
        protected override Type CreateCollectionItemType()
        {
            return typeof(WarningSet);
            return typeof(PLCWarningSet);
        }

        protected override string GetDisplayText(object value)