feat:大计需要显示六位补齐

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -2424,80 +2424,44 @@ static void AMT630H_GUI_Voltage(uint16_t Voltage)
 /*大计里程显示函数*/
 static void AMT630H_GUI_ODO(uint32_t ODO, uint8_t mode)
 {
-    uint8_t ODO_bit = 0U;
-    uint32_t ODO_temp = ODO;
-    uint16_t ODO_index = 0U;
-    if (ODO_temp == 0)
+    if((PIC_DAYTIME_Main_CH) && (PIC_DAYTIME_Main_EN))
     {
-        ODO_bit = 1;
-    }
-    else
-    {
-        while (ODO_temp != 0U)
-        {
-            ODO_bit++;
-            ODO_temp /= 10U;
-        }
-    }
-
-    ODO_index = 53U + (ODO_bit * 24U);
-    if ((Pic_mode == PIC_DAYTIME_Main_CH) || (Pic_mode == PIC_DAYTIME_Main_EN))
-    {
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0577_48_272);
-        if(mode == 0)
-        {
-            SetPagePic(GRAPHICS_PAGE_0, Pic_0578_55_296);
-        }
-        else
-        {
-
-        }
-        
-
         /*ODO位数不同 KM位置不同*/
-        SetPagePicFree(GRAPHICS_PAGE_0, Pic_0580_91_324, (ODO_index + 10U), 324U);
+        SetPagePic ( GRAPHICS_PAGE_0 , Pic_0577_48_272 ) ;
+        SetPagePic ( GRAPHICS_PAGE_0 , Pic_0578_55_296 ) ;
+        SetPagePic ( GRAPHICS_PAGE_0 , Pic_0580_211_324 ) ;
 
         DISPLAY_NUM_ST DisplayNumPara;
-        uint32_t ODONumber;
-        ODONumber = ODO;
+        uint16_t ODONumber;
+        ODONumber =ODO;
 
         DisplayNumPara.NumList = NumbeList_ODO_DAY;
-        DisplayNumPara.x = (ODO_index - 24U);
-        DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 24;
-        DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
+        DisplayNumPara.x = 173;
+        DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT |24;
+        DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; 
         DisplayNumPara.DecimalNum = 0;
-        DisplayNumPara.MinDigits = ODO_bit;
-        DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, ODONumber);
+        DisplayNumPara.MinDigits =6;
+        DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara,ODONumber);
     }
 
-    else if ((Pic_mode == PIC_NIGHTTIME_Main_CH) || (Pic_mode == PIC_NIGHTTIME_Main_EN))
+    else if((PIC_NIGHTTIME_Main_CH) && (PIC_NIGHTTIME_Main_EN))
     {
         /*ODO位数不同 KM位置不同*/
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0685_48_272);
-        if(mode == 0)
-        {
-            SetPagePic(GRAPHICS_PAGE_0, Pic_0686_55_296);
-        }
-        else
-        {
-            
-        }
-        
-
-        /*ODO位数不同 KM位置不同*/
-        SetPagePicFree(GRAPHICS_PAGE_0, Pic_0688_211_324, (ODO_index + 10U), 324U);
+        SetPagePic ( GRAPHICS_PAGE_0 , Pic_0685_48_272 ) ;
+        SetPagePic ( GRAPHICS_PAGE_0 , Pic_0686_55_296 ) ;
+        SetPagePic ( GRAPHICS_PAGE_0 , Pic_0688_211_324 ) ;
 
         DISPLAY_NUM_ST DisplayNumPara;
-        uint32_t ODONumber;
-        ODONumber = ODO;
+        uint16_t ODONumber;
+        ODONumber =ODO;
 
         DisplayNumPara.NumList = NumbeList_ODO_NIGHT;
-        DisplayNumPara.x = (ODO_index - 24U);
-        DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT | 24;
-        DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS;
+        DisplayNumPara.x = 173;
+        DisplayNumPara.NumInterval = GROUP_PIC_DIR_LEFT |24;
+        DisplayNumPara.y = GROUP_PIC_USE_PSD_Y_POS; 
         DisplayNumPara.DecimalNum = 0;
-        DisplayNumPara.MinDigits = ODO_bit;
-        DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, ODONumber);
+        DisplayNumPara.MinDigits =6;
+        DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara,ODONumber);
     }
 
     else