🐞 fix:【56519】手机不练光标

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h

@@ -20,7 +20,7 @@ User definitions
 
 typedef unsigned short 	MD_STATUS;
 
-#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
+#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
 #define APP_BASE (0x0000C400ul)
 
 /* Status list definition */

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -2519,30 +2519,44 @@ void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select) /*图 语言设置
  */
 void AMT630H_GUI_Phone_Connect_Win(void)
 {
-    if (Pic_mode == PIC_DAYTIME_CH)
+    if(g_u8Display_Mode == ModeDAY)
+    {
+        if(g_u8Language == CH)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0127_27_396);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0128_429_152);
         }
-    else if (Pic_mode == PIC_NIGHTTIME_CH)
+        else if(g_u8Language == EN)
         {
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0315_27_396);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0003_23_397);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0316_429_152);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0005_304_155);
         }
-    else if (Pic_mode == PIC_DAYTIME_EN)
+        else
         {
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0003_23_397);
+            ;
+        }
+    }
+    else if(g_u8Display_Mode == ModeNIGHT)
+    {
+        if(g_u8Language == CH)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0315_27_396);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0005_304_155);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0316_429_152);
         }
-    else if (Pic_mode == PIC_NIGHTTIME_EN)
+        else if(g_u8Language == EN)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0194_23_397);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0004_336_140);
             SetPagePic(GRAPHICS_PAGE_0, Pic_0195_304_155);
         }
+        else
+        {
+            ;
+        }
+    }
 }
 
 /**************************************主界面************************************/
@@ -3428,7 +3442,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
         else if((Tripnumber<1000)&&(Tripnumber>=100))
         {
             DisplayNumPara.x = 101;
-            DisplayNumPara.MinDigits = 4; 
+            DisplayNumPara.MinDigits = 3; 
             if(Uint == 0)
             {
                 SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
@@ -3441,7 +3455,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
         else if((Tripnumber<100)&&(Tripnumber>=10))
         {
             DisplayNumPara.x = 77;
-            DisplayNumPara.MinDigits = 4; 
+            DisplayNumPara.MinDigits = 2; 
             if(Uint == 0)
             {
                 SetPagePic(GRAPHICS_PAGE_0, Pic_0580_115_324);/*KM*/
@@ -3454,7 +3468,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
         else if((Tripnumber<10)&&(Tripnumber>=0))
         {
             DisplayNumPara.x = 53;
-            DisplayNumPara.MinDigits = 4; 
+            DisplayNumPara.MinDigits = 2; 
             if(Uint == 0)
             {
                 SetPagePic(GRAPHICS_PAGE_0, Pic_0580_91_324);/*单位KM*/
@@ -3490,14 +3504,14 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
         else if((Tripnumber<1000)&&(Tripnumber>=100))
         {
             DisplayNumPara.x = 101;
-            DisplayNumPara.MinDigits = 4; 
+            DisplayNumPara.MinDigits = 3; 
             SetPagePic(GRAPHICS_PAGE_0, Pic_0688_139_324);/*KM*/
             SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/
         }
         else if((Tripnumber<100)&&(Tripnumber>=10))
         {
             DisplayNumPara.x = 77;
-            DisplayNumPara.MinDigits = 4; 
+            DisplayNumPara.MinDigits = 2; 
             if(Uint == 0)
             {
                 SetPagePic(GRAPHICS_PAGE_0, Pic_0688_115_324);/*KM*/
@@ -3510,7 +3524,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
         else if((Tripnumber<10)&&(Tripnumber>=0))
         {
             DisplayNumPara.x = 53;
-            DisplayNumPara.MinDigits = 4;
+            DisplayNumPara.MinDigits = 2;
             if(Uint == 0) 
             {
                 SetPagePic(GRAPHICS_PAGE_0, Pic_0688_91_324);/*单位KM*/
@@ -3525,12 +3539,19 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
 }
 
 /*车速显示函数*/
-static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
+static void AMT630H_GUI_VSpeed(uint16_t VSpeed,uint8_t Unit)
 {
     if (g_u8Display_Mode == ModeDAY)
     {
         SetPagePic(GRAPHICS_PAGE_0, Pic_0592_617_271);
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0593_889_310);
+        if(Unit == 0)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0593_889_310);/*单位 km/h */
+        }
+        else
+        {
+            ;/*单位 mile/h */   
+        }
 
         /*数据处理*/
         DISPLAY_NUM_ST DisplayNumPara;
@@ -3582,7 +3603,14 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed)
     else if (g_u8Display_Mode == ModeNIGHT)
     {
         SetPagePic(GRAPHICS_PAGE_0, Pic_0700_617_271);
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0701_889_310);
+        if(Unit == 0)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0701_889_310);/*单位 km/h */
+        }
+        else
+        {
+            ;/*单位 mile/h */
+        }
 
         /*数据处理*/
         DISPLAY_NUM_ST DisplayNumPara;
@@ -3782,11 +3810,11 @@ void AMT630H_GUI_BACKGRAND()
     /*车速*/
     if (Get_VechileSpeedValid() == 1)
     {
-        AMT630H_GUI_VSpeed(Get_DispVechileSpeed() / 10);
+        AMT630H_GUI_VSpeed(Get_DispVechileSpeed() / 10, Get_Dis_Unit());
     }
     else
     {
-        AMT630H_GUI_VSpeed(0);
+        AMT630H_GUI_VSpeed(0,0);
     }
     /*转速*/
     if (Get_EngineValid() == 1)
@@ -3876,7 +3904,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     /*车速自检*/
     if(g_u16vspeednumberup < 600)
     {
-        AMT630H_GUI_VSpeed(g_u16vspeednumberup/3);/*初始化g_u16vspeednumberup = 0*/
+        AMT630H_GUI_VSpeed(g_u16vspeednumberup/3,Get_Dis_Unit());/*初始化g_u16vspeednumberup = 0*/
         g_u16vspeednumberup+=6;
     }
     else
@@ -3884,7 +3912,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
         if(g_u16vspeednumberdown >0)
         {
             g_u16vspeednumberdown-=6;/*初始化g_u16vspeednumberup=1200*/
-            AMT630H_GUI_VSpeed(g_u16vspeednumberdown/3);/*if g_u16vspeednumberup=0 车速自检结束*/
+            AMT630H_GUI_VSpeed(g_u16vspeednumberdown/3,Get_Dis_Unit());/*if g_u16vspeednumberup=0 车速自检结束*/
         }
         else
         {
@@ -3912,7 +3940,7 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     }
     if(g_u16vspeednumberdown == 0)
     {
-        AMT630H_GUI_VSpeed(g_u16vspeednumberdown);
+        AMT630H_GUI_VSpeed(g_u16vspeednumberdown, Get_Dis_Unit());
     }
     if(g_u16espeednumberdown == 0)
     {