From 188a8a959f552334964eb6c56645f4653886525e Mon Sep 17 00:00:00 2001 From: Liang Su Date: Wed, 14 Jun 2023 14:59:22 +0800 Subject: [PATCH] =?UTF-8?q?[Common]=20=E4=BF=AE=E6=AD=A3SignalTowerPartBas?= =?UTF-8?q?e=E5=AF=B9=E8=B1=A1=E6=89=A7=E8=A1=8CReset()=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=5Faction=E5=AD=97=E6=AE=B5=E4=B8=BAnull?= =?UTF-8?q?=E5=BC=95=E5=8F=91=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/Device/Bases/SignalTowerPartBase.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerPartBase.cs b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerPartBase.cs index b5ddf2e..d0c3849 100644 --- a/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerPartBase.cs +++ b/MECF.Framework.Common/MECF/Framework/Common/Device/Bases/SignalTowerPartBase.cs @@ -5,6 +5,7 @@ using Aitex.Core.RT.Device; using Aitex.Core.RT.IOCore; using Aitex.Core.RT.Log; using Aitex.Core.Util; +using SciChart.Charting2D.Interop; using BlinkDataType = System.Collections.Generic.KeyValuePair; namespace MECF.Framework.Common.Device.Bases @@ -347,11 +348,13 @@ namespace MECF.Framework.Common.Device.Bases { // 复位后状态机回到Idle状态 _blinkStage = FsmStateBlink.Idle; - - _blinkCycleDownCounter = 0; - _action.Status = TowerLightStatus.Off; - _doLight.Value = false; + if (_action != null) + _action.Status = TowerLightStatus.Off; + + _blinkCycleDownCounter = 0; + _doLight.Value = false; + _qBlinkData?.Clear(); _timBlinkOn?.Stop(); _timBlinkOff?.Stop();