Commit a3159a6a authored by 潘栩锋's avatar 潘栩锋 🚴

1. 优化 测厚仪报警列表按报警码排列输出。

2. 优化 全屏报警框,确定 改为 OK.
parent b19d5f9f
...@@ -203,7 +203,7 @@ namespace FLY.ControlLibrary ...@@ -203,7 +203,7 @@ namespace FLY.ControlLibrary
/// <returns>ID</returns> /// <returns>ID</returns>
public static int Show(string title, string message, TimeSpan duration, string musicpath, Action stophandler) public static int Show(string title, string message, TimeSpan duration, string musicpath, Action stophandler)
{ {
return Show(title, message, duration, musicpath, stophandler, "确定", null); return Show(title, message, duration, musicpath, stophandler, "OK", null);
} }
/// <summary> /// <summary>
/// 显示报警提示 /// 显示报警提示
...@@ -216,7 +216,7 @@ namespace FLY.ControlLibrary ...@@ -216,7 +216,7 @@ namespace FLY.ControlLibrary
/// <param name="okcontent">确定按键 显示字符串</param> /// <param name="okcontent">确定按键 显示字符串</param>
/// <param name="okhandler">确定事件 回调函数</param> /// <param name="okhandler">确定事件 回调函数</param>
/// <returns>ID</returns> /// <returns>ID</returns>
public static int Show(string title, string message, TimeSpan duration, string musicpath, Action stophandler, string okcontent, Action okhandler) public static int Show(string title, string message, TimeSpan duration, string musicpath=null, Action stophandler=null, string okcontent="OK", Action okhandler=null)
{ {
if (Current == null) if (Current == null)
{ {
......
...@@ -54,6 +54,11 @@ namespace FLY.Thick.Base.Common ...@@ -54,6 +54,11 @@ namespace FLY.Thick.Base.Common
list.Add(errno); list.Add(errno);
} }
} }
list.Sort((e0, e1) =>
{
return e0.Code.CompareTo(e1.Code);
});
return list; return list;
} }
public ERRNO ERRNO_ALARM_TEST = new ERRNO() { Code = 1, Description = "ALARM_TEST" };//"报警测试" }; public ERRNO ERRNO_ALARM_TEST = new ERRNO() { Code = 1, Description = "ALARM_TEST" };//"报警测试" };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment