Commit a852911b LN

增加配置,报警时可不显示闪烁图片

1 个父辈 988d33ee
...@@ -190,5 +190,7 @@ namespace TSA_V.Common ...@@ -190,5 +190,7 @@ namespace TSA_V.Common
/// 禁用继续未完成程序功能 /// 禁用继续未完成程序功能
/// </summary> /// </summary>
public static string DisContinueWorking = "DisContinueWorking"; public static string DisContinueWorking = "DisContinueWorking";
public static string DisShowScreenAlarm = "DisShowScreenAlarm";
} }
} }
...@@ -17,6 +17,8 @@ namespace TSA_V ...@@ -17,6 +17,8 @@ namespace TSA_V
public static bool AOIopen = false; public static bool AOIopen = false;
public static bool DisShowScreenAlarm = ConfigAppSettings.GetBoolValue(Setting_Init.DisShowScreenAlarm);
private static System.Timers.Timer proTimer = null; private static System.Timers.Timer proTimer = null;
private static bool InPlay = false; private static bool InPlay = false;
......
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
<!--禁用 继续未完成工作功能--> <!--禁用 继续未完成工作功能-->
<add key ="DisContinueWorking" value ="1"/> <add key ="DisContinueWorking" value ="1"/>
<add key ="DisShowScreenAlarm" value ="1"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="defaultAppender" type="log4net.Appender.RollingFileAppender"> <appender name="defaultAppender" type="log4net.Appender.RollingFileAppender">
......
...@@ -361,7 +361,7 @@ namespace TSA_V ...@@ -361,7 +361,7 @@ namespace TSA_V
panAoi.Visible = true; panAoi.Visible = true;
} }
else if (ProjectorProcess.IsAlarm(out string msg)) else if (ProjectorProcess.IsAlarm(out string msg))
{ {
panAoi.Visible = false; panAoi.Visible = false;
if (panel1.BackgroundImage != null) if (panel1.BackgroundImage != null)
{ {
...@@ -369,9 +369,15 @@ namespace TSA_V ...@@ -369,9 +369,15 @@ namespace TSA_V
} }
else else
{ {
panel1.BackgroundImage = ImageManager.imgAlarm; if (ProjectorProcess.DisShowScreenAlarm)
panel1.BackgroundImageLayout = ImageLayout.Zoom; {
}
else
{
panel1.BackgroundImage = ImageManager.imgAlarm;
panel1.BackgroundImageLayout = ImageLayout.Zoom;
}
lblAlarm.Text = msg; lblAlarm.Text = msg;
lblAlarm.Visible = true; lblAlarm.Visible = true;
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!