diff --git a/全自动水压检测仪/NormalTemperatureMode.cs b/全自动水压检测仪/NormalTemperatureMode.cs index ec4ef8f..79321e9 100644 --- a/全自动水压检测仪/NormalTemperatureMode.cs +++ b/全自动水压检测仪/NormalTemperatureMode.cs @@ -707,21 +707,13 @@ namespace 全自动水压检测仪 UpdateLiquidLevelStatusBar(_highTempLevelBarSegments, highSensorA, highSensorB, "高温液位"); } - bool normalAlert = TryGetCoilValue(a, out bool normalStopSensorA) && - TryGetCoilValue(b, out bool normalStopSensorB) && - IsLiquidLevelAlertState(normalStopSensorA, normalStopSensorB); - bool highAlert = TryGetCoilValue(cc, out bool highStopSensorA) && - TryGetCoilValue(d, out bool highStopSensorB) && - IsLiquidLevelAlertState(highStopSensorA, highStopSensorB); + #region 调用停止 + if (!a[0] || !cc[0]) - if (normalAlert || highAlert) { - StopTestForLiquidLevelAlert("ReadAndUpdateData"); - } - else - { - _liquidLevelStopIssued = false; + ma?.BtnClickFunctionForNew(Function.ButtonType.复归型, 10082); } + #endregion //// 更新进度条 //if (uiProcessBar1 != null && !uiProcessBar1.IsDisposed)