From 4e60abd5f12b95618654d99ad71963e343f4ab26 Mon Sep 17 00:00:00 2001 From: wangsr Date: Wed, 31 Jan 2024 14:37:01 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=B7=BB=E5=8A=A0=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E7=81=AF=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainDetailControlAction.cs | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 7c60f54..13ae331 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -525,41 +525,73 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl switch (deviceNo) { case 1: + if (HslLanternSimpleE.HslLanternSimple1.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay1.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay1.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay1.DisplayText = "00:00"; break; case 2: + if (HslLanternSimpleE.HslLanternSimple2.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay2.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay2.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay2.DisplayText = "00:00"; break; case 3: + if (HslLanternSimpleE.HslLanternSimple3.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay3.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay3.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay3.DisplayText = "00:00"; break; case 4: + if (HslLanternSimpleE.HslLanternSimple4.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay4.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay4.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay4.DisplayText = "00:00"; break; case 5: + if (HslLanternSimpleE.HslLanternSimple5.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay5.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay5.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay5.DisplayText = "00:00"; break; case 6: + if (HslLanternSimpleE.HslLanternSimple6.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay6.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay6.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay6.DisplayText = "00:00"; break; case 7: + if (HslLanternSimpleE.HslLanternSimple7.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay7.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay7.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay7.DisplayText = "00:00"; break; case 8: + if (HslLanternSimpleE.HslLanternSimple8.LanternBackground == Color.DarkGray) + { + break; + } LedDisplayE.WetWaitDisPlay8.DisplayText = MixWaitTimeLed(record); LedDisplayE.WetWaitDisPlay8.ForeColor = MixTimeBackColor(record); LedDisplayE.RGVWaitDisPlay8.DisplayText = "00:00"; @@ -574,34 +606,66 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl switch (deviceNo) { case 1: + if (HslAlarmE.HslLanternAlarm1.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay1.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay1.ForeColor = RGVTimeBackColor(record); break; case 2: + if (HslAlarmE.HslLanternAlarm2.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay2.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay2.ForeColor = RGVTimeBackColor(record); break; case 3: + if (HslAlarmE.HslLanternAlarm3.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay3.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay3.ForeColor = RGVTimeBackColor(record); break; case 4: + if (HslAlarmE.HslLanternAlarm4.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay4.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay4.ForeColor = RGVTimeBackColor(record); break; case 5: + if (HslAlarmE.HslLanternAlarm5.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay5.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay5.ForeColor = RGVTimeBackColor(record); break; case 6: + if (HslAlarmE.HslLanternAlarm6.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay6.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay6.ForeColor = RGVTimeBackColor(record); break; case 7: + if (HslAlarmE.HslLanternAlarm7.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay7.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay7.ForeColor = RGVTimeBackColor(record); break; case 8: + if (HslAlarmE.HslLanternAlarm8.NormalColor == Color.DarkGray) + { + break; + } LedDisplayE.RGVWaitDisPlay8.DisplayText = RGVWaitTimeLed(record); LedDisplayE.RGVWaitDisPlay8.ForeColor = RGVTimeBackColor(record); break;