Commit d0183b03 authored by 王雅楠's avatar 王雅楠 🍎

🐞 fix:更改trip对齐坐标

parent a4105297
...@@ -3498,54 +3498,54 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint) ...@@ -3498,54 +3498,54 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
DisplayNumPara.DecimalNum = 1;/*小数点后一位*/ DisplayNumPara.DecimalNum = 1;/*小数点后一位*/
if((Tripnumber<10000)&&(Tripnumber>=1000)) if((Tripnumber<10000)&&(Tripnumber>=1000))
{ {
DisplayNumPara.x = 125; DisplayNumPara.x = 140;
DisplayNumPara.MinDigits = 4; DisplayNumPara.MinDigits = 4;
if(Uint == 0) if(Uint == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0580_187_324);//KM
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_163_324);/*单位mile*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0861_187_324);/*单位mile*/
} }
} }
else if((Tripnumber<1000)&&(Tripnumber>=100)) else if((Tripnumber<1000)&&(Tripnumber>=100))
{ {
DisplayNumPara.x = 101; DisplayNumPara.x = 116;
DisplayNumPara.MinDigits = 3; DisplayNumPara.MinDigits = 3;
if(Uint == 0) if(Uint == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_139_324);/*单位mile*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0861_163_324);/*单位mile*/
} }
} }
else if((Tripnumber<100)&&(Tripnumber>=10)) else if((Tripnumber<100)&&(Tripnumber>=10))
{ {
DisplayNumPara.x = 77; DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
if(Uint == 0) if(Uint == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_115_324);/*KM*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_115_324);/*单位mile*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0861_139_324);/*单位mile*/
} }
} }
else if((Tripnumber<10)&&(Tripnumber>=0)) else if((Tripnumber<10)&&(Tripnumber>=0))
{ {
DisplayNumPara.x = 53; DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
if(Uint == 0) if(Uint == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_91_324);/*单位KM*/ SetPagePic(GRAPHICS_PAGE_0,Pic_0580_139_324);/*KM*/
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_91_324);/*单位mile*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0861_139_324);/*单位mile*/
} }
} }
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber);
...@@ -3560,48 +3560,54 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint) ...@@ -3560,48 +3560,54 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
DisplayNumPara.DecimalNum = 1;/*小数点后一位*/ DisplayNumPara.DecimalNum = 1;/*小数点后一位*/
if((Tripnumber<10000)&&(Tripnumber>=1000)) if((Tripnumber<10000)&&(Tripnumber>=1000))
{ {
DisplayNumPara.x = 125; DisplayNumPara.x = 140;
DisplayNumPara.MinDigits = 4; DisplayNumPara.MinDigits = 4;
if(Uint == 0) if(Uint == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_163_324);/*KM*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0580_187_324);/*单位km*/
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_163_324);/*单位mile*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0863_187_324);/*单位mile*/
} }
} }
else if((Tripnumber<1000)&&(Tripnumber>=100)) else if((Tripnumber<1000)&&(Tripnumber>=100))
{ {
DisplayNumPara.x = 101; DisplayNumPara.x = 116;
DisplayNumPara.MinDigits = 3; DisplayNumPara.MinDigits = 3;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_139_324);/*KM*/ if(Uint == 0)
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_163_324);/*单位mile*/
}
} }
else if((Tripnumber<100)&&(Tripnumber>=10)) else if((Tripnumber<100)&&(Tripnumber>=10))
{ {
DisplayNumPara.x = 77; DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
if(Uint == 0) if(Uint == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_115_324);/*KM*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_115_324);/*单位mile*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/
} }
} }
else if((Tripnumber<10)&&(Tripnumber>=0)) else if((Tripnumber<10)&&(Tripnumber>=0))
{ {
DisplayNumPara.x = 53; DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2; DisplayNumPara.MinDigits = 2;
if(Uint == 0) if(Uint == 0)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_91_324);/*单位KM*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*单位KM*/
} }
else else
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_91_324);/*单位mile*/ SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/
} }
} }
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber); DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber);
......
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