Skip to content

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

🐞 fix:修复车速公英制单位偶发切换失败的问题，增加导航界面车速英制单位的贴图

parent fcb99789
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 48 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 81d7e9ed
......@@ -8,7 +8,6 @@ uint8_t g_u8Display_Mode_select = ModeDAY;
uint8_t g_u8Language = CH;
uint8_t g_u8Backlight = Backlight_4 ;
uint8_t g_u8Backlight_select = Backlight_4 ;
uint8_t g_u8UnitSetting = Metric ;
uint8_t g_u8SelfCheck = 0;/*自检*/
uint16_t g_u16fuelnumberup = 0;
......@@ -891,12 +890,12 @@ void AMT630H_GUI_Unit_Information(void)
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0130_27_396);/*组*/
if(g_u8UnitSetting == Metric)
if(Get_Dis_Unit() == Metric)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0133_473_288);
SetPagePic(GRAPHICS_PAGE_0, Pic_0134_436_152);
}
else if(g_u8UnitSetting == Imperial)
else if(Get_Dis_Unit() == Imperial)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0131_435_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0132_474_168);
......@@ -905,12 +904,12 @@ void AMT630H_GUI_Unit_Information(void)
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0012_22_397);/*组*/
if(g_u8UnitSetting == Metric)
if(Get_Dis_Unit() == Metric)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0015_469_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0016_457_155);
}
else if(g_u8UnitSetting == Imperial)
else if(Get_Dis_Unit() == Imperial)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0013_437_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0014_481_170);
......@@ -922,12 +921,12 @@ void AMT630H_GUI_Unit_Information(void)
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0318_27_396);
if(g_u8UnitSetting == Metric)
if(Get_Dis_Unit() == Metric)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0321_473_288);
SetPagePic(GRAPHICS_PAGE_0, Pic_0322_436_152);
}
else if(g_u8UnitSetting == Imperial)
else if(Get_Dis_Unit() == Imperial)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0319_435_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0320_474_168);
......@@ -936,12 +935,12 @@ void AMT630H_GUI_Unit_Information(void)
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0201_22_397);
if(g_u8UnitSetting == Metric)
if(Get_Dis_Unit() == Metric)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0204_469_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0205_457_155);
}
else if(g_u8UnitSetting == Imperial)
else if(Get_Dis_Unit() == Imperial)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0202_437_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0203_481_170);
......@@ -2318,19 +2317,11 @@ void AMT630H_GUI_Unit_Setting(Menu_Item_en_t select) /*图 单位设置*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_141);
SetPagePic(GRAPHICS_PAGE_0, Pic_0133_473_288);
SetPagePic(GRAPHICS_PAGE_0, Pic_0134_436_152);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_KM) == 1)
{
g_u8UnitSetting = Metric;
}
break;
case MENU_ITEM_UNIT_MILE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_261);
SetPagePic(GRAPHICS_PAGE_0, Pic_0131_435_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0132_474_168);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_MILE) == 1)
{
g_u8UnitSetting = Imperial;
}
default:
break;
}
......@@ -2344,19 +2335,11 @@ void AMT630H_GUI_Unit_Setting(Menu_Item_en_t select) /*图 单位设置*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_141);
SetPagePic(GRAPHICS_PAGE_0, Pic_0015_469_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0016_457_155);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_KM) == 1)
{
g_u8UnitSetting = Metric;
}
break;
case MENU_ITEM_UNIT_MILE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_261);
SetPagePic(GRAPHICS_PAGE_0, Pic_0013_437_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0014_481_170);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_MILE) == 1)
{
g_u8UnitSetting = Imperial;
}
default:
break;
}
......@@ -2373,19 +2356,11 @@ void AMT630H_GUI_Unit_Setting(Menu_Item_en_t select) /*图 单位设置*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_141);
SetPagePic(GRAPHICS_PAGE_0, Pic_0321_473_288);
SetPagePic(GRAPHICS_PAGE_0, Pic_0322_436_152);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_KM) == 1)
{
g_u8UnitSetting = Metric;
}
break;
case MENU_ITEM_UNIT_MILE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_261);
SetPagePic(GRAPHICS_PAGE_0, Pic_0319_435_272);
SetPagePic(GRAPHICS_PAGE_0, Pic_0320_474_168);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_MILE) == 1)
{
g_u8UnitSetting = Imperial;
}
default:
break;
}
......@@ -2399,19 +2374,11 @@ void AMT630H_GUI_Unit_Setting(Menu_Item_en_t select) /*图 单位设置*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_141);
SetPagePic(GRAPHICS_PAGE_0, Pic_0204_469_289);
SetPagePic(GRAPHICS_PAGE_0, Pic_0205_457_155);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_KM) == 1)
{
g_u8UnitSetting = Metric;
}
break;
case MENU_ITEM_UNIT_MILE:
SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_261);
SetPagePic(GRAPHICS_PAGE_0, Pic_0202_437_274);
SetPagePic(GRAPHICS_PAGE_0, Pic_0203_481_170);
if(Menu_Item_Select_Get(MENU_ITEM_UNIT_MILE) == 1)
{
g_u8UnitSetting = Imperial;
}
default:
break;
}
......@@ -4625,11 +4592,11 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0592_617_271);
if(g_u8UnitSetting == Metric)
if(Get_Dis_Unit() == Metric)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0593_889_310);/*单位 km/h */
}
else if(g_u8UnitSetting == Imperial)
else if(Get_Dis_Unit() == Imperial)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0928_894_310);/*单位 mph/h */
}
......@@ -4688,11 +4655,11 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0700_617_271);
if(g_u8UnitSetting == Metric)
if(Get_Dis_Unit() == Metric)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0701_889_310);/*单位 km/h */
}
else if(g_u8UnitSetting == Imperial)
else if(Get_Dis_Unit() == Imperial)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0929_894_310);/*单位 mph/h */
}
......@@ -4763,7 +4730,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
*/
static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
{
if(g_u8UnitSetting == Metric)
if(Get_Dis_Unit() == Metric)
{
if (g_u8Display_Mode == ModeDAY)
{
......@@ -4774,9 +4741,16 @@ static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VSpeed)
SetPagePic(GRAPHICS_PAGE_0, Pic_0967_632_551); /*单位 km/h */
}
}
else if(g_u8UnitSetting == Imperial)
else if(Get_Dis_Unit() == Imperial)
{
//SetPagePic(GRAPHICS_PAGE_0, Pic_0942_634_551); /*单位 mph/h */ /*未更改pinbin文件待解*/
if (g_u8Display_Mode == ModeDAY)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0942_634_551); /*单位 km/h */
}
else if (g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0968_634_551); /*单位 km/h */
} /*单位 mph/h */ /*未更改pinbin文件待解*/
}
else
{
......
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