Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
Thick-Common
Commits
a3159a6a
Commit
a3159a6a
authored
May 19, 2024
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 优化 测厚仪报警列表按报警码排列输出。
2. 优化 全屏报警框,确定 改为 OK.
parent
b19d5f9f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
Window_WarningTip.xaml.cs
...ntrolLibrary/FLY.ControlLibrary/Window_WarningTip.xaml.cs
+3
-3
ERRNO.cs
Project.FLY.Thick.Base/FLY.Thick.Base/Common/ERRNO.cs
+5
-0
No files found.
Project.FLY.ControlLibrary/FLY.ControlLibrary/Window_WarningTip.xaml.cs
View file @
a3159a6a
...
...
@@ -203,7 +203,7 @@ namespace FLY.ControlLibrary
/// <returns>ID</returns>
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>
/// 显示报警提示
...
...
@@ -216,13 +216,13 @@ namespace FLY.ControlLibrary
/// <param name="okcontent">确定按键 显示字符串</param>
/// <param name="okhandler">确定事件 回调函数</param>
/// <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
)
{
Current
=
new
Window_WarningTip
();
}
Current
.
Title
=
title
;
Current
.
Duration
=
duration
;
...
...
Project.FLY.Thick.Base/FLY.Thick.Base/Common/ERRNO.cs
View file @
a3159a6a
...
...
@@ -54,6 +54,11 @@ namespace FLY.Thick.Base.Common
list
.
Add
(
errno
);
}
}
list
.
Sort
((
e0
,
e1
)
=>
{
return
e0
.
Code
.
CompareTo
(
e1
.
Code
);
});
return
list
;
}
public
ERRNO
ERRNO_ALARM_TEST
=
new
ERRNO
()
{
Code
=
1
,
Description
=
"ALARM_TEST"
};
//"报警测试" };
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment