Skip to content

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

调整界面

parent beb444b3
Hide whitespace changes
Inline Side-by-side
Showing with 312 additions and 121 deletions
source/Application/APP/Key/Key_user.c
View file @ fe802455
......@@ -339,8 +339,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
/*工厂模式*/ /*经销商模式*/
else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1_3MENU_2)))
((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DEA_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
......@@ -703,8 +703,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
/*工厂模式*/ /*经销商模式*/
else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1_3MENU_2)))
((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DEA_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
......@@ -826,7 +826,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
NextMenu(_MN_DSP_RETURN_MENU);
}
/*工厂模式 经销商模式*/
else if ((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL2_1MENU_4))
else if ((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL2_1MENU_4))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
......
source/Application/Graphic/GUI/GUI.c
View file @ fe802455
......@@ -6929,14 +6929,14 @@ void GUI_BG_FacMeter_Display(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu_Display
* Function Name : GUI_BG_DeaMenu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMenu_Display(uint8_t Mode)
void GUI_BG_DeaMenu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
......@@ -6945,26 +6945,26 @@ void GUI_BG_DisMenu_Display(uint8_t Mode)
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 <= _DIS_DSP_LEVEL1MENU_4)
if (bCurMenuIDX <= _DEA_DSP_LEVEL1MENU_4)
{
if (bCurMenuIDX != _DIS_DSP_LEVEL1MENU_1)
if (bCurMenuIDX != _DEA_DSP_LEVEL1MENU_1)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_01White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _DIS_DSP_LEVEL1MENU_2)
if (bCurMenuIDX != _DEA_DSP_LEVEL1MENU_2)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_02White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _DIS_DSP_LEVEL1MENU_3)
if (bCurMenuIDX != _DEA_DSP_LEVEL1MENU_3)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _DIS_DSP_LEVEL1MENU_4)
if (bCurMenuIDX != _DEA_DSP_LEVEL1MENU_4)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_08White, 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else if (bCurMenuIDX == _DIS_DSP_LEVEL1MENU_5)
else if (bCurMenuIDX == _DEA_DSP_LEVEL1MENU_5)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_02White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
......@@ -6984,14 +6984,14 @@ void GUI_BG_DisMenu_Display(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu1_Display
* Function Name : GUI_BG_DeaMenu1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMenu1_Display(uint8_t Mode)
void GUI_BG_DeaMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7005,14 +7005,14 @@ void GUI_BG_DisMenu1_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu2_Display
* Function Name : GUI_BG_DeaMenu2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMenu2_Display(uint8_t Mode)
void GUI_BG_DeaMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7026,14 +7026,14 @@ void GUI_BG_DisMenu2_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu3_Display
* Function Name : GUI_BG_DeaMenu3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMenu3_Display(uint8_t Mode)
void GUI_BG_DeaMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7047,14 +7047,14 @@ void GUI_BG_DisMenu3_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu4_Display
* Function Name : GUI_BG_DeaMenu4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMenu4_Display(uint8_t Mode)
void GUI_BG_DeaMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7068,14 +7068,14 @@ void GUI_BG_DisMenu4_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu5_Display
* Function Name : GUI_BG_DeaMenu5_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMenu5_Display(uint8_t Mode)
void GUI_BG_DeaMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7089,14 +7089,14 @@ void GUI_BG_DisMenu5_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu6_Display
* Function Name : GUI_BG_DeaMenu6_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMenu6_Display(uint8_t Mode)
void GUI_BG_DeaMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7111,14 +7111,14 @@ void GUI_BG_DisMenu6_Display(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisDTCClear_Display
* Function Name : GUI_BG_DeaDTCClear1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisDTCClear_Display(uint8_t Mode)
void GUI_BG_DeaDTCClear1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
......@@ -7134,14 +7134,14 @@ void GUI_BG_DisDTCClear_Display(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMenu6_Display
* Function Name : GUI_BG_DeaDTCClear2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisDTCClearYN_Display(uint8_t Mode)
void GUI_BG_DeaDTCClear2_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
......@@ -7157,14 +7157,60 @@ void GUI_BG_DisDTCClearYN_Display(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DisMeter_Display
* Function Name : GUI_BG_DeaDTCClear3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DisMeter_Display(uint8_t Mode)
void GUI_BG_DeaDTCClear3_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_2, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DeaDTCClear4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DeaDTCClear4_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_2, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DeaMeter_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DeaMeter_Display(uint8_t Mode)
{
uint8_t i = 0u;
......@@ -7182,7 +7228,7 @@ void GUI_BG_DisMeter_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_L, 285u, 162u, GUI_BLENDMODE_SRC_OVER);/*L*/
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_H, 262u, 174u, GUI_BLENDMODE_SRC_OVER);/*H*/
if (bCurMenuIDX == _FAC_DSP_LEVEL1_3MENU_1)
if (bCurMenuIDX == _DEA_DSP_LEVEL1_3MENU_1)
{
/*标题*/
for (i = 0; i < 9; i++)
......
source/Application/Graphic/GUI/GUI.h
View file @ fe802455
......@@ -430,18 +430,18 @@ 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); /**/
void GUI_BG_DisMenu2_Display(uint8_t Mode); /**/
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_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_BG_DeaMenu_Display(uint8_t Mode); /*经销商模式*/
void GUI_BG_DeaMenu1_Display(uint8_t Mode); /**/
void GUI_BG_DeaMenu2_Display(uint8_t Mode); /**/
void GUI_BG_DeaMenu3_Display(uint8_t Mode); /**/
void GUI_BG_DeaMenu4_Display(uint8_t Mode); /**/
void GUI_BG_DeaMenu5_Display(uint8_t Mode); /**/
void GUI_BG_DeaMenu6_Display(uint8_t Mode); /**/
void GUI_BG_DeaDTCClear1_Display(uint8_t Mode); /*经销商模式清除DTC1*/
void GUI_BG_DeaDTCClear2_Display(uint8_t Mode); /*经销商模式清除DTC2*/
void GUI_BG_DeaDTCClear3_Display(uint8_t Mode); /*经销商模式清除DTC3*/
void GUI_BG_DeaDTCClear4_Display(uint8_t Mode); /*经销商模式清除DTC4*/
void GUI_BG_DeaMeter_Display(uint8_t Mode); /*经销商模式仪表显示*/
void GUI_Display_DTC_Server(void); /**/
void GUI_BG_DTCEngine_Display(uint8_t Mode); /*发动机故障*/
......
source/Application/Graphic/Menu/Menu.h
View file @ fe802455
......@@ -122,48 +122,54 @@ typedef enum
_MN_DSP_Menu_Test, /* 81 */
/*工厂模式*/
_FAC_DSP_LEVEL1MENU_1, /* 82 DTC显示*/
_FAC_DSP_LEVEL1MENU_2, /* 83 DTC清除*/
_FAC_DSP_LEVEL1MENU_3, /* 84 仪表设定显示*/
_FAC_DSP_LEVEL1MENU_4, /* 85 暂时通常模式*/
_FAC_DSP_LEVEL1MENU_5, /* 86 结束工厂模式*/
_FAC_DSP_LEVEL1MENU_6, /* 87 HID自动水平初始化*/
_FAC_DSP_LEVEL0MENU_1, /* 82 */
_FAC_DSP_LEVEL1_1MENU_1, /* 88 故障码读取中*/
_FAC_DSP_LEVEL1MENU_1, /* 83 DTC显示*/
_FAC_DSP_LEVEL1MENU_2, /* 84 DTC清除*/
_FAC_DSP_LEVEL1MENU_3, /* 85 仪表设定显示*/
_FAC_DSP_LEVEL1MENU_4, /* 86 暂时通常模式*/
_FAC_DSP_LEVEL1MENU_5, /* 87 结束工厂模式*/
_FAC_DSP_LEVEL1MENU_6, /* 88 HID自动水平初始化*/
_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_1MENU_1, /* 89 故障码读取中*/
_FAC_DSP_LEVEL1_3MENU_1, /* 91 L0-7 H2-A*/
_FAC_DSP_LEVEL1_3MENU_2, /* 92 L8-F H2-A*/
_FAC_DSP_LEVEL1_2MENU_1, /* 90 清除所有DTC*/
_FAC_DSP_LEVEL1_2MENU_2, /* 91 清除所有DTC*/
_FAC_DSP_LEVEL1_2MENU_3, /* 92 */
_FAC_DSP_LEVEL1_2MENU_4, /* 93 */
_FAC_DSP_LEVEL2_1MENU_1, /* 93 发动机故障*/
_FAC_DSP_LEVEL2_1MENU_2, /* 94 SCR系统故障*/
_FAC_DSP_LEVEL2_1MENU_3, /* 95 EBS/ABS故障*/
_FAC_DSP_LEVEL2_1MENU_4, /* 96 仪表故障*/
_FAC_DSP_LEVEL1_3MENU_1, /* 94 L0-7 H2-A*/
_FAC_DSP_LEVEL1_3MENU_2, /* 95 L8-F H2-A*/
_FAC_DSP_LEVEL2_1MENU_1, /* 96 发动机故障*/
_FAC_DSP_LEVEL2_1MENU_2, /* 97 SCR系统故障*/
_FAC_DSP_LEVEL2_1MENU_3, /* 98 EBS/ABS故障*/
_FAC_DSP_LEVEL2_1MENU_4, /* 99 仪表故障*/
/*经销商模式*/
_DIS_DSP_LEVEL1MENU_1, /* 97 DTC显示*/
_DIS_DSP_LEVEL1MENU_2, /* 98 DTC清除*/
_DIS_DSP_LEVEL1MENU_3, /* 99 仪表设定显示*/
_DIS_DSP_LEVEL1MENU_4, /* 100 暂时通常模式*/
_DIS_DSP_LEVEL1MENU_5, /* 101 结束经销商模式*/
_DIS_DSP_LEVEL1MENU_6, /* 102 HID自动水平初始化*/
_DEA_DSP_LEVEL0MENU_1, /*100*/
_DEA_DSP_LEVEL1MENU_1, /* 101 DTC显示*/
_DEA_DSP_LEVEL1MENU_2, /* 102 DTC清除*/
_DEA_DSP_LEVEL1MENU_3, /* 103 仪表设定显示*/
_DEA_DSP_LEVEL1MENU_4, /* 104 暂时通常模式*/
_DEA_DSP_LEVEL1MENU_5, /* 105 结束经销商模式*/
_DEA_DSP_LEVEL1MENU_6, /* 106 HID自动水平初始化*/
_DIS_DSP_LEVEL1_1MENU_1, /* 103 故障码读取中*/
_DEA_DSP_LEVEL1_1MENU_1, /* 107 故障码读取中*/
_DIS_DSP_LEVEL1_2MENU_1, /* 104 清除所有DTC*/
_DIS_DSP_LEVEL1_2MENU_2, /* 105 清除所有DTC*/
_DEA_DSP_LEVEL1_2MENU_1, /* 108 清除所有DTC*/
_DEA_DSP_LEVEL1_2MENU_2, /* 109 清除所有DTC*/
_DEA_DSP_LEVEL1_2MENU_3, /* 110 清除所有DTC*/
_DEA_DSP_LEVEL1_2MENU_4, /* 111 清除所有DTC*/
_DIS_DSP_LEVEL1_3MENU_1, /* 106 L0-7 H2-A*/
_DIS_DSP_LEVEL1_3MENU_2, /* 107 L8-F H2-A*/
_DEA_DSP_LEVEL1_3MENU_1, /* 112 L0-7 H2-A*/
_DEA_DSP_LEVEL1_3MENU_2, /* 113 L8-F H2-A*/
_DIS_DSP_LEVEL2_1MENU_1, /* 108 发动机故障*/
_DIS_DSP_LEVEL2_1MENU_2, /* 109 SCR系统故障*/
_DIS_DSP_LEVEL2_1MENU_3, /* 110 EBS/ABS故障*/
_DIS_DSP_LEVEL2_1MENU_4, /* 111 仪表故障*/
_DEA_DSP_LEVEL2_1MENU_1, /* 114 发动机故障*/
_DEA_DSP_LEVEL2_1MENU_2, /* 115 SCR系统故障*/
_DEA_DSP_LEVEL2_1MENU_3, /* 116 EBS/ABS故障*/
_DEA_DSP_LEVEL2_1MENU_4, /* 117 仪表故障*/
_MN_DSP_MENU_MAX,
......@@ -553,6 +559,10 @@ EXTERN_MEU_PROCESS void LevelMenuTest_Do(void);
EXTERN_MEU_PROCESS void LevelMenuTest_Exit(void);
/*工厂模式*/
EXTERN_MEU_PROCESS void LevelF0Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF0Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF0Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Exit(void);
......@@ -618,6 +628,10 @@ EXTERN_MEU_PROCESS void LevelF1_1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Exit(void);
/*经销商模式*/
EXTERN_MEU_PROCESS void LevelD0Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelD0Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelD0Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelD1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelD1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelD1Menu_1Exit(void);
......@@ -642,4 +656,32 @@ EXTERN_MEU_PROCESS void LevelD1Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelD1Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelD1Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelD1_1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelD1_1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelD1_1Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelD1_2Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_2Exit(void);
#endif
source/Application/Graphic/Menu/Menu_user.c
View file @ fe802455
......@@ -124,48 +124,54 @@ const _MenuOptTab MenuOptTab[] =
/*81*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelMenuTest_Enter, LevelMenuTest_Do, LevelMenuTest_Exit},
/*工厂模式*/
/*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_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},
/*87*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit},
/*82*/{ _FAC_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF0Menu_1Enter, LevelF0Menu_1Do, LevelF0Menu_1Exit},
/*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*83*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit},
/*84*/{ _FAC_DSP_LEVEL1_2MENU_1, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit},
/*85*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit},
/*86*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit},
/*87*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit},
/*88*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit},
/*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_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},
/*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*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},
/*90*/{ _FAC_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*91*/{ _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},
/*92*/{ _FAC_DSP_LEVEL1_2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1_2Menu_3Enter, LevelF1_2Menu_3Do, LevelF1_2Menu_3Exit},
/*93*/{ _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1_2Menu_4Enter, LevelF1_2Menu_4Do, LevelF1_2Menu_4Exit},
/*93*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*94*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*95*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*96*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*94*/{ _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_2, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit},
/*95*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
/*96*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*97*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*98*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*99*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*经销商模式*/
/*97*/{ _DIS_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelD1Menu_1Enter, LevelD1Menu_1Do, LevelD1Menu_1Exit},
/*98*/{ _DIS_DSP_LEVEL1MENU_2, _DIS_DSP_LEVEL1MENU_1, _DIS_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelD1Menu_2Enter, LevelD1Menu_2Do, LevelD1Menu_2Exit},
/*99*/{ _DIS_DSP_LEVEL1_3MENU_1, _DIS_DSP_LEVEL1MENU_2, _DIS_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelD1Menu_3Enter, LevelD1Menu_3Do, LevelD1Menu_3Exit},
/*00*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_3, _DIS_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelD1Menu_4Enter, LevelD1Menu_4Do, LevelD1Menu_4Exit},
/*01*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_4, _DIS_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelD1Menu_5Enter, LevelD1Menu_5Do, LevelD1Menu_5Exit},
/*02*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit},
/*00*/{ _DEA_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD0Menu_1Enter, LevelD0Menu_1Do, LevelD0Menu_1Exit},
/*01*/{ _DEA_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelD1Menu_1Enter, LevelD1Menu_1Do, LevelD1Menu_1Exit},
/*02*/{ _DEA_DSP_LEVEL1_2MENU_1, _DEA_DSP_LEVEL1MENU_1, _DEA_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelD1Menu_2Enter, LevelD1Menu_2Do, LevelD1Menu_2Exit},
/*03*/{ _DEA_DSP_LEVEL1_3MENU_1, _DEA_DSP_LEVEL1MENU_2, _DEA_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelD1Menu_3Enter, LevelD1Menu_3Do, LevelD1Menu_3Exit},
/*04*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelD1Menu_4Enter, LevelD1Menu_4Do, LevelD1Menu_4Exit},
/*05*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_4, _DEA_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelD1Menu_5Enter, LevelD1Menu_5Do, LevelD1Menu_5Exit},
/*06*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit},
/*03*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*07*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelD1_1Menu_1Enter, LevelD1_1Menu_1Do, LevelD1_1Menu_1Exit},
/*04*/{ _DIS_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*05*/{ _DIS_DSP_LEVEL1MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*08*/{ _DEA_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, LevelD1_2Menu_1Enter, LevelD1_2Menu_1Do, LevelD1_2Menu_1Exit},
/*09*/{ _DEA_DSP_LEVEL1_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_2MENU_1, LevelD1_2Menu_2Enter, LevelD1_2Menu_2Do, LevelD1_2Menu_2Exit},
/*10*/{ _DEA_DSP_LEVEL1_2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_3Enter, LevelD1_2Menu_3Do, LevelD1_2Menu_3Exit},
/*11*/{ _DEA_DSP_LEVEL0MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_4Enter, LevelD1_2Menu_4Do, LevelD1_2Menu_4Exit},
/*06*/{ _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1_3MENU_2, _DIS_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit},
/*07*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
/*12*/{ _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_2, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_1Enter, LevelD1_3Menu_1Do, LevelD1_3Menu_1Exit},
/*13*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_2Enter, LevelD1_3Menu_2Do, LevelD1_3Menu_2Exit},
/*08*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*09*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*10*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*11*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*14*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*15*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*16*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*17*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
};
void NextMenu(_MENU_IDX idx)
......@@ -1651,6 +1657,16 @@ void LevelMenuTest_Exit(void)
{}
/*----工厂模式----*/
/*----工厂模式----MENU----*/
void LevelF0Menu_1Enter(void)
{}
void LevelF0Menu_1Do(void)
{
GUI_OftenShow_Display();
}
void LevelF0Menu_1Exit(void)
{}
/*----工厂模式----DTC显示-----*/
void LevelF1Menu_1Enter(void)
{}
......@@ -1833,14 +1849,25 @@ void LevelF1_3Menu_2Do(void)
void LevelF1_3Menu_2Exit(void)
{}
/*----经销商模式----*/
/*----经销商模式----MENU----*/
void LevelD0Menu_1Enter(void)
{}
void LevelD0Menu_1Do(void)
{
GUI_OftenShow_Display();
}
void LevelD0Menu_1Exit(void)
{}
/*----经销商模式----DTC显示----*/
void LevelD1Menu_1Enter(void)
{}
void LevelD1Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DisMenu1_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu1_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1Menu_1Exit(void)
{}
......@@ -1851,8 +1878,8 @@ void LevelD1Menu_2Enter(void)
void LevelD1Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DisMenu2_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu2_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1Menu_2Exit(void)
{}
......@@ -1863,8 +1890,8 @@ void LevelD1Menu_3Enter(void)
void LevelD1Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DisMenu3_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu3_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1Menu_3Exit(void)
{}
......@@ -1875,8 +1902,8 @@ void LevelD1Menu_4Enter(void)
void LevelD1Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DisMenu4_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1Menu_4Exit(void)
{}
......@@ -1887,8 +1914,8 @@ void LevelD1Menu_5Enter(void)
void LevelD1Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DisMenu5_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu5_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1Menu_5Exit(void)
{}
......@@ -1899,8 +1926,84 @@ void LevelD1Menu_6Enter(void)
void LevelD1Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DisMenu6_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DeaMenu6_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1Menu_6Exit(void)
{}
/*----经销商模式----DTC显示----*/
void LevelD1_1Menu_1Enter(void)
{}
void LevelD1_1Menu_1Do(void)
{
GUI_OftenShow_Display();
}
void LevelD1_1Menu_1Exit(void)
{}
/*----经销商模式----DTC清除1----*/
void LevelD1_2Menu_1Enter(void)
{}
void LevelD1_2Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DeaDTCClear1_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1_2Menu_1Exit(void)
{}
/*----经销商模式----DTC清除2----*/
void LevelD1_2Menu_2Enter(void)
{}
void LevelD1_2Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DeaDTCClear2_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1_2Menu_2Exit(void)
{}
/*----经销商模式----DTC清除3----*/
void LevelD1_2Menu_3Enter(void)
{}
void LevelD1_2Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DeaDTCClear3_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1_2Menu_3Exit(void)
{}
/*----经销商模式----DTC清除4----*/
void LevelD1_2Menu_4Enter(void)
{}
void LevelD1_2Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DeaDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1_2Menu_4Exit(void)
{}
/*----经销商模式----L0-7 H2-A----*/
void LevelD1_3Menu_1Enter(void)
{}
void LevelD1_3Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DeaMeter_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1_3Menu_1Exit(void)
{}
/*----经销商模式----L8-F H2-A*/
void LevelD1_3Menu_2Enter(void)
{}
void LevelD1_3Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DeaMeter_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1_3Menu_2Exit(void)
{}
\ No newline at end of file
source/Application/Graphic/UE/DisplaySch_user.c
View file @ fe802455
......@@ -415,7 +415,7 @@ void GUI_DisplayServices(void)
MenuFlag.Menu_Dealer = 0u;
MenuFlag.Menu_Popup_Flag = 3u;
NextMenu( _DIS_DSP_LEVEL1MENU_1 );
NextMenu( _DEA_DSP_LEVEL1MENU_1 );
}
else if (MenuFlag.Menu_Test == 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