Skip to content

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

增加界面

parent f67ea109
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 31 deletions
source/Application/APP/Key/Key_user.c
View file @ beb444b3
......@@ -1040,20 +1040,14 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
/*无论从哪里都能回去*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_5_MENU_4))
{
// if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/
//{
// NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/
// }
// else
{
NextMenu(MenuFlag.Menu_Flag);
}
NextMenu(MenuFlag.Menu_Flag);
}
else if ((bCurMenuIDX >= _MN_DSP_LEVEL3_5_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_5_MENU_4))
/*自检模式进入经销商模式*/
else if (bCurMenuIDX == _MN_DSP_Menu_Test)
{
NextMenu(MenuFlag.Menu_Flag);
MenuFlag.Meun_Test_Dealer = 1u;
}
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
......
source/Application/Graphic/GUI/GUI.c
View file @ beb444b3
......@@ -218,6 +218,7 @@ void GUI_Display_Value_Init(void)
User_set_Num.User_Parking = User_App.User_Parking ;
MenuFlag.Menu_Flag = 0; /*菜单初始化位置*/
MenuFlag.Meun_Test_Dealer = 0u;
Display_DTC[0u].Disp_Mod_Menu_Cbk = GUI_BG_DTCEngine_Display; /*发动机故障*/
......@@ -6722,14 +6723,14 @@ void GUI_Display_NULL(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClear_Display
* Function Name : GUI_BG_FacDTCClear1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClear_Display(uint8_t Mode)
void GUI_BG_FacDTCClear1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
......@@ -6745,14 +6746,14 @@ void GUI_BG_FacDTCClear_Display(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu6_Display
* Function Name : GUI_BG_FacDTCClear2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearYN_Display(uint8_t Mode)
void GUI_BG_FacDTCClear2_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
......@@ -6767,6 +6768,52 @@ void GUI_BG_FacDTCClearYN_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClear3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClear3_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClear4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClear4_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_4, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMeter_Display
* Description :
......
source/Application/Graphic/GUI/GUI.h
View file @ beb444b3
......@@ -425,8 +425,10 @@ void GUI_BG_FacMenu3_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu4_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu5_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu6_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClear_Display(uint8_t Mode); /*工厂模式清除DTC1*/
void GUI_BG_FacDTCClearYN_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacDTCClear1_Display(uint8_t Mode); /*工厂模式清除DTC1*/
void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacDTCClear3_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacDTCClear4_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacMeter_Display(uint8_t Mode); /*工厂模式仪表显示*/
void GUI_BG_DisMenu_Display(uint8_t Mode); /*经销商模式*/
void GUI_BG_DisMenu1_Display(uint8_t Mode); /**/
......@@ -435,8 +437,10 @@ void GUI_BG_DisMenu3_Display(uint8_t Mode); /**/
void GUI_BG_DisMenu4_Display(uint8_t Mode); /**/
void GUI_BG_DisMenu5_Display(uint8_t Mode); /**/
void GUI_BG_DisMenu6_Display(uint8_t Mode); /**/
void GUI_BG_DisDTCClear_Display(uint8_t Mode); /*经销商模式清除DTC1*/
void GUI_BG_DisDTCClearYN_Display(uint8_t Mode); /*经销商模式清除DTC2*/
void GUI_BG_DisDTCClear1_Display(uint8_t Mode); /*经销商模式清除DTC1*/
void GUI_BG_DisDTCClear2_Display(uint8_t Mode); /*经销商模式清除DTC2*/
void GUI_BG_DisDTCClear3_Display(uint8_t Mode); /*经销商模式清除DTC3*/
void GUI_BG_DisDTCClear4_Display(uint8_t Mode); /*经销商模式清除DTC4*/
void GUI_BG_DisMeter_Display(uint8_t Mode); /*经销商模式仪表显示*/
void GUI_Display_DTC_Server(void); /**/
......
source/Application/Graphic/Menu/Menu.h
View file @ beb444b3
......@@ -133,6 +133,8 @@ typedef enum
_FAC_DSP_LEVEL1_2MENU_1, /* 89 清除所有DTC*/
_FAC_DSP_LEVEL1_2MENU_2, /* 90 清除所有DTC*/
_FAC_DSP_LEVEL1_2MENU_3,
_FAC_DSP_LEVEL1_2MENU_4,
_FAC_DSP_LEVEL1_3MENU_1, /* 91 L0-7 H2-A*/
_FAC_DSP_LEVEL1_3MENU_2, /* 92 L8-F H2-A*/
......@@ -193,10 +195,10 @@ typedef struct
uint8_t MenuNum; /*历史界面保存*/
uint8_t Key_MenuTest_Long; /**/
uint8_t Key_MenuTest_ShortNum; /**/
uint8_t Menu_Factory;
uint8_t Menu_Dealer;
uint8_t Menu_Test;
uint8_t Reserve1;
uint8_t Menu_Factory; /*工厂模式*/
uint8_t Menu_Dealer; /*经销商模式*/
uint8_t Menu_Test; /*仪表自我诊断模式*/
uint8_t Meun_Test_Dealer; /*自我诊断模式进入经销商模式标记*/
} _MenuFlag;
......@@ -583,6 +585,14 @@ EXTERN_MEU_PROCESS void LevelF1_2Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF1_3Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1_3Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1_3Menu_1Exit(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ beb444b3
......@@ -125,7 +125,7 @@ const _MenuOptTab MenuOptTab[] =
/*工厂模式*/
/*82*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit},
/*83*/{ _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit},
/*83*/{ _FAC_DSP_LEVEL1_2MENU_1, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit},
/*84*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit},
/*85*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit},
/*86*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit},
......@@ -134,7 +134,9 @@ const _MenuOptTab MenuOptTab[] =
/*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*89*/{ _FAC_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*90*/{ _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*90*/{ _FAC_DSP_LEVEL1_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_1, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*90*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_3Enter, LevelF1_2Menu_3Do, LevelF1_2Menu_3Exit},
/*90*/{ _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1_2Menu_4Enter, LevelF1_2Menu_4Do, LevelF1_2Menu_4Exit},
/*91*/{ _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_2, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit},
/*92*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
......@@ -1765,28 +1767,50 @@ void LevelF1_1Menu_4Do(void)
void LevelF1_1Menu_4Exit(void)
{}
/*----工厂模式----DTC清除----所有DTC全部清除-----*/
/*----工厂模式----DTC清除1----所有DTC全部清除-----*/
void LevelF1_2Menu_1Enter(void)
{}
void LevelF1_2Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClear1_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_1Exit(void)
{}
/*----工厂模式----DTC清除----清除DTC全部-----*/
/*----工厂模式----DTC清除2----清除DTC全部-----*/
void LevelF1_2Menu_2Enter(void)
{}
void LevelF1_2Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClearYN_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClear2_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_2Exit(void)
{}
/*----工厂模式----DTC清除3----清除DTC全部-----*/
void LevelF1_2Menu_3Enter(void)
{}
void LevelF1_2Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear3_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_3Exit(void)
{}
/*----工厂模式----DTC清除4----清除DTC全部-----*/
void LevelF1_2Menu_4Enter(void)
{}
void LevelF1_2Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_4Exit(void)
{}
/*----工厂模式----仪表设定显示----L0-7 H2-A-----*/
void LevelF1_3Menu_1Enter(void)
{}
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ beb444b3
......@@ -191,7 +191,7 @@ void DisplayServices(void)
/*经销商模式*/
else if (MenuFlag.Menu_Popup_Flag == 3u)
{
if (K_Line_Set.K_Line_LID51 == 0x01u)
if ((K_Line_Set.K_Line_LID51 == 0x01u) && (MenuFlag.Meun_Test_Dealer != 1u)) /*MenuFlag.Key_MenuTest_ShortNum EOL51变化时要清零*/
{
MenuFlag.Menu_Popup_Flag = 1u;
}
......@@ -211,7 +211,7 @@ void DisplayServices(void)
{
MenuFlag.Menu_Popup_Flag = 1u;
}
else if (0)
else if (MenuFlag.Meun_Test_Dealer == 1u)
{
MenuFlag.Menu_Dealer = 1u;
}
......
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