Merge branch 'shihao' into 'develop'

Shihao

See merge request !15

source/Appliciation/Key_user.c

@@ -14,7 +14,14 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)
 	switch (enKeyEvent)
 	{
 	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();
 		break;
 	case KEY_EVENT_SHORT_PRESS_2: