Skip to content

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

调整界面逻辑

parent fe802455
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 12 deletions
source/Application/APP/Key/Key_user.c
View file @ 921095a3
...@@ -344,6 +344,10 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -344,6 +344,10 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
} }
else
{
;/*Do Nothing!*/
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -370,7 +374,18 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -370,7 +374,18 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{ {
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
; /*D0 Nothing!*/ /*工厂模式*/ /*经销商模式*/
if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_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);
}
else
{
;/*Do Nothing!*/
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -708,6 +723,10 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -708,6 +723,10 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
} }
else
{
;/*Do Nothing!*/
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -734,7 +753,18 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -734,7 +753,18 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{ {
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
; /*D0 Nothing!*/ /*工厂模式*/ /*经销商模式*/
if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_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);
}
else
{
;/*Do Nothing!*/
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -826,9 +856,20 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent) ...@@ -826,9 +856,20 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
NextMenu(_MN_DSP_RETURN_MENU); NextMenu(_MN_DSP_RETURN_MENU);
} }
/*工厂模式 经销商模式*/ /*工厂模式 经销商模式*/
else if ((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL2_1MENU_4)) else if ((bCurMenuIDX >= _FAC_DSP_LEVEL0MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER); if ((bCurMenuIDX == _FAC_DSP_LEVEL1MENU_5) || (bCurMenuIDX == _DEA_DSP_LEVEL1MENU_5))
{
K_Line_Set.K_Line_LID51 = 1u;
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
}
else
{
;/*Do Nothing!*/
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
...@@ -861,7 +902,22 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent) ...@@ -861,7 +902,22 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
{ {
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
; /*D0 Nothing!*/ /*工厂模式 经销商模式*/
if ((bCurMenuIDX >= _FAC_DSP_LEVEL0MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{
if ((bCurMenuIDX == _FAC_DSP_LEVEL1MENU_5) || (bCurMenuIDX == _DEA_DSP_LEVEL1MENU_5))
{
K_Line_Set.K_Line_LID51 = 1u;
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
}
else
{
;/*Do Nothing!*/
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -954,6 +1010,11 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -954,6 +1010,11 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
NextMenu(MenuFlag.Menu_Enter_Return); NextMenu(MenuFlag.Menu_Enter_Return);
} }
/*工厂模式 经销商模式*/
else if ((bCurMenuIDX >= _FAC_DSP_LEVEL0MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
}
else else
{ {
; /*do nothing*/ ; /*do nothing*/
...@@ -984,7 +1045,15 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -984,7 +1045,15 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
/*----有车速，无报警----*/ /*----有车速，无报警----*/
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
; /*Do Nothing!*/ /*工厂模式 经销商模式*/
if ((bCurMenuIDX >= _FAC_DSP_LEVEL0MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
}
else
{
; /*do nothing*/
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -1047,7 +1116,7 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -1047,7 +1116,7 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
/*自检模式进入经销商模式*/ /*自检模式进入经销商模式*/
else if (bCurMenuIDX == _MN_DSP_Menu_Test) else if (bCurMenuIDX == _MN_DSP_Menu_Test)
{ {
MenuFlag.Meun_Test_Dealer = 1u; K_Line_Set.K_Line_LID51 = 0x02;
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
......
source/Application/Graphic/GUI/GUI.c
View file @ 921095a3
...@@ -6367,6 +6367,30 @@ void Loc_Display_Blue(void) ...@@ -6367,6 +6367,30 @@ void Loc_Display_Blue(void)
R_WM_FrameWait(0, 0); R_WM_FrameWait(0, 0);
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_FacMenu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_FacMenu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_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_06_1black, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu_Display * Function Name : GUI_BG_FacMenu_Display
* Description : * Description :
...@@ -6928,6 +6952,29 @@ void GUI_BG_FacMeter_Display(uint8_t Mode) ...@@ -6928,6 +6952,29 @@ void GUI_BG_FacMeter_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_DeaMenu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_DeaMenu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_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_DLR_Menu2_07_1black, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_DeaMenu_Display * Function Name : GUI_BG_DeaMenu_Display
* Description : * Description :
...@@ -7171,7 +7218,7 @@ void GUI_BG_DeaDTCClear3_Display(uint8_t Mode) ...@@ -7171,7 +7218,7 @@ void GUI_BG_DeaDTCClear3_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/ 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_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -7194,7 +7241,7 @@ void GUI_BG_DeaDTCClear4_Display(uint8_t Mode) ...@@ -7194,7 +7241,7 @@ void GUI_BG_DeaDTCClear4_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/ 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_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_4, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
......
source/Application/Graphic/GUI/GUI.h
View file @ 921095a3
...@@ -418,6 +418,7 @@ void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode); /**/ ...@@ -418,6 +418,7 @@ void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/
void GUI_BG_User_Light1_Display(uint8_t Mode); /**/ void GUI_BG_User_Light1_Display(uint8_t Mode); /**/
void GUI_BG_User_Light2_Display(uint8_t Mode); /**/ void GUI_BG_User_Light2_Display(uint8_t Mode); /**/
void GUI_FacMenu_Display(uint8_t Mode); /*工厂模式MENU*/
void GUI_BG_FacMenu_Display(uint8_t Mode); /*工厂模式*/ void GUI_BG_FacMenu_Display(uint8_t Mode); /*工厂模式*/
void GUI_BG_FacMenu1_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu1_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu2_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu2_Display(uint8_t Mode); /**/
...@@ -430,6 +431,7 @@ void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2 ...@@ -430,6 +431,7 @@ void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2
void GUI_BG_FacDTCClear3_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_FacDTCClear4_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacMeter_Display(uint8_t Mode); /*工厂模式仪表显示*/ void GUI_BG_FacMeter_Display(uint8_t Mode); /*工厂模式仪表显示*/
void GUI_DeaMenu_Display(uint8_t Mode); /*经销商模式MENU*/
void GUI_BG_DeaMenu_Display(uint8_t Mode); /*经销商模式*/ void GUI_BG_DeaMenu_Display(uint8_t Mode); /*经销商模式*/
void GUI_BG_DeaMenu1_Display(uint8_t Mode); /**/ void GUI_BG_DeaMenu1_Display(uint8_t Mode); /**/
void GUI_BG_DeaMenu2_Display(uint8_t Mode); /**/ void GUI_BG_DeaMenu2_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 921095a3
...@@ -1663,6 +1663,7 @@ void LevelF0Menu_1Enter(void) ...@@ -1663,6 +1663,7 @@ void LevelF0Menu_1Enter(void)
void LevelF0Menu_1Do(void) void LevelF0Menu_1Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_FacMenu_Display(GUI_DISP_MODE_NORMAL);
} }
void LevelF0Menu_1Exit(void) void LevelF0Menu_1Exit(void)
{} {}
...@@ -1856,6 +1857,7 @@ void LevelD0Menu_1Enter(void) ...@@ -1856,6 +1857,7 @@ void LevelD0Menu_1Enter(void)
void LevelD0Menu_1Do(void) void LevelD0Menu_1Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_DeaMenu_Display(GUI_DISP_MODE_NORMAL);
} }
void LevelD0Menu_1Exit(void) void LevelD0Menu_1Exit(void)
{} {}
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 921095a3
...@@ -191,7 +191,7 @@ void DisplayServices(void) ...@@ -191,7 +191,7 @@ void DisplayServices(void)
/*经销商模式*/ /*经销商模式*/
else if (MenuFlag.Menu_Popup_Flag == 3u) else if (MenuFlag.Menu_Popup_Flag == 3u)
{ {
if ((K_Line_Set.K_Line_LID51 == 0x01u) && (MenuFlag.Meun_Test_Dealer != 1u)) /*MenuFlag.Key_MenuTest_ShortNum EOL51变化时要清零*/ if (K_Line_Set.K_Line_LID51 == 0x01u)
{ {
MenuFlag.Menu_Popup_Flag = 1u; MenuFlag.Menu_Popup_Flag = 1u;
} }
...@@ -211,7 +211,7 @@ void DisplayServices(void) ...@@ -211,7 +211,7 @@ void DisplayServices(void)
{ {
MenuFlag.Menu_Popup_Flag = 1u; MenuFlag.Menu_Popup_Flag = 1u;
} }
else if (MenuFlag.Meun_Test_Dealer == 1u) else if (K_Line_Set.K_Line_LID51 == 0x02u)
{ {
MenuFlag.Menu_Dealer = 1u; MenuFlag.Menu_Dealer = 1u;
} }
...@@ -426,7 +426,7 @@ void GUI_DisplayServices(void) ...@@ -426,7 +426,7 @@ void GUI_DisplayServices(void)
} }
if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) || if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) ||
(bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1)) (bCurMenuIDX >= _FAC_DSP_LEVEL0MENU_1))
{ {
loc_Del_Sprite(ADAS_Sprite, Gear_Sprite); loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
if (Common_Get_window_Sta() != 0u) if (Common_Get_window_Sta() != 0u)
......
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