merge

xcd

2020-07-03 f52302d69d60ce15b0d5b100e30082c5a6e9caa1

merge

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

@@ -196,7 +196,7 @@

        public virtual async void SaveOriginImage(Bitmap map, Bitmap showImage, string imgSetId)
        {
            Task.Run(() =>
            await Task.Run(() =>
            {
                OnImageUpdated?.Invoke(this, showImage, imgSetId);
            });

 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()
        {

 src/Bro.Device.GTSCard/GTSCardDriver.cs

@@ -23,7 +23,7 @@
        // 异常事件
        public Action<Exception> OnExceptionRaised;

        public GTSCardInitialConfig IConfig
        public GTSCardInitialConfig IIConfig
        {
            get
            {
@@ -77,7 +77,10 @@

        public override ResponseMessage Run(IOperationConfig config)
        {
            throw new NotImplementedException();
            ResponseMessage responseMessage = new ResponseMessage();


            return responseMessage;
        }
        #endregion

@@ -770,7 +773,7 @@
            });
        }

        private void OnMethodInvoked(IAsyncResult ar)
        public override void OnMethodInvoked(IAsyncResult ar)
        {
            MotionCardMonitorSet monitorSet = ar.AsyncState as MotionCardMonitorSet;
            ProcessResponse resValues = monitorSet.Response;