Skip to content

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

调整界面数据显示

parent a72aac99
Hide whitespace changes
Inline Side-by-side
Showing with 23106 additions and 23009 deletions
ghs/project
View file @ 648de35b
No preview for this file type
ghs/project.hex
View file @ 648de35b
This source diff could not be displayed because it is too large. You can view the blob instead.
ghs/project.siz
View file @ 648de35b
project .intvect 1536
project .text 320956
project .text 321596
project .rodata 411103
project .secinfo 120
project .syscall 6
......
source/Application/Graphic/GUI/GUI.c
View file @ 648de35b
......@@ -3677,7 +3677,7 @@ void GUI_BG_RepMenu_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint32_t User_Value = 0u;
uint8_t User_FLAG = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
......@@ -3743,7 +3743,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_2_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint32_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
......@@ -3809,7 +3809,7 @@ void GUI_BG_RepMenu_3_2_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_3_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint32_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
......@@ -3875,7 +3875,7 @@ void GUI_BG_RepMenu_3_3_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_4_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint32_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
......@@ -3941,7 +3941,7 @@ void GUI_BG_RepMenu_3_4_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_6_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint32_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
......@@ -4007,7 +4007,7 @@ void GUI_BG_RepMenu_3_6_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_7_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint32_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
......@@ -4074,7 +4074,7 @@ void GUI_BG_RepMenu_3_7_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepMenu_3_8_Display(uint8_t Mode)
{
uint16_t User_Value = 0u;
uint32_t User_Value = 0u;
uint8_t User_FLAG = 1u;
if (Mode == GUI_DISP_MODE_NORMAL)
......@@ -4163,13 +4163,17 @@ void GUI_BG_RepMenuSet_Menu_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepSetMenu_3_1_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
User_Value = User_set_Num.User_FDJYLQQ; /*显示数据*/
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_1, GUI_BLENDMODE_SRC_OVER); /*menu*/
if (User_set_Num.User_FDJYLQQ)
if (User_Value)
{
if (User_set_Num.User_FDJYLQQ > 999)
if (User_Value > 999)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 471u, 255u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
......@@ -4178,7 +4182,7 @@ void GUI_BG_RepSetMenu_3_1_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_set_Num.User_FDJYLQQ , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, User_Value , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_km, GUI_BLENDMODE_SRC_OVER); /*KM*/
}
else
......@@ -4202,13 +4206,17 @@ void GUI_BG_RepSetMenu_3_1_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepSetMenu_3_2_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
User_Value = User_set_Num.User_RYLQQ; /*显示数据*/
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_2, GUI_BLENDMODE_SRC_OVER); /*menu*/
if (User_set_Num.User_FDJYLQQ)
if (User_Value)
{
if (User_set_Num.User_FDJYLQQ > 999)
if (User_Value > 999)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 471u, 255u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
......@@ -4217,7 +4225,7 @@ void GUI_BG_RepSetMenu_3_2_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_set_Num.User_FDJYLQQ , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, User_Value , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_km, GUI_BLENDMODE_SRC_OVER); /*KM*/
}
else
......@@ -4241,13 +4249,17 @@ void GUI_BG_RepSetMenu_3_2_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepSetMenu_3_3_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
User_Value = User_set_Num.User_BSXY; /*显示数据*/
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_3, GUI_BLENDMODE_SRC_OVER); /*menu*/
if (User_set_Num.User_FDJYLQQ)
if (User_Value)
{
if (User_set_Num.User_FDJYLQQ > 999)
if (User_Value > 999)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 471u, 255u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
......@@ -4256,7 +4268,7 @@ void GUI_BG_RepSetMenu_3_3_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_set_Num.User_FDJYLQQ , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_km, GUI_BLENDMODE_SRC_OVER); /*KM*/
}
else
......@@ -4280,13 +4292,17 @@ void GUI_BG_RepSetMenu_3_3_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepSetMenu_3_4_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
User_Value = User_set_Num.User_CSQY; /*显示数据*/
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_4, GUI_BLENDMODE_SRC_OVER); /*menu*/
if (User_set_Num.User_FDJYLQQ)
if (User_Value)
{
if (User_set_Num.User_FDJYLQQ > 999)
if (User_Value > 999)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 471u, 255u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
......@@ -4295,7 +4311,7 @@ void GUI_BG_RepSetMenu_3_4_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_set_Num.User_FDJYLQQ , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, User_Value , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_km, GUI_BLENDMODE_SRC_OVER); /*KM*/
}
else
......@@ -4319,13 +4335,17 @@ void GUI_BG_RepSetMenu_3_4_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepSetMenu_3_5_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
//User_Value = User_set_Num.User_CSQY; /*显示数据*/
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_5, GUI_BLENDMODE_SRC_OVER); /*menu*/
if (User_set_Num.User_FDJYLQQ)
if (User_Value)
{
if (User_set_Num.User_FDJYLQQ > 999)
if (User_Value > 999)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 471u, 255u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
......@@ -4334,7 +4354,7 @@ void GUI_BG_RepSetMenu_3_5_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_set_Num.User_FDJYLQQ , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, User_Value , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_km, GUI_BLENDMODE_SRC_OVER); /*KM*/
}
else
......@@ -4358,13 +4378,17 @@ void GUI_BG_RepSetMenu_3_5_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_RepSetMenu_3_6_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
User_Value = User_set_Num.User_DLZXY; /*显示数据*/
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_5, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_7, GUI_BLENDMODE_SRC_OVER); /*menu*/
if (User_set_Num.User_FDJYLQQ)
if (User_Value)
{
if (User_set_Num.User_FDJYLQQ > 999)
if (User_Value > 999u)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 471u, 255u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
......@@ -4373,7 +4397,7 @@ void GUI_BG_RepSetMenu_3_6_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_set_Num.User_FDJYLQQ , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, User_Value , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_km, GUI_BLENDMODE_SRC_OVER); /*KM*/
}
else
......@@ -4386,11 +4410,43 @@ void GUI_BG_RepSetMenu_3_6_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_RepSetMenu_3_7_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther :
--------------------------------------------------------------------------*/
void GUI_BG_RepSetMenu_3_7_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
User_Value = User_set_Num.User_LT; /*显示数据*/
if (Mode == GUI_DISP_MODE_NORMAL)
{
// GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_16, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_8, GUI_BLENDMODE_SRC_OVER); /*menu*/
if (User_Value)
{
if (User_Value > 999)
{
GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 471u, 255u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
GUI_General_Digit_Display(MENU_Sprite, User_Value , Nb_15_0, 6u, 5u, GUI_SETREP_X, 255u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_km, GUI_BLENDMODE_SRC_OVER); /*KM*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_10, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
......
source/Application/Graphic/Menu/Menu.h
View file @ 648de35b
......@@ -352,9 +352,9 @@ EXTERN_MEU_PROCESS void Level3_3Menu_4Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_4Do(void);
EXTERN_MEU_PROCESS void Level3_3Menu_4Exit(void);
EXTERN_MEU_PROCESS void Level3_3Menu_5Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_5Do(void);
EXTERN_MEU_PROCESS void Level3_3Menu_5Exit(void);
//EXTERN_MEU_PROCESS void Level3_3Menu_5Enter(void);
//EXTERN_MEU_PROCESS void Level3_3Menu_5Do(void);
//EXTERN_MEU_PROCESS void Level3_3Menu_5Exit(void);
EXTERN_MEU_PROCESS void Level3_3Menu_6Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_6Do(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 648de35b
......@@ -847,9 +847,18 @@ void Level3_3Menu_1Exit(void)
}
/*----三级菜单----保养通知设定----系列子菜单*/
/*更黄燃油滤清器*/
/*更换燃油滤清器*/
void Level3_3Menu_2Enter(void)
{}
{
if (User_App.User_RYLQQ == 0u)
{
User_set_Num.User_RYLQQ = 0u;
}
else
{
User_set_Num.User_RYLQQ = (uint32_t)K_Line_User_RYLQQ * 1000u;
}
}
void Level3_3Menu_2Do(void)
{
GUI_OftenShow_Display();
......@@ -879,7 +888,16 @@ void Level3_3Menu_2Exit(void)
/*----三级菜单----保养通知设定----系列子菜单*/
/*更换变速箱油*/
void Level3_3Menu_3Enter(void)
{}
{
if (User_App.User_BSXY == 0u)
{
User_set_Num.User_BSXY = 0u;
}
else
{
User_set_Num.User_BSXY = (uint32_t)K_Line_Set.K_Line_LID4A * 1000;
}
}
void Level3_3Menu_3Do(void)
{
GUI_OftenShow_Display();
......@@ -909,7 +927,16 @@ void Level3_3Menu_3Exit(void)
/*----三级菜单----保养通知设定----系列子菜单*/
/*更换差速器油*/
void Level3_3Menu_4Enter(void)
{}
{
if (User_App.User_CSQY == 0u)
{
User_set_Num.User_CSQY = 0u;
}
else
{
User_set_Num.User_CSQY = (uint32_t)K_Line_Set.K_Line_LID4B * 1000;
}
}
void Level3_3Menu_4Do(void)
{
GUI_OftenShow_Display();
......@@ -938,21 +965,30 @@ void Level3_3Menu_4Exit(void)
/*----三级菜单----保养通知设定----系列子菜单*/
/*更换离合器油*/
void Level3_3Menu_5Enter(void)
{}
void Level3_3Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_RepMenuSet_Menu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_RepSetMenu_3_5_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_3Menu_5Exit(void)
{}
//void Level3_3Menu_5Enter(void)
//{}
//void Level3_3Menu_5Do(void)
//{
// GUI_OftenShow_Display();
// GUI_BG_RepMenuSet_Menu_Display(GUI_DISP_MODE_NORMAL);
// GUI_BG_RepSetMenu_3_5_Display(GUI_DISP_MODE_NORMAL);
//}
//void Level3_3Menu_5Exit(void)
//{}
/*----三级菜单----保养通知设定----系列子菜单*/
/*更换动力转向液*/
void Level3_3Menu_6Enter(void)
{}
{
if (User_App.User_DLZXY == 0u)
{
User_set_Num.User_DLZXY = 0u;
}
else
{
User_set_Num.User_DLZXY = (uint32_t)K_Line_Set.K_Line_LID4D * 1000;
}
}
void Level3_3Menu_6Do(void)
{
GUI_OftenShow_Display();
......@@ -982,7 +1018,16 @@ void Level3_3Menu_6Exit(void)
/*----三级菜单----保养通知设定----系列子菜单*/
/*更换轮胎*/
void Level3_3Menu_7Enter(void)
{}
{
if (User_App.User_LT == 0u)
{
User_set_Num.User_LT = 0u;
}
else
{
User_set_Num.User_LT = (uint32_t)K_Line_Set.K_Line_LID4E * 1000;
}
}
void Level3_3Menu_7Do(void)
{
GUI_OftenShow_Display();
......@@ -1024,9 +1069,7 @@ void Level3_4Menu_1Do_1(void)
GUI_BG_UserSet_Date_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_4Menu_1Exit_1(void)
{
User_set_Num.SetTime = 0 ;
}
{}
/*----三级菜单----用户设定----系列子选项*/
/*日期设定 ---- 月*/
......@@ -1039,9 +1082,7 @@ void Level3_4Menu_1Do_2(void)
GUI_BG_UserSet_Date_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_4Menu_1Exit_2(void)
{
User_set_Num.SetTime = 0 ;
}
{}
/*----三级菜单----用户设定----系列子选项*/
/*日期设定 ---- 日*/
......@@ -1068,8 +1109,6 @@ void Level3_4Menu_1Exit_3(void)
RTE_RTC_Confirm_Overwrite();
}
User_set_Num.SetTime = 0 ;
}
/*----三级菜单----用户设定----系列子选项*/
......@@ -1086,9 +1125,7 @@ void Level3_4Menu_2Do_1(void)
GUI_BG_UserSet_Time_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_4Menu_2Exit_1(void)
{
User_set_Num.SetTime = 0 ;
}
{}
/*----三级菜单----用户设定----系列子选项*/
/*时间设定 ---- 分*/
......@@ -1115,8 +1152,6 @@ void Level3_4Menu_2Exit_2(void)
RTE_RTC_Confirm_Overwrite();
}
User_set_Num.SetTime = 0 ;
}
/*----三级菜单----用户设定----系列子选项*/
......@@ -1306,8 +1341,6 @@ void Level4_4Menu_1Exit(void)
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
......@@ -1330,8 +1363,6 @@ void Level4_4Menu_2Exit(void)
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
......@@ -1354,8 +1385,6 @@ void Level4_4Menu_3Exit(void)
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
......@@ -1378,8 +1407,6 @@ void Level4_4Menu_4Exit(void)
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
......@@ -1401,8 +1428,6 @@ void Level4_4Menu_5Exit(void)
User_App.User_JSUB = User_set_Num.User_JSUB ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
......@@ -1424,8 +1449,6 @@ void Level4_4Menu_6Exit(void)
User_App.User_IDLING = User_set_Num.User_IDLING ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
......@@ -1447,8 +1470,6 @@ void Level4_4Menu_7Exit(void)
User_App.User_Parking = User_set_Num.User_Parking ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----Enter----*/
......@@ -1487,4 +1508,4 @@ void Level_Return_Menu_Do(void)
void Level_Return_Menu_Exit(void)
{
State_Flag.ENTER_RETURN = 0;
}
}
\ No newline at end of file
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