Skip to content

V
VC66_7C
Commit ddaf2a14 authored by hu's avatar hu
Browse files
Options

调整菜单显示逻辑

parent dca1a83b
Show whitespace changes
Inline Side-by-side
Showing with 23067 additions and 23003 deletions
ghs/project
View file @ ddaf2a14
No preview for this file type
ghs/project.hex
View file @ ddaf2a14
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ ddaf2a14
project .intvect 1536
project .text 319964
project .text 320124
project .rodata 411103
project .secinfo 120
project .syscall 6
......
source/Application/Graphic/GUI/GUI.c
View file @ ddaf2a14
......@@ -3705,9 +3705,10 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
......@@ -3770,9 +3771,10 @@ void GUI_BG_RepMenu_3_2_Display(uint8_t Mode)
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
......@@ -3835,9 +3837,10 @@ void GUI_BG_RepMenu_3_3_Display(uint8_t Mode)
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_2, GUI_BLENDMODE_SRC_OVER); /*请更换*/
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_2, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
......@@ -3900,9 +3903,10 @@ void GUI_BG_RepMenu_3_4_Display(uint8_t Mode)
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_5, GUI_BLENDMODE_SRC_OVER); /*请更换*/
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_5, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
......@@ -3965,9 +3969,10 @@ void GUI_BG_RepMenu_3_6_Display(uint8_t Mode)
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_25, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
......@@ -4030,9 +4035,11 @@ void GUI_BG_RepMenu_3_7_Display(uint8_t Mode)
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_8, GUI_BLENDMODE_SRC_OVER); /*请更换*/
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_8, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
......@@ -4095,9 +4102,10 @@ void GUI_BG_RepMenu_3_8_Display(uint8_t Mode)
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_19, GUI_BLENDMODE_SRC_OVER); /*请更换*/
if (User_FLAG == 1u)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_19, GUI_BLENDMODE_SRC_OVER); /*请更换*/
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER); /*负号*/
......@@ -5638,6 +5646,8 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode)
void Common_EOL_User_Server(void)
{
/*发动机油*/
if (State_Flag.User_FDJYLQQ_FLAG != 3u)
{
if (User_App.User_FDJYLQQ > 0 )
{
if (User_App.User_FDJYLQQ >= (Data_Read_Trip(EM_TRIP_JY) / 10u))
......@@ -5658,8 +5668,11 @@ void Common_EOL_User_Server(void)
{
State_Flag.User_FDJYLQQ_FLAG = 1;
}
}
/*燃油滤清器*/
if ( State_Flag.User_RYLQQ_FLAG != 3u)
{
if (User_App.User_RYLQQ > 0 )
{
if (User_App.User_RYLQQ >= (Data_Read_Trip(EM_TRIP_RY) / 10u))
......@@ -5680,8 +5693,11 @@ void Common_EOL_User_Server(void)
{
State_Flag.User_RYLQQ_FLAG = 1;
}
}
/*变速箱油*/
if (State_Flag.User_BSXY_FLAG != 3u)
{
if (User_App.User_BSXY > 0 )
{
if (User_App.User_BSXY >= (Data_Read_Trip(EM_TRIP_BSX) / 10u))
......@@ -5702,8 +5718,11 @@ void Common_EOL_User_Server(void)
{
State_Flag.User_BSXY_FLAG = 1;
}
}
/*差速器油*/
if (State_Flag.User_CSQY_FLAG != 3)
{
if (User_App.User_CSQY > 0 )
{
if (User_App.User_CSQY >= (Data_Read_Trip(EM_TRIP_CSQ) / 10u))
......@@ -5724,8 +5743,11 @@ void Common_EOL_User_Server(void)
{
State_Flag.User_CSQY_FLAG = 1;
}
}
/*空气干燥剂*/
if (State_Flag.User_KQGZJ_FLAG != 3u)
{
if (User_App.User_KQGZJ > 0 )
{
if (User_App.User_KQGZJ >= (Data_Read_Trip(EM_TRIP_KQGZJ) / 10u))
......@@ -5746,8 +5768,11 @@ void Common_EOL_User_Server(void)
{
State_Flag.User_KQGZJ_FLAG = 1;
}
}
/*动力转向油*/
if (State_Flag.User_DLZXY_FLAG != 3u)
{
if (User_App.User_DLZXY > 0 )
{
if (User_App.User_DLZXY >= (Data_Read_Trip(EM_TRIP_DLZX) / 10u))
......@@ -5768,8 +5793,11 @@ void Common_EOL_User_Server(void)
{
State_Flag.User_DLZXY_FLAG = 1;
}
}
/*轮胎*/
if (State_Flag.User_LT_FLAG != 3u)
{
if (User_App.User_LT > 0 )
{
if (User_App.User_LT >= (Data_Read_Trip(EM_TRIP_LT) / 10u))
......@@ -5790,4 +5818,5 @@ void Common_EOL_User_Server(void)
{
State_Flag.User_LT_FLAG = 1;
}
}
}
\ No newline at end of file
source/Application/Graphic/Menu/Menu_user.c
View file @ ddaf2a14
......@@ -835,10 +835,15 @@ void Level3_3Menu_1Exit(void)
MenuFlag.Menu_Return = 0u;
if (User_set_Num.User_FDJYLQQ != 0u)
{
State_Flag.User_FDJYLQQ_FLAG = 0u;
Data_Clear_Trip(EM_TRIP_JY);
}
else
{
State_Flag.User_FDJYLQQ_FLAG = 3u;
}
}
}
/*----三级菜单----保养通知设定----系列子菜单*/
......@@ -860,10 +865,15 @@ void Level3_3Menu_2Exit(void)
MenuFlag.Menu_Return = 0;
if (User_set_Num.User_RYLQQ != 0)
{
State_Flag.User_RYLQQ_FLAG = 0;
Data_Clear_Trip(EM_TRIP_RY);
}
else
{
State_Flag.User_RYLQQ_FLAG = 3;
}
}
}
/*----三级菜单----保养通知设定----系列子菜单*/
......@@ -885,10 +895,15 @@ void Level3_3Menu_3Exit(void)
MenuFlag.Menu_Return = 0;
if (User_set_Num.User_BSXY != 0)
{
State_Flag.User_BSXY_FLAG = 0;
Data_Clear_Trip(EM_TRIP_BSX);
}
else
{
State_Flag.User_BSXY_FLAG = 3;
}
}
}
/*----三级菜单----保养通知设定----系列子菜单*/
......@@ -910,10 +925,15 @@ void Level3_3Menu_4Exit(void)
MenuFlag.Menu_Return = 0;
if (User_set_Num.User_CSQY != 0)
{
State_Flag.User_CSQY_FLAG = 0;
Data_Clear_Trip(EM_TRIP_CSQ);
}
else
{
State_Flag.User_CSQY_FLAG = 3;
}
}
}
/*----三级菜单----保养通知设定----系列子菜单*/
......@@ -948,10 +968,15 @@ void Level3_3Menu_6Exit(void)
MenuFlag.Menu_Return = 0;
if (User_set_Num.User_DLZXY != 0)
{
State_Flag.User_DLZXY_FLAG = 0;
Data_Clear_Trip(EM_TRIP_DLZX);
}
else
{
State_Flag.User_DLZXY_FLAG = 3;
}
}
}
/*----三级菜单----保养通知设定----系列子菜单*/
......@@ -973,10 +998,15 @@ void Level3_3Menu_7Exit(void)
MenuFlag.Menu_Return = 0;
if (User_set_Num.User_LT != 0)
{
State_Flag.User_LT_FLAG = 0;
Data_Clear_Trip(EM_TRIP_LT);
}
else
{
State_Flag.User_LT_FLAG = 3;
}
}
}
/*----三级菜单----用户设定----系列子选项*/
......
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