diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs index 2b9e77f..ed6aee3 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs @@ -658,6 +658,15 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver } string str = sb.ToString(); + if (string.IsNullOrWhiteSpace(str)) + { + ControlsHelper.SetSwitchLight(SwitchlightE.AlarmIndicate, true, false); + } + else + { + ControlsHelper.SetSwitchLight(SwitchlightE.AlarmIndicate, false, true); + } + SwitchlightE.AlarmIndicate.BackColor = Color.Transparent; str = str.Replace("\r\n", string.Empty); if (str != AlarmString) { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs index 5a49a2a..28f5f84 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/Entity/DeliverEntity.cs @@ -194,7 +194,8 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver.Entity public SwitchLight HighLevel1 { get; set; } public SwitchLight HighLevel2 { get; set; } public SwitchLight HighLevel3 { get; set; } - + public SwitchLight AlarmIndicate { get; set; } + } internal class JzfEntity diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml index 9608f56..0e1f4d0 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml @@ -1,7 +1,54 @@ - + + + + Red + DarkGray + + + False + + + + None + True + True + 报警指示 + 宋体, 9pt + ButtonHighlight + 1617, 881 + MCLabel238 + 53, 12 + + + + 1681, 874 + AlarmIndicate + 27, 28 + + + + + Red + DarkGray + + + False + + + + None + True + True + 侧吹 + ButtonHighlight + 310, 126 + agsfbsg + 29, 12 + + Red @@ -18,8 +65,7 @@ 激振器 ButtonHighlight 285, 109 - - + fdsbfs 41, 12 @@ -439,7 +485,7 @@ 23, 874 AlarmMoveText - 1685, 30 + 1577, 30