Merge branch 'shihao' into 'develop'

修改在设置界面,有弹窗报警时,按右键可屏蔽弹窗报警,但不改变设置界面的数值

See merge request !12

source/Appliciation/Key_user.c

@@ -58,7 +58,14 @@ void Key_Operation_Right(Key_Event_en_t enKeyEvent)
 	switch (enKeyEvent)
 	{
 	case KEY_EVENT_SHORT_PRESS_1:	
-		Menu_Service(MENU_KEY_RIGHT_SHORT);
+		if(Pop_Alarm_Get_Current() < POP_ALARM_MAX)
+		{
+			;
+		}
+		else
+		{
+			Menu_Service(MENU_KEY_RIGHT_SHORT);
+		}
 		Pop_Alarm_Hide_Current();
 		break;
 	case KEY_EVENT_SHORT_PRESS_2: