Skip to content

H
haoJin750TFT
Commit d282af01 authored by 张金硕's avatar 张金硕
Browse files
Options

Merge branch 'heyudong_dev' into 'dev' 

✨ feat:新增导航页面黑天模式，更新pinbin文件

See merge request !95
parents 1cc2bf0b ae2cc7e0
Show whitespace changes
Inline Side-by-side
Showing with 794 additions and 98 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ d282af01
......@@ -2610,6 +2610,18 @@ static const uint16_t NumbeList_PhoneConnect_TIME[] = {
Pic_0393_357_553,
Pic_0394_358_553,
};
static const uint16_t NumbeList_PhoneConnect_TIME_NIGHT[] = {
Pic_0954_357_553,
Pic_0955_367_553,
Pic_0956_358_553,
Pic_0957_359_553,
Pic_0958_356_553,
Pic_0959_358_553,
Pic_0960_358_553,
Pic_0961_357_553,
Pic_0962_357_553,
Pic_0963_358_553,
};
static const uint16_t NumbeList_Telephone[] = {
Pic_0536_54_499,
Pic_0537_55_499,
......@@ -2650,6 +2662,18 @@ static const uint16_t NumbeList_PhoneConnect_Voltage[] ={
Pic_0462_688_516,
Pic_0463_689_516,
};
static const uint16_t NumbeList_PhoneConnect_Voltage_NIGHT[] ={
Pic_1001_688_516,
Pic_1003_692_516,
Pic_1004_689_516,
Pic_1005_689_516,
Pic_1006_688_516,
Pic_1007_689_516,
Pic_1008_689_516,
Pic_1009_688_516,
Pic_1010_688_516,
Pic_1011_689_516,
};
static const uint16_t NumbeList_Voltage_NIGHT[] = {
Pic_0673_943_451,
Pic_0675_948_451,
......@@ -2718,6 +2742,18 @@ static const uint16_t NumbeList_PhoneConnect_VSpeed[] ={
Pic_0407_484_509,
Pic_0408_485_509,
};
static const uint16_t NumbeList_PhoneConnect_VSpeed_NIGHT[] ={
Pic_0969_484_510,
Pic_0970_502_509,
Pic_0971_485_509,
Pic_0972_486_509,
Pic_0973_481_509,
Pic_0974_484_509,
Pic_0975_485_509,
Pic_0976_483_509,
Pic_0977_484_509,
Pic_0978_485_509,
};
static const uint16_t NumbeList_VSpeed_NIGHT[] = {
Pic_0702_456_256,
Pic_0703_492_255,
......@@ -2772,6 +2808,18 @@ static const uint16_t NumbeList_PhoneConnect_ESpeed[] ={
Pic_0393_63_554,
Pic_0394_64_554,
};
static const uint16_t NumbeList_PhoneConnect_ESpeed_NIGHT[] ={
Pic_0954_63_554,
Pic_0955_73_554,
Pic_0956_64_554,
Pic_0957_65_554,
Pic_0958_62_554,
Pic_0959_64_554,
Pic_0960_64_554,
Pic_0961_63_554,
Pic_0962_63_554,
Pic_0963_64_554,
};
static const uint16_t PICList_Fuel[] = {
Pic_0554_315_473,
Pic_0555_366_473,
......@@ -3024,6 +3072,8 @@ static void AMT630H_GUI_TIME(uint16_t Hour, uint16_t Minute)
**/
static void AMT630H_GUI_PhoneConnect_TIME(uint16_t Hour ,uint16_t Minute)
{
if (g_u8Display_Mode == ModeDAY)
{
/*外部接收小时和分钟*/
if (FLASH_SYNC_1Hz)
{
......@@ -3050,6 +3100,38 @@ static void AMT630H_GUI_PhoneConnect_TIME(uint16_t Hour ,uint16_t Minute)
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, MinuteNumber);
}
else if(g_u8Display_Mode == ModeNIGHT)
{
/*外部接收小时和分钟*/
if (FLASH_SYNC_1Hz)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0966_315_562); /*时间 ： */
}
DISPLAY_NUM_ST DisplayNumPara;
uint16_t HourNumber;
uint16_t MinuteNumber;
HourNumber = Hour;
MinuteNumber = Minute;
/*小时显示*/
DisplayNumPara.NumList = NumbeList_PhoneConnect_TIME_NIGHT;
DisplayNumPara.x = 280;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 30;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, HourNumber);
/*分钟显示*/
DisplayNumPara.NumList = NumbeList_PhoneConnect_TIME_NIGHT;
DisplayNumPara.x = 357;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 30;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.DecimalNum = 0;
DisplayNumPara.MinDigits = 2;
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, MinuteNumber);
}
}
/*
*NAME : AMT630H_GUI_Telephone
......@@ -3166,12 +3248,14 @@ static void AMT630H_GUI_Telephone()
/*
*NAME : AMT630H_GUI_PhoneConnect_Telephone
*FUNCTION : 导航界面来电显示函数
*FUNCTION : 投屏界面来电显示函数
*PARAMETER : NULL
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_Telephone()
{
if (g_u8Display_Mode == ModeDAY)
{
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
{ if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
{
......@@ -3220,6 +3304,60 @@ static void AMT630H_GUI_PhoneConnect_Telephone()
{
;
}
}
else if(g_u8Display_Mode == ModeNIGHT)
{
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
{ if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0451_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
}
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0943_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
}
else if(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0450_751_555);
if(TextPara[TEXT_NUM_BLUETOOTH_PHONENAME].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)CurBlueToothPhoneName, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(TextPara[TEXT_NUM_PHONE_NUMBER].Vaild == 0X01)
{
PackedTransfer_LabelsList( 0x4022,(uint8_t *)PhoneNumber, 40);
SetPageText(GRAPHICS_PAGE_0, 0x4022, 786, 561, 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
}
}
else
{
;
}
}
}
/*
*NAME : AMT630H_GUI_Fuel
......@@ -3230,7 +3368,9 @@ static void AMT630H_GUI_PhoneConnect_Telephone()
static void AMT630H_GUI_PhoneConnect_UPtele()
{
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
{ if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)||(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)||(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming))
{ if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)||
(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)||
(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0519_648_5);
SetPagePic(GRAPHICS_PAGE_0, Pic_0520_760_50);
......@@ -3455,7 +3595,7 @@ static void AMT630H_GUI_Fuel_SelfCheck(uint8_t Fuel)
/*
*NAME : AMT630H_GUI_PhoneConnect_Fuel
*FUNCTION : 投屏界面车速显示
*FUNCTION : 投屏界面燃油显示
*PARAMETER : uint8_t Fuel-燃油等级 0 - 红区一格 1 - 正常一格
*RETURN : NULL
*/
......@@ -3472,9 +3612,18 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel)
{
;
}
SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533); /*E*/
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0412_314_533); /*F*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0413_74_533); /*燃油格 组*/
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0981_314_533); /*F*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0983_74_533); /*燃油格 组*/
}
SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533); /*E*/
/*Fuel=0时 黄色燃油灯1HZ闪烁*/
if (Fuel == 0)
{
......@@ -3497,8 +3646,15 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel)
}
}
else
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0424_26_529); /*黑色燃油灯*/
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0984_26_529); /*白色燃油灯*/
}
s_FuelLowTime = 0;
}
......@@ -3557,9 +3713,17 @@ static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel)
*/
void AMT630H_GUI_PhoneConnect_Coolant(uint8_t Coolant)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0947_709_533);
SetPagePic(GRAPHICS_PAGE_0, Pic_0948_967_533);
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0947_709_533); /*C*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0413_727_533);
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0985_709_533); /*C*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0983_727_533);
}
SetPagePic(GRAPHICS_PAGE_0, Pic_0948_967_533);/*H*/
if(GET_DataCollantTempSegStatus() == 1)//正常模式下
{
......@@ -3568,12 +3732,23 @@ void AMT630H_GUI_PhoneConnect_Coolant(uint8_t Coolant)
for(uint8_t i=0;i<Coolant;i++)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0427_729_536+i);
if(Coolant == 8)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0414_932_536);
}
}
}
if(Coolant < 8)
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0435_981_528);//水温灯(黑)
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0986_981_528);//水温灯(白)
}
}
else
{
if(FLASH_SYNC_1Hz)
......@@ -3594,6 +3769,10 @@ void AMT630H_GUI_PhoneConnect_Coolant(uint8_t Coolant)
for(uint8_t i=0;i<Coolant;i++)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0427_729_536+i);
if(Coolant == 8)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0414_932_536);
}
}
}
if(Coolant == 8)
......@@ -3613,8 +3792,15 @@ void AMT630H_GUI_PhoneConnect_Coolant(uint8_t Coolant)
}
}
else
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0435_981_528);//水温灯(黑)
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0986_981_528);//水温灯(白)
}
CoolantOpenShortCirTimeCnt = 0;
}
}
......@@ -3625,6 +3811,10 @@ void AMT630H_GUI_PhoneConnect_Coolant(uint8_t Coolant)
for(uint8_t i=0;i<Coolant;i++)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0427_729_536+i);
if(Coolant == 8)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0414_932_536);
}
}
}
if(Coolant == 0)
......@@ -3639,9 +3829,16 @@ void AMT630H_GUI_PhoneConnect_Coolant(uint8_t Coolant)
}
}
else
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0435_981_528);//水温灯(黑)
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0986_981_528);//水温灯(白)
}
}
}
......@@ -3792,7 +3989,7 @@ static void AMT630H_GUI_Voltage(uint16_t Voltage)
/*
*NAME : AMT630H_GUI_PhoneConnect_Voltage
*FUNCTION : 导航界面电压显示函数
*FUNCTION : 投屏界面电压显示函数
*PARAMETER : uint16_t Voltage - 电压值
*RETURN : NULL
*/
......@@ -3816,12 +4013,27 @@ static void AMT630H_GUI_PhoneConnect_Voltage(uint16_t Voltage)
Voltage_Unit = VoltageNumber % 10;
Front = Voltage_Hundred * 10 + Voltage_Ten;
if (g_u8Display_Mode == ModeDAY)
{
DisplayNumPara.NumList = NumbeList_PhoneConnect_Voltage;
}
else if (g_u8Display_Mode == ModeNIGHT)
{
DisplayNumPara.NumList = NumbeList_PhoneConnect_Voltage_NIGHT;
}
if ((VoltageNumber >= 100) && (VoltageNumber < 1000))
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0452_717_516); /* V */
SetPagePic(GRAPHICS_PAGE_0, Pic_0454_704_526); /* . */
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_1000_717_516); /* V */
SetPagePic(GRAPHICS_PAGE_0, Pic_1002_704_526); /* . */
}
DisplayNumPara.x = 707;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 0;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
......@@ -3837,9 +4049,17 @@ static void AMT630H_GUI_PhoneConnect_Voltage(uint16_t Voltage)
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Front);
}
else if (0 <= VoltageNumber < 100)
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0452_712_516); /* V */
SetPagePic(GRAPHICS_PAGE_0, Pic_0454_699_526); /* . */
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_1000_712_516); /* V */
SetPagePic(GRAPHICS_PAGE_0, Pic_1002_699_526); /* . */
}
DisplayNumPara.x = 688;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 14;
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
......@@ -4337,9 +4557,16 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
{
if(g_u8UnitSetting == Metric)
{
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0398_632_551); /*单位 km/h */
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0967_632_551); /*单位 km/h */
}
}
else if(g_u8UnitSetting == Imperial)
{
//SetPagePic(GRAPHICS_PAGE_0, Pic_0942_634_551); /*单位 mph/h */ /*未更改pinbin文件待解*/
......@@ -4354,7 +4581,15 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
uint16_t VSpeedNumber;
VSpeedNumber = VSpeed;
if (g_u8Display_Mode == ModeDAY)
{
DisplayNumPara.NumList = NumbeList_PhoneConnect_VSpeed;
}
else if (g_u8Display_Mode == ModeNIGHT)
{
DisplayNumPara.NumList = NumbeList_PhoneConnect_VSpeed_NIGHT;
}
if (100 <= VSpeedNumber)
{
DisplayNumPara.x = 544;
......@@ -4487,12 +4722,21 @@ static void AMT630H_GUI_ESpeed(uint16_t ESpeed)
*/
static void AMT630H_GUI_PhoneConnect_ESpeed(uint16_t ESpeed)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0384_103_570); /* 转速单位x1000r/min */
DISPLAY_NUM_ST DisplayNumPara;
uint16_t ESpeedNumber;
ESpeedNumber = ESpeed / 1000;
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0384_103_570); /* 转速单位x1000r/min */
DisplayNumPara.NumList = NumbeList_PhoneConnect_ESpeed;
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0953_103_570); /* 转速单位x1000r/min */
DisplayNumPara.NumList = NumbeList_PhoneConnect_ESpeed_NIGHT;
}
DisplayNumPara.x = 53; /*在UI所给坐标基础上进行调整*/
DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 60;
......@@ -4830,13 +5074,16 @@ void AMT630H_GUI_Display_OTA_Page_Information(void)
void AMT630H_GUI_Display_Navigation_Area(void)
{
PicObj.qr_logo_id = 0;//Pic_0234 小数字9 EA
PicObj.main_pic_id = Pic_0382; //大白背景图 17E
PicObj.qr_pic_id = Pic_0479;//小数字0 1DF
PicObj.main_pic_id = Pic_0632; //转速红12
PicObj.qr_pic_id = Pic_0411;//红色小e 19B
PicObj.update_pic_id = Pic_0233;//小数字8 E9
PicObj.second_menu = 0;
PicObj.navigation_task_id = Pic_0411;//红色小e 19B
if (GetPhoneMirrorst() == 0)
{ SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
{
if(g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0); /*上半屏*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0941_0_470); /*下半屏*/
......@@ -4847,6 +5094,27 @@ void AMT630H_GUI_Display_Navigation_Area(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0496_410_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_0498_411_252); /*UUID*/
PackedTransfer_LabelsList( 0x4014,(uint8_t *)UUIDDisplay, 42);
SetPageText(GRAPHICS_PAGE_0, 0x4014, 486, 248, 800, ALIGN_LEFT, 200, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
}
if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);
SetPagePic(GRAPHICS_PAGE_0, Pic_1013_0_0); /*上半屏*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0952_0_470); /*下半屏*/
SetPagePic(GRAPHICS_PAGE_0, Pic_1015_188_310); /*版本*/
SetPagePic(GRAPHICS_PAGE_0, Pic_1028_188_343); /*状态*/
SetPagePic(GRAPHICS_PAGE_0, Pic_1031_410_144);
SetPagePic(GRAPHICS_PAGE_0, Pic_1032_655_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_1033_410_197);
SetPagePic(GRAPHICS_PAGE_0, Pic_1035_411_252); /*UUID*/
PackedTransfer_LabelsList( 0x4014,(uint8_t *)UUIDDisplay, 42);
SetPageText(GRAPHICS_PAGE_0, 0x4014, 486, 248, 800, ALIGN_LEFT, 200, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
}
// /*是否激活接口待补充*/
// /*！！！！！！！！！！！！别删！！！！！！！！！！！！*/
......@@ -4863,10 +5131,17 @@ void AMT630H_GUI_Display_Navigation_Area(void)
PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
}
else
{
if(g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0941_0_470); /*下半屏*/
}
if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0952_0_470); /*下半屏*/
}
PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
AMT630H_GUI_PhoneConnect_UPtele();
// AMT630H_GUI_PhoneConnect_UPtele();
}
}
......
Firmware/Source/Component/AMT630H/PicBin.c
View file @ d282af01
......@@ -119,7 +119,30 @@ static const uint16_t PicIndexData[] = {
Pic_0898, 14, 637, 293, Pic_0897, 15, 637, 292, Pic_0919, 11, 640, 293, Pic_0920, 12, 639, 293, Pic_0921, 14, 638, 293, Pic_0922, 14, 638, 292, Pic_0923, 14, 638, 293, Pic_0924, 15, 637, 293, Pic_0925, 221, 501, 160, Pic_0926, 50, 619, 240,
Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, Pic_0930, 64, 612, 240, Pic_0930, 64, 612, 175, Pic_0931, 64, 612, 240, Pic_0931, 64, 612, 175, Pic_0932, 777, 124, 85,
Pic_0933, 317, 101, 210, Pic_0934, 209, 102, 260, Pic_0935, 461, 36, 367, Pic_0936, 350, 92, 367, Pic_0937, 323, 564, 521, Pic_0938, 41, 62, 399, Pic_0939, 41, 62, 401, Pic_0940, 155, 53, 498, Pic_0941, 1521, 0, 470, Pic_0942, 46, 634, 551,
Pic_0943, 28, 751, 555, Pic_0944, 124, 53, 462, Pic_0945, 1024, 0, 0, Pic_0946, 52, 632, 551, Pic_0947, 12, 709, 533, Pic_0948, 12, 967, 533, Pic_0949, 133, 786, 561, Pic_0950, 228, 485, 251, Pic_0951, 78, 761, 50,
Pic_0943, 28, 751, 555, Pic_0944, 124, 53, 462, Pic_0945, 1024, 0, 0, Pic_0946, 52, 632, 551, Pic_0947, 12, 709, 533, Pic_0948, 12, 967, 533, Pic_0949, 133, 786, 561, Pic_0950, 228, 485, 251, Pic_0951, 78, 761, 50, Pic_0414, 27, 932, 536,
Pic_0952, 1521, 0, 470, Pic_0953, 106, 103, 570, Pic_0954, 30, 63, 554, Pic_0954, 30, 33, 554, Pic_0955, 10, 73, 554, Pic_0956, 28, 64, 554, Pic_0957, 26, 65, 554, Pic_0958, 32, 62, 554, Pic_0959, 28, 64, 554, Pic_0960, 28, 64, 554,
Pic_0961, 30, 63, 554, Pic_0962, 30, 63, 554, Pic_0963, 28, 64, 554, Pic_0964, 6, 75, 582, Pic_0965, 22, 67, 568, Pic_0954, 30, 250, 553, Pic_0954, 30, 280, 553, Pic_0966, 7, 315, 562, Pic_0954, 30, 327, 553, Pic_0954, 30, 357, 553,
Pic_0955, 10, 367, 553, Pic_0956, 28, 358, 553, Pic_0957, 26, 359, 553, Pic_0958, 32, 356, 553, Pic_0959, 28, 358, 553, Pic_0960, 28, 358, 553, Pic_0961, 30, 357, 553, Pic_0962, 30, 357, 553, Pic_0963, 28, 358, 553, Pic_0964, 6, 369, 581,
Pic_0965, 22, 361, 567, Pic_0967, 52, 632, 551, Pic_0968, 46, 634, 551, Pic_0969, 56, 424, 510, Pic_0969, 56, 484, 510, Pic_0969, 56, 544, 510, Pic_0969, 56, 454, 510, Pic_0969, 56, 514, 510, Pic_0970, 20, 502, 509, Pic_0971, 54, 485, 509,
Pic_0972, 52, 486, 509, Pic_0973, 62, 481, 509, Pic_0974, 56, 484, 509, Pic_0975, 54, 485, 509, Pic_0976, 58, 483, 509, Pic_0977, 56, 484, 509, Pic_0978, 54, 485, 509, Pic_0979, 12, 506, 563, Pic_0980, 42, 491, 536, Pic_0981, 12, 314, 533,
Pic_0982, 234, 74, 533, Pic_0983, 234, 74, 533, Pic_0984, 21, 26, 529, Pic_0985, 12, 709, 533, Pic_0982, 234, 727, 533, Pic_0983, 234, 727, 533, Pic_0986, 30, 981, 528, Pic_0987, 133, 786, 561, Pic_0988, 11, 847, 561, Pic_0989, 10, 848, 561,
Pic_0990, 11, 847, 561, Pic_0991, 11, 847, 561, Pic_0992, 11, 847, 561, Pic_0993, 11, 847, 561, Pic_0994, 11, 847, 561, Pic_0995, 11, 847, 561, Pic_0996, 11, 847, 561, Pic_0997, 11, 847, 561, Pic_0998, 3, 851, 575, Pic_0999, 7, 849, 571,
Pic_1000, 13, 717, 516, Pic_1001, 11, 683, 516, Pic_1001, 11, 693, 516, Pic_1002, 3, 704, 526, Pic_1001, 11, 707, 516, Pic_1000, 13, 712, 516, Pic_1001, 11, 688, 516, Pic_1002, 3, 699, 526, Pic_1001, 11, 702, 516, Pic_1003, 4, 692, 516,
Pic_1004, 10, 689, 516, Pic_1005, 9, 689, 516, Pic_1006, 11, 688, 516, Pic_1007, 10, 689, 516, Pic_1008, 9, 689, 516, Pic_1009, 11, 688, 516, Pic_1010, 11, 688, 516, Pic_1011, 9, 689, 516, Pic_1002, 3, 692, 526, Pic_1012, 8, 690, 521,
Pic_1013, 1024, 0, 0, Pic_1014, 163, 178, 130, Pic_1015, 49, 188, 310, Pic_1016, 11, 242, 313, Pic_1017, 3, 255, 326, Pic_1016, 11, 260, 313, Pic_1017, 3, 272, 326, Pic_1016, 11, 277, 313, Pic_1017, 3, 289, 326, Pic_1016, 11, 294, 313,
Pic_1016, 11, 253, 313, Pic_1017, 3, 266, 326, Pic_1016, 11, 271, 313, Pic_1016, 11, 282, 313, Pic_1017, 3, 295, 326, Pic_1016, 11, 300, 313, Pic_1016, 11, 311, 313, Pic_1017, 3, 324, 326, Pic_1016, 11, 329, 313, Pic_1016, 11, 340, 313,
Pic_1018, 9, 295, 313, Pic_1019, 11, 294, 313, Pic_1020, 11, 294, 313, Pic_1021, 11, 294, 313, Pic_1022, 11, 294, 313, Pic_1023, 10, 295, 313, Pic_1024, 10, 295, 313, Pic_1025, 11, 294, 313, Pic_1026, 11, 294, 313, Pic_1017, 3, 298, 326,
Pic_1027, 7, 296, 322, Pic_1028, 49, 188, 343, Pic_1029, 61, 243, 344, Pic_1030, 62, 242, 344, Pic_1031, 302, 410, 144, Pic_1032, 274, 655, 197, Pic_1033, 233, 410, 197, Pic_1034, 228, 485, 251, Pic_1035, 71, 411, 252, Pic_1036, 21, 32, 15,
Pic_1037, 19, 66, 16, Pic_1038, 17, 67, 15, Pic_1039, 19, 66, 16, Pic_1040, 3, 508, 22, Pic_1041, 9, 485, 17, Pic_1041, 9, 497, 17, Pic_1041, 9, 513, 17, Pic_1041, 9, 525, 17, Pic_1042, 9, 525, 17, Pic_1043, 10, 524, 17,
Pic_1044, 10, 524, 17, Pic_1045, 11, 524, 17, Pic_1046, 10, 524, 17, Pic_1047, 10, 525, 17, Pic_1048, 10, 525, 17, Pic_1049, 11, 524, 17, Pic_1050, 10, 524, 17, Pic_1051, 3, 528, 30, Pic_1052, 5, 527, 26, Pic_1053, 37, 955, 14,
Pic_1054, 29, 958, 18, Pic_1055, 1040, 0, 0, Pic_1056, 1040, 0, 0, Pic_1057, 1040, 0, 0, Pic_1058, 1040, 0, 0, Pic_1059, 1040, 0, 0, Pic_1060, 1040, 0, 0, Pic_1061, 1040, 0, 0, Pic_1062, 1040, 0, 0, Pic_1063, 1040, 0, 0,
Pic_1064, 1040, 0, 0, Pic_1065, 1040, 0, 0, Pic_1066, 1040, 0, 0, Pic_1067, 1040, 0, 0, Pic_1068, 1040, 0, 0, Pic_1069, 1040, 0, 0, Pic_1070, 1040, 0, 0, Pic_1071, 1040, 0, 0, Pic_1072, 1040, 0, 0, Pic_1073, 1040, 0, 0,
Pic_1074, 1040, 0, 0, Pic_1075, 1040, 0, 0, Pic_1076, 1040, 0, 0, Pic_1077, 1040, 0, 0, Pic_1078, 1040, 0, 0, Pic_1079, 1040, 0, 0, Pic_1080, 1040, 0, 0, Pic_1081, 1040, 0, 0, Pic_1082, 1040, 0, 0, Pic_1083, 1040, 0, 0,
Pic_1084, 1040, 0, 0, Pic_1085, 1040, 0, 0, Pic_1086, 1040, 0, 0, Pic_1087, 1040, 0, 0, Pic_1088, 1040, 0, 0, Pic_1089, 1040, 0, 0, Pic_1090, 1040, 0, 0, Pic_1091, 1040, 0, 0, Pic_1092, 1040, 0, 0, Pic_1093, 1040, 0, 0,
Pic_1094, 1040, 0, 0, Pic_1095, 1040, 0, 0, Pic_1096, 1040, 0, 0, Pic_1097, 1040, 0, 0, Pic_1098, 1040, 0, 0, Pic_1099, 1040, 0, 0, Pic_1100, 1040, 0, 0, Pic_1101, 1040, 0, 0, Pic_1102, 1040, 0, 0, Pic_1103, 1040, 0, 0,
Pic_1104, 1040, 0, 0, Pic_1105, 1040, 0, 0, Pic_1106, 1040, 0, 0, Pic_1107, 1040, 0, 0, Pic_1108, 1040, 0, 0, Pic_1109, 1040, 0, 0, Pic_1110, 1040, 0, 0, Pic_1111, 1040, 0, 0, Pic_1112, 1040, 0, 0, Pic_1113, 1040, 0, 0,
Pic_1114, 1040, 0, 0, Pic_1115, 1040, 0, 0, Pic_1116, 1040, 0, 0, Pic_1117, 1040, 0, 0, Pic_1118, 1040, 0, 0, Pic_1119, 1040, 0, 0, Pic_1120, 1040, 0, 0, Pic_1121, 1040, 0, 0, Pic_1122, 1040, 0, 0, Pic_1123, 1040, 0, 0,
Pic_1124, 1040, 0, 0, Pic_1125, 1040, 0, 0,
};
#define PicIndexData_LEN 14888
//uint32_t PicIndexDataLEN = 0;
......
Firmware/Source/Component/AMT630H/PicBin.h
View file @ d282af01
#ifndef PICBIN_H
#define PICBIN_H
/* Flash Bin Version:20241010 2024-10-10 11:52:18 Compression ratio:70.00% */
/* Flash Bin Version:20241012 2024-10-12 16:40:02 Compression ratio:70.00% */
#define Pic_0001 1
#define Pic_0002 2
#define Pic_0003 3
......@@ -953,6 +953,180 @@
#define Pic_0949 949
#define Pic_0950 950
#define Pic_0951 951
#define Pic_0952 952
#define Pic_0953 953
#define Pic_0954 954
#define Pic_0955 955
#define Pic_0956 956
#define Pic_0957 957
#define Pic_0958 958
#define Pic_0959 959
#define Pic_0960 960
#define Pic_0961 961
#define Pic_0962 962
#define Pic_0963 963
#define Pic_0964 964
#define Pic_0965 965
#define Pic_0966 966
#define Pic_0967 967
#define Pic_0968 968
#define Pic_0969 969
#define Pic_0970 970
#define Pic_0971 971
#define Pic_0972 972
#define Pic_0973 973
#define Pic_0974 974
#define Pic_0975 975
#define Pic_0976 976
#define Pic_0977 977
#define Pic_0978 978
#define Pic_0979 979
#define Pic_0980 980
#define Pic_0981 981
#define Pic_0982 982
#define Pic_0983 983
#define Pic_0984 984
#define Pic_0985 985
#define Pic_0986 986
#define Pic_0987 987
#define Pic_0988 988
#define Pic_0989 989
#define Pic_0990 990
#define Pic_0991 991
#define Pic_0992 992
#define Pic_0993 993
#define Pic_0994 994
#define Pic_0995 995
#define Pic_0996 996
#define Pic_0997 997
#define Pic_0998 998
#define Pic_0999 999
#define Pic_1000 1000
#define Pic_1001 1001
#define Pic_1002 1002
#define Pic_1003 1003
#define Pic_1004 1004
#define Pic_1005 1005
#define Pic_1006 1006
#define Pic_1007 1007
#define Pic_1008 1008
#define Pic_1009 1009
#define Pic_1010 1010
#define Pic_1011 1011
#define Pic_1012 1012
#define Pic_1013 1013
#define Pic_1014 1014
#define Pic_1015 1015
#define Pic_1016 1016
#define Pic_1017 1017
#define Pic_1018 1018
#define Pic_1019 1019
#define Pic_1020 1020
#define Pic_1021 1021
#define Pic_1022 1022
#define Pic_1023 1023
#define Pic_1024 1024
#define Pic_1025 1025
#define Pic_1026 1026
#define Pic_1027 1027
#define Pic_1028 1028
#define Pic_1029 1029
#define Pic_1030 1030
#define Pic_1031 1031
#define Pic_1032 1032
#define Pic_1033 1033
#define Pic_1034 1034
#define Pic_1035 1035
#define Pic_1036 1036
#define Pic_1037 1037
#define Pic_1038 1038
#define Pic_1039 1039
#define Pic_1040 1040
#define Pic_1041 1041
#define Pic_1042 1042
#define Pic_1043 1043
#define Pic_1044 1044
#define Pic_1045 1045
#define Pic_1046 1046
#define Pic_1047 1047
#define Pic_1048 1048
#define Pic_1049 1049
#define Pic_1050 1050
#define Pic_1051 1051
#define Pic_1052 1052
#define Pic_1053 1053
#define Pic_1054 1054
#define Pic_1055 1055
#define Pic_1056 1056
#define Pic_1057 1057
#define Pic_1058 1058
#define Pic_1059 1059
#define Pic_1060 1060
#define Pic_1061 1061
#define Pic_1062 1062
#define Pic_1063 1063
#define Pic_1064 1064
#define Pic_1065 1065
#define Pic_1066 1066
#define Pic_1067 1067
#define Pic_1068 1068
#define Pic_1069 1069
#define Pic_1070 1070
#define Pic_1071 1071
#define Pic_1072 1072
#define Pic_1073 1073
#define Pic_1074 1074
#define Pic_1075 1075
#define Pic_1076 1076
#define Pic_1077 1077
#define Pic_1078 1078
#define Pic_1079 1079
#define Pic_1080 1080
#define Pic_1081 1081
#define Pic_1082 1082
#define Pic_1083 1083
#define Pic_1084 1084
#define Pic_1085 1085
#define Pic_1086 1086
#define Pic_1087 1087
#define Pic_1088 1088
#define Pic_1089 1089
#define Pic_1090 1090
#define Pic_1091 1091
#define Pic_1092 1092
#define Pic_1093 1093
#define Pic_1094 1094
#define Pic_1095 1095
#define Pic_1096 1096
#define Pic_1097 1097
#define Pic_1098 1098
#define Pic_1099 1099
#define Pic_1100 1100
#define Pic_1101 1101
#define Pic_1102 1102
#define Pic_1103 1103
#define Pic_1104 1104
#define Pic_1105 1105
#define Pic_1106 1106
#define Pic_1107 1107
#define Pic_1108 1108
#define Pic_1109 1109
#define Pic_1110 1110
#define Pic_1111 1111
#define Pic_1112 1112
#define Pic_1113 1113
#define Pic_1114 1114
#define Pic_1115 1115
#define Pic_1116 1116
#define Pic_1117 1117
#define Pic_1118 1118
#define Pic_1119 1119
#define Pic_1120 1120
#define Pic_1121 1121
#define Pic_1122 1122
#define Pic_1123 1123
#define Pic_1124 1124
#define Pic_1125 1125
enum {
Pic_0001_0_0 = 0,
......@@ -2149,10 +2323,234 @@ enum {
Pic_0949_786_561,
Pic_0950_485_251,
Pic_0951_761_50,
Pic_0414_932_536,
Pic_0952_0_470,
Pic_0953_103_570,
Pic_0954_63_554,
Pic_0954_33_554,
Pic_0955_73_554,
Pic_0956_64_554,
Pic_0957_65_554,
Pic_0958_62_554,
Pic_0959_64_554,
Pic_0960_64_554,
Pic_0961_63_554,
Pic_0962_63_554,
Pic_0963_64_554,
Pic_0964_75_582,
Pic_0965_67_568,
Pic_0954_250_553,
Pic_0954_280_553,
Pic_0966_315_562,
Pic_0954_327_553,
Pic_0954_357_553,
};
enum {
Pic_0955_367_553 = 1200,
Pic_0956_358_553,
Pic_0957_359_553,
Pic_0958_356_553,
Pic_0959_358_553,
Pic_0960_358_553,
Pic_0961_357_553,
Pic_0962_357_553,
Pic_0963_358_553,
Pic_0964_369_581,
Pic_0965_361_567,
Pic_0967_632_551,
Pic_0968_634_551,
Pic_0969_424_510,
Pic_0969_484_510,
Pic_0969_544_510,
Pic_0969_454_510,
Pic_0969_514_510,
Pic_0970_502_509,
Pic_0971_485_509,
Pic_0972_486_509,
Pic_0973_481_509,
Pic_0974_484_509,
Pic_0975_485_509,
Pic_0976_483_509,
Pic_0977_484_509,
Pic_0978_485_509,
Pic_0979_506_563,
Pic_0980_491_536,
Pic_0981_314_533,
Pic_0982_74_533,
Pic_0983_74_533,
Pic_0984_26_529,
Pic_0985_709_533,
Pic_0982_727_533,
Pic_0983_727_533,
Pic_0986_981_528,
Pic_0987_786_561,
Pic_0988_847_561,
Pic_0989_848_561,
Pic_0990_847_561,
Pic_0991_847_561,
Pic_0992_847_561,
Pic_0993_847_561,
Pic_0994_847_561,
Pic_0995_847_561,
Pic_0996_847_561,
Pic_0997_847_561,
Pic_0998_851_575,
Pic_0999_849_571,
Pic_1000_717_516,
Pic_1001_683_516,
Pic_1001_693_516,
Pic_1002_704_526,
Pic_1001_707_516,
Pic_1000_712_516,
Pic_1001_688_516,
Pic_1002_699_526,
Pic_1001_702_516,
Pic_1003_692_516,
Pic_1004_689_516,
Pic_1005_689_516,
Pic_1006_688_516,
Pic_1007_689_516,
Pic_1008_689_516,
Pic_1009_688_516,
Pic_1010_688_516,
Pic_1011_689_516,
Pic_1002_692_526,
Pic_1012_690_521,
Pic_1013_0_0,
Pic_1014_178_130,
Pic_1015_188_310,
Pic_1016_242_313,
Pic_1017_255_326,
Pic_1016_260_313,
Pic_1017_272_326,
Pic_1016_277_313,
Pic_1017_289_326,
Pic_1016_294_313,
Pic_1016_253_313,
Pic_1017_266_326,
Pic_1016_271_313,
Pic_1016_282_313,
Pic_1017_295_326,
Pic_1016_300_313,
Pic_1016_311_313,
Pic_1017_324_326,
Pic_1016_329_313,
Pic_1016_340_313,
Pic_1018_295_313,
Pic_1019_294_313,
Pic_1020_294_313,
Pic_1021_294_313,
Pic_1022_294_313,
Pic_1023_295_313,
Pic_1024_295_313,
Pic_1025_294_313,
Pic_1026_294_313,
Pic_1017_298_326,
Pic_1027_296_322,
Pic_1028_188_343,
Pic_1029_243_344,
Pic_1030_242_344,
Pic_1031_410_144,
Pic_1032_655_197,
Pic_1033_410_197,
Pic_1034_485_251,
Pic_1035_411_252,
Pic_1036_32_15,
Pic_1037_66_16,
Pic_1038_67_15,
Pic_1039_66_16,
Pic_1040_508_22,
Pic_1041_485_17,
Pic_1041_497_17,
Pic_1041_513_17,
Pic_1041_525_17,
Pic_1042_525_17,
Pic_1043_524_17,
Pic_1044_524_17,
Pic_1045_524_17,
Pic_1046_524_17,
Pic_1047_525_17,
Pic_1048_525_17,
Pic_1049_524_17,
Pic_1050_524_17,
Pic_1051_528_30,
Pic_1052_527_26,
Pic_1053_955_14,
Pic_1054_958_18,
Pic_1055_0_0,
Pic_1056_0_0,
Pic_1057_0_0,
Pic_1058_0_0,
Pic_1059_0_0,
Pic_1060_0_0,
Pic_1061_0_0,
Pic_1062_0_0,
Pic_1063_0_0,
Pic_1064_0_0,
Pic_1065_0_0,
Pic_1066_0_0,
Pic_1067_0_0,
Pic_1068_0_0,
Pic_1069_0_0,
Pic_1070_0_0,
Pic_1071_0_0,
Pic_1072_0_0,
Pic_1073_0_0,
Pic_1074_0_0,
Pic_1075_0_0,
Pic_1076_0_0,
Pic_1077_0_0,
Pic_1078_0_0,
Pic_1079_0_0,
Pic_1080_0_0,
Pic_1081_0_0,
Pic_1082_0_0,
Pic_1083_0_0,
Pic_1084_0_0,
Pic_1085_0_0,
Pic_1086_0_0,
Pic_1087_0_0,
Pic_1088_0_0,
Pic_1089_0_0,
Pic_1090_0_0,
Pic_1091_0_0,
Pic_1092_0_0,
Pic_1093_0_0,
Pic_1094_0_0,
Pic_1095_0_0,
Pic_1096_0_0,
Pic_1097_0_0,
Pic_1098_0_0,
Pic_1099_0_0,
Pic_1100_0_0,
Pic_1101_0_0,
Pic_1102_0_0,
Pic_1103_0_0,
Pic_1104_0_0,
Pic_1105_0_0,
Pic_1106_0_0,
Pic_1107_0_0,
Pic_1108_0_0,
Pic_1109_0_0,
Pic_1110_0_0,
Pic_1111_0_0,
Pic_1112_0_0,
Pic_1113_0_0,
Pic_1114_0_0,
Pic_1115_0_0,
Pic_1116_0_0,
Pic_1117_0_0,
Pic_1118_0_0,
Pic_1119_0_0,
Pic_1120_0_0,
Pic_1121_0_0,
Pic_1122_0_0,
Pic_1123_0_0,
};
#define PIC_INDEX_DATA_CRC 0x982ED1B9
#define PIC_INDEX_DATA_CRC 0xC0A4A9AD
extern void User_PicIndexDataInit(void);
#endif
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