Skip to content

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

调整上电时序

parent be31bd57
Hide whitespace changes
Inline Side-by-side
Showing with 1312 additions and 1064 deletions
source/Application/Graphic/GUI/GUI.c
View file @ b4784644
......@@ -60,7 +60,7 @@ void GUI_Display_KL15_ON_Init(void)
{
loc_enable_mem(WET_Sprite, Calendar_Sprite);
GUI_Display_Value_Init();
GUI_Display_background();
//GUI_Display_background();
}
/*-------------------------------------------------------------------------
......@@ -88,8 +88,18 @@ void GUI_Display_KL15_OFF_Init(void)
void GUI_Display_background(void)
{
GUI_General_Display(WET_Sprite, ditu_2, GUI_BLENDMODE_CUSTOM);
//GUI_General_Display(WET_Sprite, isuzu_113, GUI_BLENDMODE_SRC_OVER);
}
/*开机动画*/
void GUI_Display_Animation_Frame(uint16_t frame)
{
if (frame >= 113u)
{
frame = 113u;
}
GUI_General_Display(WET_Sprite, isuzu_000 + frame, GUI_BLENDMODE_SRC_OVER);
}
void GUI_Display_Value_Init(void)
{
/*菜单状态初始化*/
......
source/Application/Graphic/GUI/GUI.h
View file @ b4784644
......@@ -17,7 +17,7 @@
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10201)) /*硬件版本号 HV:01.02.00*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10101)) /*软件版本号 SV:01.01.00*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(10)) /*FLASH版本号 FV:00.10*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(11)) /*FLASH版本号 FV:00.11*/
typedef struct
{
......@@ -330,7 +330,7 @@ extern void GUI_Display_background(void); /*刷底图*/
extern void GUI_OftenShow_Display(void); /*常显界面*/
extern void GUI_OftenShowOFF_Display(void);
extern void GUI_Dynamic_DIsplay(void);
void GUI_Display_Animation_Frame(uint16_t frame);
void GUI_AC_Temp_Dispaly(uint8_t Mode); /*室外温度显示*/
void GUI_Time_Dispaly(uint8_t Mode); /*时间显示*/
void GUI_Data_Dispaly(uint8_t Mode); /*日历显示*/
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ b4784644
......@@ -89,6 +89,7 @@ void DisplayServices(void)
UE_EN[Display_StartAnimation] = UE_Enable;
UE_EN[Display_Menu] = UE_Disable;
UE_EN[Display_Alarm] = UE_Disable;
UE_EN[Display_Nothing] = UE_Disable;
}
else
{
......@@ -227,12 +228,13 @@ void DisplayServices(void)
/*----开机动画----*/
void Display_StartAnimationEnter(void)
{
HMI_StartAnimationFrameCnt = 0u;
/*硬清空所有缓存数据*/
loc_free_mem(WET_Sprite, MENU_Sprite);
/*使能底图窗口*/
JCUA_Enable_window();
//GUI_Display_background();
}
void Display_StartAnimationService(void)
{
......@@ -242,14 +244,21 @@ void Display_StartAnimationService(void)
m16_FrameCnt = HMI_StartAnimationFrameCnt;
if ((m16_FrameCnt % 3) == 0)
{
loc_Disable_Window_App();
// GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
GUI_Display_background();
//loc_Disable_Window_App();
GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
//GUI_Display_background();
}
}
void Display_StartAnimationExit(void)
{
/*开机动画播放完毕使能底图窗口 二次使能窗口*/
JCUA_Enable_window();
/*使能PNG窗口*/
loc_Enable_Window_App();
/*刷底图*/
GUI_Display_background();
}
/*----菜单----*/
......@@ -367,15 +376,21 @@ void GUI_DisplayServices(void)
//NextMenu(_MN_DSP_Menu_OFF);
}
}
if (PowerStatus == COMMON_POWER_ON)
if (HMI_MENU_Sta != Display_StartAnimation)
{
MenuManage();
if (PowerStatus == COMMON_POWER_ON)
{
MenuManage();
}
else
{
GUI_Time_OilTemp_OFF_Display(GUI_DISP_MODE_NORMAL);
BG_display_flag = 0u;
}
}
else
{
GUI_Time_OilTemp_OFF_Display(GUI_DISP_MODE_NORMAL);
BG_display_flag = 0u;
; /*Do Nothing!*/
}
}
......
source/Application/Graphic/UE/DisplaySch_user.h
View file @ b4784644
......@@ -13,7 +13,7 @@
#define UE_Enable 1U
#define DisplayAnimationTime 3500u
#define DisplayAnimationTime 4500u
#define DisplayMenuTime 5000u / 10u
#define MAX_DriveInfoPage 6u
#define FUNC_ENABLE 1u
......
source/Application/common/TYW_stdint.h
View file @ b4784644
......@@ -310,12 +310,9 @@ typedef enum
#define Telltales_SelfCheckOffset (uint32_t)(2ul)
#define StartAnimationStart (uint32_t)(2ul)
//#define StartAnimationEnd (uint32_t)(3000ul)
#define PopupStart (uint32_t)(4000ul)
#define StartAnimationEnd (uint32_t)(50ul)
//#define PopupStart (uint32_t)(1000ul)
#define StartAnimationEnd (uint32_t)(4500ul)
#define PopupStart (uint32_t)(5000ul)
#define BackLightStart (uint32_t)(2ul)
/*LED Module*/
typedef enum
......
source/Driver/Graphic/han00002ce20.h
View file @ b4784644
......@@ -4,7 +4,7 @@ static const HanSansCNFontPos_t Hansans00002ce20[] =
{
//{charid, xpos, ypos, width, height, xoffset, yoffset, xadvance}
{ 0 , 3995 , 552 , 4 , 22 , 0 , 0 , 4 },
#if 1
#if 0
{ 1 , 3995 , 23 , 4 , 22 , 0 , 0 , 4 },
{ 2 , 3995 , 805 , 4 , 22 , 0 , 0 , 4 },
{ 3 , 3995 , 759 , 4 , 22 , 0 , 0 , 4 },
source/Driver/Graphic/images.c
View file @ b4784644
This source diff could not be displayed because it is too large. You can view the blob instead.
source/Driver/Graphic/images.h
View file @ b4784644
......@@ -31,6 +31,119 @@ enum SpriteName
ditu = 0u,
ditu_1,
ditu_2,
isuzu_000,
isuzu_001,
isuzu_002,
isuzu_003,
isuzu_004,
isuzu_005,
isuzu_006,
isuzu_007,
isuzu_008,
isuzu_009,
isuzu_010,
isuzu_011,
isuzu_012,
isuzu_013,
isuzu_014,
isuzu_015,
isuzu_016,
isuzu_017,
isuzu_018,
isuzu_019,
isuzu_020,
isuzu_021,
isuzu_022,
isuzu_023,
isuzu_024,
isuzu_025,
isuzu_026,
isuzu_027,
isuzu_028,
isuzu_029,
isuzu_030,
isuzu_031,
isuzu_032,
isuzu_033,
isuzu_034,
isuzu_035,
isuzu_036,
isuzu_037,
isuzu_038,
isuzu_039,
isuzu_040,
isuzu_041,
isuzu_042,
isuzu_043,
isuzu_044,
isuzu_045,
isuzu_046,
isuzu_047,
isuzu_048,
isuzu_049,
isuzu_050,
isuzu_051,
isuzu_052,
isuzu_053,
isuzu_054,
isuzu_055,
isuzu_056,
isuzu_057,
isuzu_058,
isuzu_059,
isuzu_060,
isuzu_061,
isuzu_062,
isuzu_063,
isuzu_064,
isuzu_065,
isuzu_066,
isuzu_067,
isuzu_068,
isuzu_069,
isuzu_070,
isuzu_071,
isuzu_072,
isuzu_073,
isuzu_074,
isuzu_075,
isuzu_076,
isuzu_077,
isuzu_078,
isuzu_079,
isuzu_080,
isuzu_081,
isuzu_082,
isuzu_083,
isuzu_084,
isuzu_085,
isuzu_086,
isuzu_087,
isuzu_088,
isuzu_089,
isuzu_090,
isuzu_091,
isuzu_092,
isuzu_093,
isuzu_094,
isuzu_095,
isuzu_096,
isuzu_097,
isuzu_098,
isuzu_099,
isuzu_100,
isuzu_101,
isuzu_102,
isuzu_103,
isuzu_104,
isuzu_105,
isuzu_106,
isuzu_107,
isuzu_108,
isuzu_109,
isuzu_110,
isuzu_111,
isuzu_112,
quanping_black,
quanping_blue,
quanping_green,
......
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