Skip to content

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

增加界面显示

parent 300990a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22713 additions and 22406 deletions
ghs/project
View file @ 662d87dc
No preview for this file type
ghs/project.hex
View file @ 662d87dc
This diff is collapsed.
ghs/project.siz
View file @ 662d87dc
project .intvect 1536
project .text 293660
project .rodata 408951
project .text 295052
project .rodata 408927
project .secinfo 120
project .syscall 6
project .romdata 9037
......
source/Application/APP/Key/Key_user.c
View file @ 662d87dc
......@@ -7,6 +7,9 @@
#include "Sound_Scheduler.h"
#include "System_Monitor.h"
#include "RTE_ADC.h"
#include "CAN_Communication_Matrix.h"
/*-------------------------------------------------------*/
/*无车速限制值*/
#define DISPSPEEDNULLMAX 66
......@@ -40,10 +43,13 @@ struct
*******************************UP***********************************************/
void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
uint8_t CanStatus1 = 0u;
uint16_t DispVSpeed = 0u;
KeyTest.Up ++ ;
HMI_Set_KEY_UP(enKeyEvent);
DispVSpeed = Common_Get_Disp_V_Speed();
CanStatus1 = CAN_MSG_Status(ID_CanMsg0CF00400_Msg_Count);
if (DispVSpeed <= DISPSPEEDNULLMAX)
{
......@@ -54,6 +60,14 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
/*一级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2MENU_6))
{
if ((CanStatus1 == CAN_SIG_LOST) && (bCurMenuIDX == _MN_DSP_LEVEL2MENU_2))
NextMenu(_MN_DSP_LEVEL2MENU_1);
else
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
}
}
else
......@@ -86,6 +100,11 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
/*一级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2MENU_6))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
}
}
else
......@@ -103,19 +122,43 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
*******************************ENTER***********************************************/
void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
{
uint8_t CanStatus1 = 0u;
uint16_t DispVSpeed = 0u;
KeyTest.Enter ++ ;
HMI_Set_KEY_CONFIRM(enKeyEvent);
DispVSpeed = Common_Get_Disp_V_Speed();
CanStatus1 = CAN_MSG_Status(ID_CanMsg0CF00400_Msg_Count);
if (DispVSpeed <= DISPSPEEDNULLMAX)
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*一级菜单 -- 二级菜单*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_7_MENU_1))
/*记录进入MENU菜单的位置*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6))
{
MenuFlag.Menu_Flag = bCurMenuIDX;
if (CanStatus1 == CAN_SIG_LOST) /*有故障码*/
{
NextMenu(_MN_DSP_LEVEL2MENU_1);
}
else /*无故障码*/
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
}
/*无论从哪都能回去*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/
{
NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/
}
else
{
NextMenu(MenuFlag.Menu_Flag);
}
}
}
}
......
source/Application/Graphic/GUI/GUI.c
View file @ 662d87dc
This diff is collapsed.
source/Application/Graphic/GUI/GUI.h
View file @ 662d87dc
......@@ -6,6 +6,49 @@
#include "images.h"
#include "TYW_stdint.h"
typedef struct
{
uint8_t FState_GZM ; /*故障码*/
uint8_t FState_WXTZ ; /*维修提醒*/
uint8_t FState_WXSD ; /*维修设定*/
uint8_t FState_YHSD ; /*用户设定*/
uint8_t FState_ECO ; /*ECO*/
uint8_t FState_TPMS ; /*胎压显示*/
uint8_t FState_SYSYS ; /*系统演示*/
uint8_t WXTZ_FDJY ; /*发动机油*/
uint8_t WXTZ_RYLQY ; /*燃油滤清油*/
uint8_t WXTZ_BSXY ; /*变速箱油*/
uint8_t WXTZ_CSQY ; /*差速器油*/
uint8_t WXTZ_LHQY ; /*离合器油*/
uint8_t WXTZ_KQGZJ ; /*空气干燥剂*/
uint8_t WXTZ_DLZXY ; /*动力转向油*/
uint8_t WXTZ_LT ; /*轮胎*/
uint8_t WXTZ_QDJ ; /*起动机*/
uint8_t WXSD_FDJY ; /*发动机*/
uint8_t WXSD_RYLQY ; /*燃油滤清油*/
uint8_t WXSD_BSXY ; /*变速箱油*/
uint8_t WXSD_CSQY ; /*差速器油*/
uint8_t WXSD_LHQY ; /*离合器油*/
uint8_t WXSD_KQGZJ ; /*空气转向*/
uint8_t WXSD_DLZXY ; /*动力转向*/
uint8_t WXSD_LT ; /*轮胎*/
uint8_t WXSD_QDJ ; /*起动机*/
uint8_t USER_DATE ; /*日期设定*/
uint8_t USER_TIME ; /*时间设定*/
uint8_t USER_DISPLAY ; /*显示设定*/
uint8_t USER_PROPOSAL ; /*省油设定*/
uint8_t USER_HSA ; /*HAS*/
uint8_t USER_VOLUEM ; /*音量设定*/
uint8_t USER_LANGUAGE ; /*语言设定*/
uint8_t USER_COMPANY ; /*单位设定*/
uint8_t USER_LIGHT ; /*亮度设定*/
uint8_t FState_TPMSSET ; /*胎压设置*/
} _Display_State_Flag;
extern volatile _Display_State_Flag State_Flag;
static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri};
static const uint32_t GUIGear[12u] = {CN_dangwei_01, CN_dangwei_02, CN_dangwei_03, CN_dangwei_04, CN_dangwei_05, CN_dangwei_06,
CN_dangwei_07, CN_dangwei_08, CN_dangwei_09, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12
......@@ -31,8 +74,12 @@ static const uint16_t GUI_DISP_MENUYear1[4] = {568u, 552u, 538u, 522u};
static const uint16_t GUI_DISP_MENUMonth1[2] = {617u, 604u};
static const uint16_t GUI_DISP_MENUDate1[2] = {669u, 653u};
static const uint16_t GUI_DISP_MENU_Y[4] = {150u, 198u, 246u, 294u};
extern void GUI_Display_KL15_ON_Init(void);
extern void GUI_Display_KL15_OFF_Init(void);
extern void GUI_Display_Value_Init(void); /*显示数据初始化*/
extern void GUI_Display_background(void); /*刷底图*/
extern void GUI_OftenShow_Display(void); /*常显界面*/
extern void GUI_Dynamic_DIsplay(void);
......@@ -57,9 +104,21 @@ void GUI_DPD_Display_Display(uint8_t Mode); /*DPD*/
void GUI_Time_OilTemp_Display(uint8_t Mode); /*转速时间-油温*/
void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转速时间-油温*/
void GUI_Year_Month_Data_Display(uint8_t Mode); /*年月日*/
void GUI_block_NULL_Display(uint8_t Mode);/**/
void GUI_BG_Menu_Display(uint8_t Mode);/*菜单项*/
void GUI_block_NULL_Display(uint8_t Mode); /*……*/
void GUI_BG_Menu_Display(uint8_t Mode); /*菜单项*/
void GUI_BG_Menu1_Display(uint8_t Mode);
void GUI_BG_Menu2_Display(uint8_t Mode);
void GUI_BG_Menu3_Display(uint8_t Mode);
void GUI_BG_Menu4_Display(uint8_t Mode);
void GUI_BG_Menu5_Display(uint8_t Mode);
void GUI_BG_Menu6_Display(uint8_t Mode);
void GUI_Test_Dispaly(uint8_t Mode);
#endif
#endif
\ No newline at end of file
source/Application/Graphic/Menu/Menu.h
View file @ 662d87dc
......@@ -16,31 +16,28 @@
typedef enum
{
/*主界面*/
_MN_DSP_LEVEL1MENU_1 = 0, // 0
_MN_DSP_LEVEL1MENU_2, // 1
_MN_DSP_LEVEL1MENU_3, // 2
_MN_DSP_LEVEL1MENU_4, // 3
_MN_DSP_LEVEL1MENU_5, // 4
_MN_DSP_LEVEL1MENU_6, // 5
_MN_DSP_LEVEL1MENU_7, // 6
_MN_DSP_LEVEPOPUP,
_MN_DSP_LEVEL1MENU_1 = 0, /* 00 平均车速，平均油耗*/
_MN_DSP_LEVEL1MENU_2, /* 01 电池电量*/
_MN_DSP_LEVEL1MENU_3, /* 02 DPD*/
_MN_DSP_LEVEL1MENU_4, /* 03 油温-转速时间*/
_MN_DSP_LEVEL1MENU_5, /* 04 日历*/
_MN_DSP_LEVEL1MENU_6, /* 05 空白*/
_MN_DSP_LEVEPOPUP, /* 06 报警界面显示*/
/*一级菜单*/
_MN_DSP_LEVEL2MENU_1, // 6
_MN_DSP_LEVEL2MENU_2, // 7
_MN_DSP_LEVEL2MENU_3, // 8
_MN_DSP_LEVEL2MENU_4, // 9
_MN_DSP_LEVEL2MENU_7, // 10
_MN_DSP_LEVEL2MENU_5, // 11
_MN_DSP_LEVEL2MENU_6, // 12
_MN_DSP_LEVEL2MENU_1, /* 07 故障码*/
_MN_DSP_LEVEL2MENU_2, /* 08 保养通知*/
_MN_DSP_LEVEL2MENU_3, /* 09 保养通知设定*/
_MN_DSP_LEVEL2MENU_4, /* 10 用户设定*/
_MN_DSP_LEVEL2MENU_5, /* 11 系统演示模式*/
_MN_DSP_LEVEL2MENU_6, /* 12 轮胎状态显示*/
/*二级菜单*/
_MN_DSP_LEVEL2_1_MENU_1, // 13
_MN_DSP_LEVEL2_2_MENU_1, // 14
_MN_DSP_LEVEL2_2_MENU_2, // 15
_MN_DSP_LEVEL2_2_MENU_3, // 16
_MN_DSP_LEVEL2_2_MENU_4, // 17
//_MN_DSP_LEVEL2_2_MENU_5 , //21
_MN_DSP_LEVEL2_2_MENU_5, // 21
_MN_DSP_LEVEL2_2_MENU_6, // 18
_MN_DSP_LEVEL2_2_MENU_7, // 19
_MN_DSP_LEVEL2_2_MENU_8, // 20
......@@ -50,21 +47,22 @@ typedef enum
_MN_DSP_LEVEL2_3_MENU_2, // 23
_MN_DSP_LEVEL2_3_MENU_3, // 24
_MN_DSP_LEVEL2_3_MENU_4, // 25
//_MN_DSP_LEVEL2_3_MENU_5 , //30
_MN_DSP_LEVEL2_3_MENU_5, // 30
_MN_DSP_LEVEL2_3_MENU_6, // 26
_MN_DSP_LEVEL2_3_MENU_7, // 27
_MN_DSP_LEVEL2_4_MENU_1, // 28
_MN_DSP_LEVEL2_4_MENU_2, // 29
_MN_DSP_LEVEL2_4_MENU_3, // 30
_MN_DSP_LEVEL2_4_MENU_A, // 31 ̥ѹÉèÖýçÃæ
_MN_DSP_LEVEL2_4_MENU_A, // 31
_MN_DSP_LEVEL2_4_MENU_4, // 32
_MN_DSP_LEVEL2_4_MENU_5, // 33
_MN_DSP_LEVEL2_4_MENU_6, // 34
_MN_DSP_LEVEL2_4_MENU_7, // 35
_MN_DSP_LEVEL2_4_MENU_8, // 36
_MN_DSP_LEVEL2_4_MENU_9, // 37
_MN_DSP_LEVEL2_7_MENU_1, // 38 ̥ѹÏÔʾ½çÃæ
_MN_DSP_LEVEL2_5_MENU_1, // 38
_MN_DSP_LEVEL2_6_MENU_1,
/*三级菜单*/
//_MN_DSP_LEVEL3_1_MENU_1 , //42
//_MN_DSP_LEVEL3_1_MENU_2 , //43
......@@ -192,15 +190,10 @@ EXTERN_MEU_PROCESS void Level1Menu_6Enter(void);
EXTERN_MEU_PROCESS void Level1Menu_6Do(void);
EXTERN_MEU_PROCESS void Level1Menu_6Exit(void);
EXTERN_MEU_PROCESS void Level1Menu_7Enter(void);
EXTERN_MEU_PROCESS void Level1Menu_7Do(void);
EXTERN_MEU_PROCESS void Level1Menu_7Exit(void);
EXTERN_MEU_PROCESS void LevelPopup_Enter(void);
EXTERN_MEU_PROCESS void LevelPopup_Do(void);
EXTERN_MEU_PROCESS void LevelPopup_Exit(void);
EXTERN_MEU_PROCESS void Level2Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level2Menu_1Do(void);
EXTERN_MEU_PROCESS void Level2Menu_1Exit(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 662d87dc
......@@ -20,25 +20,22 @@ const _MenuOptTab MenuOptTab[] =
{
/*---------ENTER---------------------UP-----------------------DOWN----------------------EXIT------------------ENTER------------------DO-----------------EXIT------------*/
/*主循环界面*/
/* 0*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_6, _MN_DSP_LEVEL1MENU_2, _MN_IDX_NULL, Level1Menu_1Enter, Level1Menu_1Do, Level1Menu_1Exit}, /* _MN_DSP_LEVEL1MENU_1 */
/* 1*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_1, _MN_DSP_LEVEL1MENU_3, _MN_IDX_NULL, Level1Menu_2Enter, Level1Menu_2Do, Level1Menu_2Exit}, /* _MN_DSP_LEVEL1MENU_2 */
/* 2*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_2, _MN_DSP_LEVEL1MENU_4, _MN_IDX_NULL, Level1Menu_3Enter, Level1Menu_3Do, Level1Menu_3Exit}, /* _MN_DSP_LEVEL1MENU_3 */
/* 3*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_3, _MN_DSP_LEVEL1MENU_5, _MN_IDX_NULL, Level1Menu_4Enter, Level1Menu_4Do, Level1Menu_4Exit}, /* _MN_DSP_LEVEL1MENU_4 */
/* 4*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_4, _MN_DSP_LEVEL1MENU_6, _MN_IDX_NULL, Level1Menu_5Enter, Level1Menu_5Do, Level1Menu_5Exit}, /* _MN_DSP_LEVEL1MENU_5 */
/* 5*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_5, _MN_DSP_LEVEL1MENU_1, _MN_IDX_NULL, Level1Menu_6Enter, Level1Menu_6Do, Level1Menu_6Exit}, /* _MN_DSP_LEVEL1MENU_6 */
/* 6*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, Level1Menu_7Enter, Level1Menu_7Do, Level1Menu_7Exit}, /* _MN_DSP_LEVEL1MENU_7 */
/* 7*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelPopup_Enter, LevelPopup_Do, LevelPopup_Exit }, /* _MN_DSP_LEVEPOPUP */
/*00*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_6, _MN_DSP_LEVEL1MENU_2, _MN_IDX_NULL, Level1Menu_1Enter, Level1Menu_1Do, Level1Menu_1Exit}, /* _MN_DSP_LEVEL1MENU_1 */
/*01*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_1, _MN_DSP_LEVEL1MENU_3, _MN_IDX_NULL, Level1Menu_2Enter, Level1Menu_2Do, Level1Menu_2Exit}, /* _MN_DSP_LEVEL1MENU_2 */
/*02*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_2, _MN_DSP_LEVEL1MENU_4, _MN_IDX_NULL, Level1Menu_3Enter, Level1Menu_3Do, Level1Menu_3Exit}, /* _MN_DSP_LEVEL1MENU_3 */
/*03*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_3, _MN_DSP_LEVEL1MENU_5, _MN_IDX_NULL, Level1Menu_4Enter, Level1Menu_4Do, Level1Menu_4Exit}, /* _MN_DSP_LEVEL1MENU_4 */
/*04*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_4, _MN_DSP_LEVEL1MENU_6, _MN_IDX_NULL, Level1Menu_5Enter, Level1Menu_5Do, Level1Menu_5Exit}, /* _MN_DSP_LEVEL1MENU_5 */
/*05*/{ _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL1MENU_5, _MN_DSP_LEVEL1MENU_1, _MN_IDX_NULL, Level1Menu_6Enter, Level1Menu_6Do, Level1Menu_6Exit}, /* _MN_DSP_LEVEL1MENU_6 */
/*06*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelPopup_Enter, LevelPopup_Do, LevelPopup_Exit }, /* _MN_DSP_LEVEPOPUP */
/*一级菜单 */
/* 6*/{ _MN_DSP_LEVEL2_1_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_2, _MN_IDX_NULL, Level2Menu_1Enter, Level2Menu_1Do, Level2Menu_1Exit}, /* _MN_DSP_LEVEL2MENU_1 */
/* 7*/{ _MN_DSP_LEVEL2_2_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_3, _MN_IDX_NULL, Level2Menu_2Enter, Level2Menu_2Do, Level2Menu_2Exit}, /* _MN_DSP_LEVEL2MENU_2 */
/* 8*/{ _MN_DSP_LEVEL2_3_MENU_1, _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL2MENU_4, _MN_IDX_NULL, Level2Menu_3Enter, Level2Menu_3Do, Level2Menu_3Exit}, /* _MN_DSP_LEVEL2MENU_3 */
/* 9*/{ _MN_DSP_LEVEL2_4_MENU_1, _MN_DSP_LEVEL2MENU_3, _MN_DSP_LEVEL2MENU_7, _MN_IDX_NULL, Level2Menu_4Enter, Level2Menu_4Do, Level2Menu_4Exit}, /* _MN_DSP_LEVEL2MENU_4 */
/*10*/{ _MN_DSP_LEVEL2_7_MENU_1, _MN_DSP_LEVEL2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_7Enter, Level2Menu_7Do, Level2Menu_7Exit}, /* _MN_DSP_LEVEL2MENU_7 */
/*11*/{ _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_7, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_5Enter, Level2Menu_5Do, Level2Menu_5Exit}, /* _MN_DSP_LEVEL2MENU_5 */
/*12*/{ _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_6Enter, Level2Menu_6Do, Level2Menu_6Exit}, /* _MN_DSP_LEVEL2MENU_6 */
/* 7*/{ _MN_DSP_LEVEL2_1_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_2, _MN_IDX_NULL, Level2Menu_1Enter, Level2Menu_1Do, Level2Menu_1Exit}, /* _MN_DSP_LEVEL2MENU_1 */
/* 8*/{ _MN_DSP_LEVEL2_2_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_3, _MN_IDX_NULL, Level2Menu_2Enter, Level2Menu_2Do, Level2Menu_2Exit}, /* _MN_DSP_LEVEL2MENU_2 */
/* 9*/{ _MN_DSP_LEVEL2_3_MENU_1, _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL2MENU_4, _MN_IDX_NULL, Level2Menu_3Enter, Level2Menu_3Do, Level2Menu_3Exit}, /* _MN_DSP_LEVEL2MENU_3 */
/*10*/{ _MN_DSP_LEVEL2_4_MENU_1, _MN_DSP_LEVEL2MENU_3, _MN_DSP_LEVEL2MENU_6, _MN_IDX_NULL, Level2Menu_4Enter, Level2Menu_4Do, Level2Menu_4Exit}, /* _MN_DSP_LEVEL2MENU_4 */
/*11*/{ _MN_DSP_LEVEL2_5_MENU_1, _MN_DSP_LEVEL2MENU_4, _MN_DSP_LEVEL2MENU_6, _MN_IDX_NULL, Level2Menu_5Enter, Level2Menu_5Do, Level2Menu_5Exit}, /* _MN_DSP_LEVEL2MENU_5 */
/*12*/{ _MN_DSP_LEVEL2_6_MENU_1, _MN_DSP_LEVEL2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_6Enter, Level2Menu_6Do, Level2Menu_6Exit}, /* _MN_DSP_LEVEL2MENU_6 */
/*二级菜单 */
/*13*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_1Enter, Level2_1Menu_1Do, Level2_1Menu_1Exit}, // _MN_DSP_LEVEL2_1_MENU_1
/*13*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_1Enter, Level2_1Menu_1Do, Level2_1Menu_1Exit}, // _MN_DSP_LEVEL2_1_MENU_1
/*14*///{ _MN_IDX_NULL, _MN_DSP_LEVEL2_1_MENU_1, _MN_DSP_LEVEL2_1_MENU_3, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_2Enter, Level2_1Menu_2Do, Level2_1Menu_2Exit}, // _MN_DSP_LEVEL2_1_MENU_2
/*15*///{ _MN_IDX_NULL, _MN_DSP_LEVEL2_1_MENU_2, _MN_DSP_LEVEL2_1_MENU_4, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_3Enter, Level2_1Menu_3Do, Level2_1Menu_3Exit}, // _MN_DSP_LEVEL2_1_MENU_3
/*16*///{ _MN_IDX_NULL, _MN_DSP_LEVEL2_1_MENU_3, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_1, Level2_1Menu_4Enter, Level2_1Menu_4Do, Level2_1Menu_4Exit}, // _MN_DSP_LEVEL2_1_MENU_4
......@@ -284,18 +281,6 @@ void Level1Menu_6Do(void)
void Level1Menu_6Exit(void)
{}
/*主界面7 亮度调节*/
void Level1Menu_7Enter(void)
{
}
void Level1Menu_7Do(void)
{
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
}
void Level1Menu_7Exit(void)
{}
/*主界面 报警界面*/
void LevelPopup_Enter(void)
{
......@@ -315,9 +300,9 @@ void Level2Menu_1Enter(void)
}
void Level2Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_Menu_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_Menu_Flag_Display(0, 1);
//GUI_BG_Menu1_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
void Level2Menu_1Exit(void)
{}
......@@ -327,9 +312,9 @@ void Level2Menu_2Enter(void)
}
void Level2Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_Menu_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_Menu_Flag_Display(0, 2);
//GUI_BG_Menu2_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_Menu2_Display(GUI_DISP_MODE_NORMAL);
}
void Level2Menu_2Exit(void)
{}
......@@ -339,9 +324,9 @@ void Level2Menu_3Enter(void)
}
void Level2Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_Menu_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_Menu_Flag_Display(0, 3);
//GUI_BG_Menu3_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_Menu3_Display(GUI_DISP_MODE_NORMAL);
}
void Level2Menu_3Exit(void)
{}
......@@ -351,46 +336,33 @@ void Level2Menu_4Enter(void)
}
void Level2Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_Menu_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_Menu_Flag_Display(0, 4);
//GUI_BG_Menu4_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_Menu4_Display(GUI_DISP_MODE_NORMAL);
}
void Level2Menu_4Exit(void)
{}
/*二级界面 胎压显示*/
void Level2Menu_7Enter(void)
{
}
void Level2Menu_7Do(void)
{
GUI_BG_Menu_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_Menu_Flag_Display(0, 5);
//GUI_BG_Menu7_Display(GUI_DISP_MODE_NORMAL);
}
void Level2Menu_7Exit(void)
{}
/*二级界面 ECO状态显示*/
/*二级界面 系统演示*/
void Level2Menu_5Enter(void)
{
}
void Level2Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_Menu_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_Menu_Flag_Display(0, 6);
//GUI_BG_Menu5_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_Menu5_Display(GUI_DISP_MODE_NORMAL);
}
void Level2Menu_5Exit(void)
{}
/*二级界面 系统演示模式*/
/*二级界面 胎压显示*/
void Level2Menu_6Enter(void)
{
}
void Level2Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_Menu_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_Menu_Flag_Display(0, 6);
//GUI_BG_Menu6_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_Menu6_Display(GUI_DISP_MODE_NORMAL);
}
void Level2Menu_6Exit(void)
{}
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 662d87dc
......@@ -8,6 +8,7 @@
#include "GUI.h"
#include "Services_ODO_User.h" /*清空总计里程函数*/
#include "Menu.h"
#include "jcua.h"
uint32_t EnterTimer [ 10 ];
uint8_t UE_EN [ Display_MAX ];
......@@ -211,10 +212,18 @@ void GUI_DisplayServices(void)
if (bCurMenuIDX > _MN_DSP_LEVEPOPUP)
{
loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
if (Common_Get_window_Sta() != 0u)
{
JCUA_Disable_window();
}
}
else
{
loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
if (Common_Get_window_Sta() != 1u)
{
JCUA_Enable_window();
}
}
MenuManage();
//BG_display_flag = 0;
......
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