Skip to content

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

调整菜单结构,编译通过

parent 2fb8b813
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23543 additions and 22910 deletions
ghs/project
View file @ 6e6d9849
No preview for this file type
ghs/project.hex
View file @ 6e6d9849
This diff is collapsed.
ghs/project.siz
View file @ 6e6d9849
project .intvect 1536 project .intvect 1536
project .text 299468 project .text 299820
project .rodata 409343 project .rodata 409999
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
project .romdata 9037 project .romdata 9037
......
source/Application/APP/Key/Key_user.c
View file @ 6e6d9849
...@@ -217,40 +217,33 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -217,40 +217,33 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU)) if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU))
{ {
if ( if (
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3 ) || /*显示设置*/ ( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3 ) || /*语言设定*/
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_7 ) || /*语言设定*/ ((bCurMenuIDX >= _MN_DSP_LEVEL4_4_MENU_1 ) && (bCurMenuIDX <= _MN_DSP_LEVEL4_4_MENU_7)) /*省油设定子菜单*/
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_9 ) || /*单位设定*/
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_8 ) || /*亮度调节*/
( bCurMenuIDX == _MN_DSP_LEVEL4_1_MENU_1 ) || /*日期设置退出*/
( bCurMenuIDX == _MN_DSP_LEVEL4_1_MENU_2 ) || /*日期格式设置退出*/
( bCurMenuIDX == _MN_DSP_LEVEL4_2_MENU_1 ) || /*时间设置退出*/
( bCurMenuIDX == _MN_DSP_LEVEL4_2_MENU_2 ) || /*时间格式退出*/
((bCurMenuIDX >= _MN_DSP_LEVEL4_4_MENU_1 ) && (bCurMenuIDX <= _MN_DSP_LEVEL4_4_MENU_5)) /*省油设定子菜单*/
) )
{ {
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A ) /*胎压设置界面返回操作*/ //else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A ) /*胎压设置界面返回操作*/
{ //{
//if (User_set_Num.User_TpmsStatus != 2) /*不是正在匹配状态*/ // if (User_set_Num.User_TpmsStatus != 2) /*不是正在匹配状态*/
//{ // {
// NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT); // NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
//} // }
//else // else
//{ // {
// User_set_Num.User_TpmsStatus = 1; /*退出匹配界面*/ // User_set_Num.User_TpmsStatus = 1; /*退出匹配界面*/
// if (User_set_Num.User_Temp_Return == 0) // if (User_set_Num.User_Temp_Return == 0)
// { // {
// User_set_Num.User_Temp_Return = 1; /*取消配对标记*/ // User_set_Num.User_Temp_Return = 1; /*取消配对标记*/
// User_set_Num.User_TpmsSend = 3; /*报文外发次数*/ // User_set_Num.User_TpmsSend = 3; /*报文外发次数*/
// } // }
// else // else
// { // {
// ; /* do nonthing*/ // ; /* do nonthing*/
// } // }
//} // }
} //}
else else
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
...@@ -314,11 +307,11 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -314,11 +307,11 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
/*无论从哪里都能回去*/ /*无论从哪里都能回去*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU)) else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU))
{ {
if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/ //if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/
{ //{
NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/ // NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/
} //}
else //else
{ {
NextMenu(MenuFlag.Menu_Flag); NextMenu(MenuFlag.Menu_Flag);
} }
......
source/Application/Graphic/GUI/GUI.c
View file @ 6e6d9849
...@@ -103,11 +103,16 @@ void GUI_Display_Value_Init(void) ...@@ -103,11 +103,16 @@ void GUI_Display_Value_Init(void)
State_Flag.USER_PROPOSAL = 2u; State_Flag.USER_PROPOSAL = 2u;
State_Flag.USER_HSA = 1u; State_Flag.USER_HSA = 1u;
State_Flag.USER_VOLUEM = 1u; State_Flag.USER_VOLUEM = 1u;
State_Flag.USER_LANGUAGE = 1u; State_Flag.USER_LANGUAGE = 2u;
State_Flag.USER_COMPANY = 2u; State_Flag.USER_COMPANY = 2u;
State_Flag.USER_LIGHT = 2u; State_Flag.USER_LIGHT = 2u;
State_Flag.USER_SETIC = 2u; State_Flag.USER_SETIC = 2u;
State_Flag.FState_TPMSSET = 2u; State_Flag.FState_TPMSSET = 2u;
State_Flag.DEMO_LDWS = 2u;
State_Flag.DEMO_AEBS1 = 2u;
State_Flag.DEMO_AEBS2 = 2u;
State_Flag.DEMO_AEBS3 = 2u;
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GUI_Display_OftenShow_Group * Function Name : GUI_Display_OftenShow_Group
...@@ -2091,31 +2096,19 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode) ...@@ -2091,31 +2096,19 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
} }
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_3) if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_3)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + State_Flag.USER_DISPLAY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_4) if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_4)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_5) else
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + State_Flag.USER_DISPLAY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_6)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + State_Flag.USER_DISPLAY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_11black + State_Flag.USER_SETIC), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
} }
else else
{ {
...@@ -2176,7 +2169,7 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode) ...@@ -2176,7 +2169,7 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
uint8_t Flag = 0; uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -2264,3 +2257,154 @@ void GUI_BG_UserSetMenu7_Display(uint8_t Mode) ...@@ -2264,3 +2257,154 @@ void GUI_BG_UserSetMenu7_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_Demo_Menu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_Demo_Menu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_User_Menu2_05_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
if (bCurMenuIDX != _MN_DSP_LEVEL2_5_MENU_1)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_1black + State_Flag.DEMO_LDWS), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_5_MENU_2)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_2black + State_Flag.DEMO_AEBS1), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_5_MENU_3)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_3black + State_Flag.DEMO_AEBS2), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_5_MENU_4)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_4black + State_Flag.DEMO_AEBS3), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DemoMenu1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_1black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DemoMenu2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_2black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DemoMenu3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_3black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DemoMenu4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_4black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_Errot_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_Errot_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ 6e6d9849
This diff is collapsed.
source/Application/Graphic/Menu/Menu.h
View file @ 6e6d9849
This diff is collapsed.
source/Application/Graphic/Menu/Menu_user.c
View file @ 6e6d9849
This diff is collapsed.
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