Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VC66_7C
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISUZU
VC66_7C
Commits
9937a952
Commit
9937a952
authored
May 30, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
胎压未配置时,相关界面不可选中,变灰
parent
f4d8e204
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
2 deletions
+31
-2
Key_user.c
source/Application/APP/Key/Key_user.c
+23
-1
GUI.c
source/Application/Graphic/GUI/GUI.c
+8
-1
No files found.
source/Application/APP/Key/Key_user.c
View file @
9937a952
...
@@ -64,6 +64,11 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
...
@@ -64,6 +64,11 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
{
NextMenu
(
_MN_DSP_LEVEL2MENU_4
);
NextMenu
(
_MN_DSP_LEVEL2MENU_4
);
}
}
/*TPMS轮胎设定*/
else
if
((
bCurMenuIDX
==
_MN_DSP_LEVEL2_4_MENU_6
)
&&
(
K_Line_Set
.
K_Line_LID3E
!=
0x01u
))
{
NextMenu
(
_MN_DSP_LEVEL2_4_MENU_4
);
}
else
else
{
{
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_UP
);
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_UP
);
...
@@ -552,10 +557,27 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
...
@@ -552,10 +557,27 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{
{
/*系统演示模式*/
/*系统演示模式*/
if
((
bCurMenuIDX
==
_MN_DSP_LEVEL2MENU_4
)
&&
(
K_Line_Set
.
K_Line_LID27
!=
0x01u
)
&&
(
K_Line_Set
.
K_Line_LID28
!=
0x01u
))
if
((
bCurMenuIDX
==
_MN_DSP_LEVEL2MENU_4
)
&&
(
K_Line_Set
.
K_Line_LID27
!=
0x01u
)
&&
(
K_Line_Set
.
K_Line_LID28
!=
0x01u
))
{
if
(
K_Line_Set
.
K_Line_LID3E
==
0x01u
)
{
{
NextMenu
(
_MN_DSP_LEVEL2MENU_6
);
NextMenu
(
_MN_DSP_LEVEL2MENU_6
);
}
}
else
else
{
;
/*Do Notingh!*/
}
}
/*轮胎状态显示*/
else
if
((
bCurMenuIDX
==
_MN_DSP_LEVEL2MENU_5
)
&&
(
K_Line_Set
.
K_Line_LID3E
!=
0x01u
))
{
;
/*Do Notingh!*/
}
/*TPMS轮胎设定*/
else
if
((
bCurMenuIDX
==
_MN_DSP_LEVEL2_4_MENU_4
)
&&
(
K_Line_Set
.
K_Line_LID3E
!=
0x01u
))
{
NextMenu
(
_MN_DSP_LEVEL2_4_MENU_6
);
}
else
{
{
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_DOWN
);
NextMenu
(
MenuOptTab
[
bCurMenuIDX
].
VK_IDX_DOWN
);
}
}
...
...
source/Application/Graphic/GUI/GUI.c
View file @
9937a952
...
@@ -2946,9 +2946,16 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
...
@@ -2946,9 +2946,16 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
{
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_04_7black
+
State_Flag
.
USER_LANGUAGE
),
225u
,
GUI_DISP_MENU_Y
[
0u
],
GUI_BLENDMODE_SRC_OVER
);
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_04_7black
+
State_Flag
.
USER_LANGUAGE
),
225u
,
GUI_DISP_MENU_Y
[
0u
],
GUI_BLENDMODE_SRC_OVER
);
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_04_4black
+
State_Flag
.
USER_PROPOSAL
),
225u
,
GUI_DISP_MENU_Y
[
1u
],
GUI_BLENDMODE_SRC_OVER
);
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_04_4black
+
State_Flag
.
USER_PROPOSAL
),
225u
,
GUI_DISP_MENU_Y
[
1u
],
GUI_BLENDMODE_SRC_OVER
);
if
(
K_Line_Set
.
K_Line_LID3E
!=
0x01u
)
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_04_10black
+
1u
),
225u
,
GUI_DISP_MENU_Y
[
2u
],
GUI_BLENDMODE_SRC_OVER
);
}
else
{
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_04_10black
+
State_Flag
.
FState_TPMSSET
),
225u
,
GUI_DISP_MENU_Y
[
2u
],
GUI_BLENDMODE_SRC_OVER
);
GUI_Translate_Display
(
MENU_Sprite
,
(
CN_User_Menu2_04_10black
+
State_Flag
.
FState_TPMSSET
),
225u
,
GUI_DISP_MENU_Y
[
2u
],
GUI_BLENDMODE_SRC_OVER
);
}
}
}
}
}
else
else
{
{
GUI_General_Display
(
MENU_Sprite
,
SpriteSize
,
GUI_BLENDMODE_SRC_OVER
);
GUI_General_Display
(
MENU_Sprite
,
SpriteSize
,
GUI_BLENDMODE_SRC_OVER
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment