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
411f87f0
Commit
411f87f0
authored
Dec 17, 2021
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整报警逻辑,显示状态
parent
bc1ecddc
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
221 additions
and
121 deletions
+221
-121
Popups.c
source/Application/Alarm/Popups.c
+198
-112
GUI.c
source/Application/Graphic/GUI/GUI.c
+23
-8
DisplaySch_user.c
source/Application/Graphic/UE/DisplaySch_user.c
+0
-1
No files found.
source/Application/Alarm/Popups.c
View file @
411f87f0
This diff is collapsed.
Click to expand it.
source/Application/Graphic/GUI/GUI.c
View file @
411f87f0
...
...
@@ -5898,6 +5898,7 @@ void GUI_General_Popup(void)
PopupSnd
=
Popup_Get_Current_Sound
();
GUI_OftenShow_Display
();
GUI_Dynamic_DIsplay
();
Popups_Displaying
(
PopupMsg
);
Popups_Sound_Playing
(
PopupSnd
);
...
...
@@ -5913,25 +5914,39 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
{
uint16_t
V_Speed
=
0u
;
//
if (PopupMsg >= POPUP_MSG_NUMBER_TOTAL)
//
{
//
return;
//
}
if
(
PopupMsg
>=
POPUP_MSG_NUMBER_TOTAL
)
{
return
;
}
V_Speed
=
Common_Get_Act_V_Speed
();
if
(
V_Speed
>
66u
)
/*有车速*/
{
GUI_General_Display
(
MultiPurpose_Sprite
,
CN_Alarm_01_image
,
GUI_BLENDMODE_SRC_OVER
);
/*红*/
//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑*/
if
((
PopupMsg
==
POPUP1_MSG_BRAKE_BLACK
)
||
(
PopupMsg
==
POPUP1_MSG_BRAKE_BRAKE
))
{
GUI_General_Display
(
MultiPurpose_Sprite
,
CN_Alarm_01_image
,
GUI_BLENDMODE_SRC_OVER
);
/*红底*/
}
else
{
GUI_General_Display
(
MultiPurpose_Sprite
,
CN_Alarm_01_imageblack
,
GUI_BLENDMODE_SRC_OVER
);
/*黑底*/
}
GUI_General_Display
(
MultiPurpose_Sprite
,
GUIGeneralPopupTable
[
PopupMsg
].
PICIcon
,
GUI_BLENDMODE_CUSTOM
);
GUI_General_Display
(
MultiPurpose_Sprite
,
GUIGeneralPopupTable
[
PopupMsg
].
HImageCN1
,
GUI_BLENDMODE_CUSTOM
);
GUI_General_Display
(
MultiPurpose_Sprite
,
GUIGeneralPopupTable
[
PopupMsg
].
HImageCN2
,
GUI_BLENDMODE_CUSTOM
);
}
else
{
GUI_General_Display
(
MultiPurpose_Sprite
,
CN_Alarm_01_image
,
GUI_BLENDMODE_SRC_OVER
);
/*红*/
//GUI_General_Display(MultiPurpose_Sprite, CN_Alarm_01_imageblack, GUI_BLENDMODE_SRC_OVER); /*黑*/
if
((
PopupMsg
==
POPUP1_MSG_BRAKE_BLACK
)
||
(
PopupMsg
==
POPUP1_MSG_BRAKE_BRAKE
))
{
GUI_General_Display
(
MultiPurpose_Sprite
,
CN_Alarm_01_image
,
GUI_BLENDMODE_SRC_OVER
);
/*红底*/
}
else
{
GUI_General_Display
(
MultiPurpose_Sprite
,
CN_Alarm_01_imageblack
,
GUI_BLENDMODE_SRC_OVER
);
/*黑底*/
}
GUI_General_Display
(
MultiPurpose_Sprite
,
GUIGeneralPopupTable
[
PopupMsg
].
PICIcon
,
GUI_BLENDMODE_CUSTOM
);
GUI_General_Display
(
MultiPurpose_Sprite
,
GUIGeneralPopupTable
[
PopupMsg
].
HImageCN3
,
GUI_BLENDMODE_CUSTOM
);
GUI_General_Display
(
MultiPurpose_Sprite
,
GUIGeneralPopupTable
[
PopupMsg
].
HImageCN4
,
GUI_BLENDMODE_CUSTOM
);
...
...
source/Application/Graphic/UE/DisplaySch_user.c
View file @
411f87f0
...
...
@@ -222,7 +222,6 @@ void GUI_DisplayServices(void)
}
GUI_General_Popup
();
GUI_Dynamic_DIsplay
();
}
else
{
...
...
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