Commit a72aac99 authored by hu's avatar hu

调整界面逻辑

parent 21e95aa7
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
project .intvect 1536
project .text 320316
project .text 320956
project .rodata 411103
project .secinfo 120
project .syscall 6
......
......@@ -208,8 +208,86 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3)
{
if (User_set_Num.User_Language > 0u)
{
User_set_Num.User_Language-- ;
}
}
/*高速路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_1)
{
if (User_set_Num.User_Gsl < 110)
{
User_set_Num.User_Gsl++;
}
else if (User_set_Num.User_Gsl == 0xFF)
{
User_set_Num.User_Gsl = 20;
}
}
/*一般路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_2)
{
if (User_set_Num.User_Ybl < 110)
{
User_set_Num.User_Ybl++;
}
else if (User_set_Num.User_Ybl == 0xFF)
{
User_set_Num.User_Ybl = 20;
}
}
/*发动机转速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_3)
{
if (User_set_Num.User_Speed < 99)
{
User_set_Num.User_Speed ++;
}
else if (User_set_Num.User_Speed == 0xFF)
{
User_set_Num.User_Speed = 0;
}
}
/*急加速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_4)
{
if (User_set_Num.User_JADD < 99)
{
User_set_Num.User_JADD++;
}
else if (User_set_Num.User_JADD == 0xFF)
{
User_set_Num.User_JADD = 5;
}
}
/*急减速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_5)
{
if (User_set_Num.User_JSUB < 99)
{
User_set_Num.User_JSUB++;
}
else if (User_set_Num.User_JSUB == 0xFF)
{
User_set_Num.User_JSUB = 5;
}
}
/*长时间怠速设定*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_6)
{
if (User_set_Num.User_IDLING == 0xFFu)
{
User_set_Num.User_IDLING = 0u;
}
}
/*辅助驻车解除设定*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_7)
{
if (User_set_Num.User_Parking == 0xFFu)
{
User_set_Num.User_Parking = 0u;
}
}
}
}
......@@ -390,7 +468,78 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
if (User_set_Num.User_Language < 1 )
User_set_Num.User_Language++ ;
}
/*高速路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_1)
{
if ((User_set_Num.User_Gsl > 20) && (User_set_Num.User_Gsl <= 110))
{
User_set_Num.User_Gsl--;
}
else
{
User_set_Num.User_Gsl = 0xFF;
}
}
/*一般路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_2)
{
if ((User_set_Num.User_Ybl > 20) && (User_set_Num.User_Ybl <= 110))
{
User_set_Num.User_Ybl--;
}
else
{
User_set_Num.User_Ybl = 0xFF;
}
}
/*发动机转速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_3)
{
if ((User_set_Num.User_Speed >= 0) && (User_set_Num.User_Speed <= 99))
{
User_set_Num.User_Speed--;
}
}
/*急加速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_4)
{
if ((User_set_Num.User_JADD > 5) && (User_set_Num.User_JADD <= 99))
{
User_set_Num.User_JADD--;
}
else
{
User_set_Num.User_JADD = 0xFF;
}
}
/*急减速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_5)
{
if ((User_set_Num.User_JSUB > 5) && (User_set_Num.User_JSUB <= 99))
{
User_set_Num.User_JSUB--;
}
else
{
User_set_Num.User_JSUB = 0xFF;
}
}
/*长时间怠速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_6)
{
if (User_set_Num.User_IDLING == 0u)
{
User_set_Num.User_IDLING = 0xFFu;
}
}
/*辅助驻车解除*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_7)
{
if (User_set_Num.User_Parking == 0u)
{
User_set_Num.User_Parking = 0xFFu;
}
}
}
}
else
......
......@@ -907,7 +907,7 @@ void Level3_3Menu_3Exit(void)
}
/*----三级菜单----保养通知设定----系列子菜单*/
/*更差速器油*/
/*更差速器油*/
void Level3_3Menu_4Enter(void)
{}
void Level3_3Menu_4Do(void)
......@@ -1024,7 +1024,9 @@ 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 ;
}
/*----三级菜单----用户设定----系列子选项*/
/*日期设定 ---- 月*/
......@@ -1037,7 +1039,9 @@ 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 ;
}
/*----三级菜单----用户设定----系列子选项*/
/*日期设定 ---- 日*/
......@@ -1064,6 +1068,8 @@ void Level3_4Menu_1Exit_3(void)
RTE_RTC_Confirm_Overwrite();
}
User_set_Num.SetTime = 0 ;
}
/*----三级菜单----用户设定----系列子选项*/
......@@ -1080,7 +1086,9 @@ 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 ;
}
/*----三级菜单----用户设定----系列子选项*/
/*时间设定 ---- 分*/
......@@ -1107,6 +1115,8 @@ void Level3_4Menu_2Exit_2(void)
RTE_RTC_Confirm_Overwrite();
}
User_set_Num.SetTime = 0 ;
}
/*----三级菜单----用户设定----系列子选项*/
......@@ -1296,12 +1306,16 @@ void Level4_4Menu_1Exit(void)
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
/*速度设定-一般路子菜单*/
void Level4_4Menu_2Enter(void)
{}
{
User_set_Num.User_Ybl = User_App.User_Ybl ;
}
void Level4_4Menu_2Do(void)
{
GUI_OftenShow_Display();
......@@ -1309,12 +1323,23 @@ void Level4_4Menu_2Do(void)
GUI_BG_UserSet_SYSD_Ybl_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_2Exit(void)
{}
{
if (MenuFlag.Menu_Return)
{
User_App.User_Ybl = User_set_Num.User_Ybl ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
/*发动机转速设定子菜单*/
void Level4_4Menu_3Enter(void)
{}
{
User_set_Num.User_Speed = User_App.User_Speed ;
}
void Level4_4Menu_3Do(void)
{
GUI_OftenShow_Display();
......@@ -1322,12 +1347,23 @@ void Level4_4Menu_3Do(void)
GUI_BG_UserSet_SYSD_Speed_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_3Exit(void)
{}
{
if (MenuFlag.Menu_Return)
{
User_App.User_Speed = User_set_Num.User_Speed ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
/*急加速设定子菜单*/
void Level4_4Menu_4Enter(void)
{}
{
User_set_Num.User_JADD = User_App.User_JADD ;
}
void Level4_4Menu_4Do(void)
{
GUI_OftenShow_Display();
......@@ -1335,12 +1371,23 @@ void Level4_4Menu_4Do(void)
GUI_BG_UserSet_SYSD_JADD_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_4Exit(void)
{}
{
if (MenuFlag.Menu_Return)
{
User_App.User_JADD = User_set_Num.User_JADD ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
/*急减速子菜单*/
void Level4_4Menu_5Enter(void)
{}
{
User_set_Num.User_JSUB = User_App.User_JSUB ;
}
void Level4_4Menu_5Do(void)
{
GUI_OftenShow_Display();
......@@ -1348,12 +1395,22 @@ void Level4_4Menu_5Do(void)
GUI_BG_UserSet_SYSD_JSUB_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_5Exit(void)
{}
{
if (MenuFlag.Menu_Return)
{
User_App.User_JSUB = User_set_Num.User_JSUB ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
/*长时间怠速设定子菜单*/
void Level4_4Menu_6Enter(void)
{}
{
User_set_Num.User_IDLING = User_App.User_IDLING ;
}
void Level4_4Menu_6Do(void)
{
GUI_OftenShow_Display();
......@@ -1361,12 +1418,22 @@ void Level4_4Menu_6Do(void)
GUI_BG_UserSet_SYSD_IDLING_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_6Exit(void)
{}
{
if (MenuFlag.Menu_Return)
{
User_App.User_IDLING = User_set_Num.User_IDLING ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----四级菜单----省油建议设定----系列子菜单*/
/*辅助驻车解除设定*/
void Level4_4Menu_7Enter(void)
{}
{
User_set_Num.User_Parking = User_App.User_Parking ;
}
void Level4_4Menu_7Do(void)
{
GUI_OftenShow_Display();
......@@ -1374,7 +1441,15 @@ void Level4_4Menu_7Do(void)
GUI_BG_UserSet_SYSD_Parking_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_7Exit(void)
{}
{
if (MenuFlag.Menu_Return)
{
User_App.User_Parking = User_set_Num.User_Parking ;
MenuFlag.Menu_Return = 0;
}
User_set_Num.SetTime = 0 ;
}
/*----Enter----*/
void Level_Enter_Menu_Enter(void)
......
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