Skip to content

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

调整显示

parent 488e81b6
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 9 deletions
source/Application/APP/Key/Key_user.c
View file @ 96289f7d
......@@ -858,7 +858,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
/*工厂模式 经销商模式*/
else if ((bCurMenuIDX >= _FAC_DSP_LEVEL0MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{
if ((bCurMenuIDX == _FAC_DSP_LEVEL1MENU_5) || (bCurMenuIDX == _DEA_DSP_LEVEL1MENU_5))
if ((bCurMenuIDX == _FAC_DSP_LEVEL2_5MENU_1) || (bCurMenuIDX == _DEA_DSP_LEVEL2_5MENU_1))
{
K_Line_Set.K_Line_LID51 = 1u;
}
......@@ -905,7 +905,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
/*工厂模式 经销商模式*/
if ((bCurMenuIDX >= _FAC_DSP_LEVEL0MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{
if ((bCurMenuIDX == _FAC_DSP_LEVEL1MENU_5) || (bCurMenuIDX == _DEA_DSP_LEVEL1MENU_5))
if ((bCurMenuIDX == _FAC_DSP_LEVEL2_5MENU_1) || (bCurMenuIDX == _DEA_DSP_LEVEL2_5MENU_1))
{
K_Line_Set.K_Line_LID51 = 1u;
}
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 96289f7d
......@@ -532,6 +532,16 @@ void Can_Set_Buff_18FFE517(uint8_t CopyData[])
CopyData[5] = 0u; /* 6 */
CopyData[6] = 0u; /* 7 */
CopyData[7] = 0u; /* 8 */
/*_FAC_DSP_LEVEL1_2MENU_3 _DEA_DSP_LEVEL1_2MENU_3界面发送 两帧 500ms*/
// CopyData[0] = 0x55u; /* 1 */
// CopyData[1] = 0x00u; /* 2 */
// CopyData[2] = 0x00u; /* 3 */
// CopyData[3] = 0xFFu; /* 4 */
// CopyData[4] = 0xFFu; /* 5 */
// CopyData[5] = 0xFFu; /* 6 */
// CopyData[6] = 0xFFu; /* 7 */
// CopyData[7] = 0xFFu; /* 8 */
}
/*-------------------------------------------------------------------------
* Function Name : Can_Set_Buff_18EF2D17
......
source/Application/Graphic/GUI/GUI.c
View file @ 96289f7d
......@@ -6948,7 +6948,32 @@ void GUI_BG_FacMeter_Display(uint8_t Mode)
}
}
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMeterExit_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMeterExit_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_07_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); /*长度条*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_07_1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no , GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -7177,6 +7202,7 @@ void GUI_BG_DeaDTCClear1_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -7246,6 +7272,7 @@ void GUI_BG_DeaDTCClear4_Display(uint8_t Mode)
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);
GUI_General_Display(MENU_Sprite, CN_white_jieshu_1, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -7263,7 +7290,6 @@ void GUI_BG_DeaDTCClear4_Display(uint8_t Mode)
--------------------------------------------------------------------------*/
void GUI_BG_DeaMeter_Display(uint8_t Mode)
{
uint8_t i = 0u;
uint8_t j = 0u;
......@@ -7360,7 +7386,32 @@ void GUI_BG_DeaMeter_Display(uint8_t Mode)
}
}
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DeaMeterExit_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DeaMeterExit_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_DLR_Menu1_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); /*长度条*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_07_1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no , GUI_BLENDMODE_SRC_OVER);
}
else
{
......
source/Application/Graphic/GUI/GUI.h
View file @ 96289f7d
......@@ -434,6 +434,7 @@ 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_FacMeterExit_Display(uint8_t Mode); /*工厂模式是否结束工厂模式*/
void GUI_DeaMenu_Display(uint8_t Mode); /*经销商模式MENU*/
void GUI_BG_DeaMenu_Display(uint8_t Mode); /*经销商模式*/
void GUI_BG_DeaMenu1_Display(uint8_t Mode); /**/
......@@ -447,6 +448,7 @@ void GUI_BG_DeaDTCClear2_Display(uint8_t Mode); /*经销商模式清除D
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_BG_DeaMeterExit_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 @ 96289f7d
......@@ -146,6 +146,8 @@ typedef enum
_FAC_DSP_LEVEL2_1MENU_3, /* 98 EBS/ABS故障*/
_FAC_DSP_LEVEL2_1MENU_4, /* 99 仪表故障*/
_FAC_DSP_LEVEL2_5MENU_1, /*100 是否结束工厂模式*/
/*经销商模式*/
_DEA_DSP_LEVEL0MENU_1, /*100*/
......@@ -171,6 +173,8 @@ typedef enum
_DEA_DSP_LEVEL2_1MENU_3, /* 116 EBS/ABS故障*/
_DEA_DSP_LEVEL2_1MENU_4, /* 117 仪表故障*/
_DEA_DSP_LEVEL2_5MENU_1, /*100 是否结束经销商模式*/
_MN_DSP_MENU_MAX,
} _MenuCode;
......@@ -627,6 +631,10 @@ EXTERN_MEU_PROCESS void LevelF1_1Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Exit(void);
/*经销商模式*/
EXTERN_MEU_PROCESS void LevelD0Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelD0Menu_1Do(void);
......@@ -684,4 +692,8 @@ EXTERN_MEU_PROCESS void LevelD1_3Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelD1_3Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelD2_5Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelD2_5Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelD2_5Menu_1Exit(void);
#endif
source/Application/Graphic/Menu/Menu_user.c
View file @ 96289f7d
......@@ -130,7 +130,7 @@ const _MenuOptTab MenuOptTab[] =
/*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},
/*87*/{ _FAC_DSP_LEVEL2_5MENU_1, _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*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
......@@ -148,6 +148,8 @@ const _MenuOptTab MenuOptTab[] =
/*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},
/*99*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, LevelF2_5Menu_1Enter, LevelF2_5Menu_1Do, LevelF2_5Menu_1Exit},
/*经销商模式*/
/*00*/{ _DEA_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD0Menu_1Enter, LevelD0Menu_1Do, LevelD0Menu_1Exit},
......@@ -155,7 +157,7 @@ const _MenuOptTab MenuOptTab[] =
/*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},
/*05*/{ _DEA_DSP_LEVEL2_5MENU_1, _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},
/*07*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelD1_1Menu_1Enter, LevelD1_1Menu_1Do, LevelD1_1Menu_1Exit},
......@@ -173,6 +175,7 @@ const _MenuOptTab MenuOptTab[] =
/*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},
/*17*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_5, LevelD2_5Menu_1Enter, LevelD2_5Menu_1Do, LevelD2_5Menu_1Exit},
};
void NextMenu(_MENU_IDX idx)
{
......@@ -1850,6 +1853,17 @@ void LevelF1_3Menu_2Do(void)
void LevelF1_3Menu_2Exit(void)
{}
/*----工厂模式----是否结束工厂模式-----*/
void LevelF2_5Menu_1Enter(void)
{}
void LevelF2_5Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMeterExit_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF2_5Menu_1Exit(void)
{}
/*----经销商模式----*/
/*----经销商模式----MENU----*/
void LevelD0Menu_1Enter(void)
......@@ -2008,4 +2022,15 @@ void LevelD1_3Menu_2Do(void)
GUI_BG_DeaMeter_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD1_3Menu_2Exit(void)
{}
/*----经销商模式----结束经销商模式----*/
void LevelD2_5Menu_1Enter(void)
{}
void LevelD2_5Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DeaMeterExit_Display(GUI_DISP_MODE_NORMAL);
}
void LevelD2_5Menu_1Exit(void)
{}
\ No newline at end of file
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 96289f7d
......@@ -313,16 +313,16 @@ void GUI_DisplayServices(void)
MenuFlag.Menu_Factory = 0u;
MenuFlag.Menu_Popup_Flag = 2u;
NextMenu( _FAC_DSP_LEVEL1MENU_1 );
bCurMenuIDX = _FAC_DSP_LEVEL1MENU_1;
NextMenu( _FAC_DSP_LEVEL0MENU_1 );
bCurMenuIDX = _FAC_DSP_LEVEL0MENU_1;
}
else if (MenuFlag.Menu_Dealer == 1u)
{
MenuFlag.Menu_Dealer = 0u;
MenuFlag.Menu_Popup_Flag = 3u;
NextMenu( _DEA_DSP_LEVEL1MENU_1 );
bCurMenuIDX = _DEA_DSP_LEVEL1MENU_1;
NextMenu( _DEA_DSP_LEVEL0MENU_1 );
bCurMenuIDX = _DEA_DSP_LEVEL0MENU_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