Commit 411f87f0 authored by hu's avatar hu

调整报警逻辑,显示状态

parent bc1ecddc
This diff is collapsed.
...@@ -5898,6 +5898,7 @@ void GUI_General_Popup(void) ...@@ -5898,6 +5898,7 @@ void GUI_General_Popup(void)
PopupSnd = Popup_Get_Current_Sound(); PopupSnd = Popup_Get_Current_Sound();
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
Popups_Displaying(PopupMsg); Popups_Displaying(PopupMsg);
Popups_Sound_Playing(PopupSnd); Popups_Sound_Playing(PopupSnd);
...@@ -5913,25 +5914,39 @@ void GUI_General_Popup_Display(uint16_t PopupMsg) ...@@ -5913,25 +5914,39 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
{ {
uint16_t V_Speed = 0u; uint16_t V_Speed = 0u;
//if (PopupMsg >= POPUP_MSG_NUMBER_TOTAL) if (PopupMsg >= POPUP_MSG_NUMBER_TOTAL)
//{ {
// return; return;
//} }
V_Speed = Common_Get_Act_V_Speed(); V_Speed = Common_Get_Act_V_Speed();
if (V_Speed > 66u) /*有车速*/ if (V_Speed > 66u) /*有车速*/
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红*/ if ((PopupMsg == POPUP1_MSG_BRAKE_BLACK) || (PopupMsg == POPUP1_MSG_BRAKE_BRAKE))
//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑*/ {
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红底*/
}
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑底*/
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM); GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN1, GUI_BLENDMODE_CUSTOM); GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN1, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN2, GUI_BLENDMODE_CUSTOM); GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN2, GUI_BLENDMODE_CUSTOM);
} }
else else
{ {
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红*/ if ((PopupMsg == POPUP1_MSG_BRAKE_BLACK) || (PopupMsg == POPUP1_MSG_BRAKE_BRAKE))
//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑*/ {
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_image, GUI_BLENDMODE_SRC_OVER); /*红底*/
}
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑底*/
}
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM); GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].PICIcon, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN3, GUI_BLENDMODE_CUSTOM); GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN3, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN4, GUI_BLENDMODE_CUSTOM); GUI_General_Display(MultiPurpose_Sprite, GUIGeneralPopupTable[PopupMsg].HImageCN4, GUI_BLENDMODE_CUSTOM);
......
...@@ -222,7 +222,6 @@ void GUI_DisplayServices(void) ...@@ -222,7 +222,6 @@ void GUI_DisplayServices(void)
} }
GUI_General_Popup(); GUI_General_Popup();
GUI_Dynamic_DIsplay();
} }
else else
{ {
......
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