Skip to content

I
IVECO_NS216
Commit 4c088235 authored by 杨真东's avatar 杨真东
Browse files
Options

Merge branch 'shihao' into 'develop' 

Shihao

See merge request !15
parents 86f2683f f02df510
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
source/Appliciation/Key_user.c
View file @ 4c088235
...@@ -14,7 +14,14 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent) ...@@ -14,7 +14,14 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)
switch (enKeyEvent) switch (enKeyEvent)
{ {
case KEY_EVENT_SHORT_PRESS_1: case KEY_EVENT_SHORT_PRESS_1:
Menu_Service(MENU_KEY_LEFT_SHORT); if(Pop_Alarm_Get_Current() < POP_ALARM_MAX)//有报警时
{
;//不传按键动作
}
else
{
Menu_Service(MENU_KEY_LEFT_SHORT);//无报警时,传按键动作
}
Pop_Alarm_Hide_Current(); Pop_Alarm_Hide_Current();
break; break;
case KEY_EVENT_SHORT_PRESS_2: case KEY_EVENT_SHORT_PRESS_2:
......
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