调整函数

ghs/project.siz

 project          .intvect            1536
-project          .text             316252
+project          .text             316332
 project          .rodata           411111
 project          .secinfo             120
 project          .syscall               6

source/Application/Graphic/GUI/GUI.c

@@ -496,10 +496,6 @@ void GUI_Time_Dispaly(uint8_t Mode)
         }
 
         /*分钟*/
-        Time_Minutes = Get_RTC_MINUTE();
-
-        GUI_General_Digit_Display(Time_Sprite, Time_Minutes, Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
-
         if (FLASH_SYNC_1Hz)
         {
             GUI_Translate_Display(Time_Sprite, Nb_21_maohao, 396u, 45u, GUI_BLENDMODE_SRC_OVER); /*显示冒号*/
@@ -508,6 +504,11 @@ void GUI_Time_Dispaly(uint8_t Mode)
         {
             GUI_General_Display(Time_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
         }
+
+        Time_Minutes = Get_RTC_MINUTE();
+
+        GUI_General_Digit_Display(Time_Sprite, Time_Minutes, Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
+
     }
     else
     {
@@ -543,7 +544,8 @@ void GUI_Data_Dispaly(uint8_t Mode)
         GUI_General_Digit_Display(Calendar_Sprite, Year, Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER);   /*显示年*/
         GUI_General_Digit_Display(Calendar_Sprite, Month, Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
         GUI_General_Digit_Display(Calendar_Sprite, Date, Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER);   /*显示日*/
-        GUI_General_Display(Calendar_Sprite, GUIWedk[Week], GUI_BLENDMODE_SRC_OVER);
+
+        GUI_General_Display(Calendar_Sprite, GUIWedk[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
     }
     else
     {
@@ -576,7 +578,7 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
         }
         else
         {
-            GUI_General_Display(WarningLight_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+            GUI_General_Display(WarningLight_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM );
         }
     }
     else
@@ -601,8 +603,6 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
     {
         current_value = HYQ_TEST;
 
-        GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
-
         if (current_value <= 17u)
         {
             GUI_General_Display(WET_Sprite, CN_qiya, GUI_BLENDMODE_SRC_OVER); /*刷长条的气压表框。*/
@@ -614,7 +614,13 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
 
         switch (current_value)
         {
-        case 0x11u:
+        case 0x14u: /*20*/
+            GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x13), 405u, GUI_BLENDMODE_SRC_OVER);
+        case 0x13u:
+            GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x12), 405u, GUI_BLENDMODE_SRC_OVER);
+        case 0x12u:
+            GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x11), 405u, GUI_BLENDMODE_SRC_OVER);
+        case 0x11u: /*17*/
             GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x10), 405u, GUI_BLENDMODE_SRC_OVER);
         case 0x10u:
             GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x0F), 405u, GUI_BLENDMODE_SRC_OVER);
@@ -653,6 +659,8 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
             GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
             break;
         }
+
+        GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
     }
     else
     {
@@ -675,7 +683,7 @@ void GUI_AdBlue_Dispaly(uint8_t Mode)
 
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
-        if ((K_Line_Set.K_Line_LID33 == 1) || (K_Line_Set.K_Line_LID33 == 3))
+        if ((K_Line_Set.K_Line_LID33 == 1u) || (K_Line_Set.K_Line_LID33 == 3u))
         {
             CanStatus = CAN_MSG_Status(ID_CanMsg18FF2300_Msg_Count);
 
@@ -829,11 +837,11 @@ void Gui_ODO_Display(uint8_t Mode)
 
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
-        ODO_value = (Data_ODO_Read() / 10); /*此处需将ODO函数返回值赋给变量，ODO函数在其他文件中实现。*/
+        ODO_value = (Data_ODO_Read() / 10u); /*此处需将ODO函数返回值赋给变量，ODO函数在其他文件中实现。*/
 
         GUI_General_Display(ODO_Sprite, CN_ODO, GUI_BLENDMODE_SRC_OVER);                                              /*显示文/*字 “ ODO ”*/
         GUI_Translate_Display(ODO_Sprite, CN_ODO_danwei, 699u, 436u, GUI_BLENDMODE_SRC_OVER);                         /*显示文字 “ km ”*/
-        GUI_General_Digit_Display(ODO_Sprite, ODO_value, Nb_19_0, 7u, 6u, GUI_DISP_ODO, 425, GUI_BLENDMODE_SRC_OVER); /*显示ODO的数值*/
+        GUI_General_Digit_Display(ODO_Sprite, ODO_value, Nb_19_0, 7u, 6u, GUI_DISP_ODO, 425u, GUI_BLENDMODE_SRC_OVER); /*显示ODO的数值*/
     }
     else
     {
@@ -1376,7 +1384,7 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
     else
     {
         /*单位切换*/
-        if (1)
+        if (1u)
         {
             GUI_General_Display(MultiPurpose_Sprite, CN_PJchesu_kmh, GUI_BLENDMODE_SRC_OVER); /*km/H*/
         }
@@ -1393,7 +1401,7 @@ void GUI_Drive_Info_Avg_Speed_Display(uint16_t Speed)
         }
 
         /*单位切换*/
-        if (1)
+        if (1u)
         {
             if (Speed == TRAPB) /*Trip B*/
             {
@@ -1452,7 +1460,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
     else
     {
         /*单位切换*/
-        if (1)
+        if (1u)
         {
             GUI_General_Display(MultiPurpose_Sprite, CN_PJyouhao_L100km, GUI_BLENDMODE_SRC_OVER); /*L/km*/
         }
@@ -1470,7 +1478,7 @@ void GUI_Drive_Info_Avg_Fuel_Display(uint16_t Fuel)
 
         GUI_Translate_Display(MultiPurpose_Sprite, Nb_21_dian, 656u, 285u, GUI_BLENDMODE_CUSTOM); /*top*/
 
-        if (1)
+        if (1u)
         {
             if (Fuel == TRAPB) /*Trip B*/
             {

source/Driver/Graphic/loc_graphics_data.h

@@ -13,7 +13,7 @@
 #include "DisplaySch_user.h"
 
 /*区域1 WET*/
-#define MAX_WET_SUP_LAYER        20
+#define MAX_WET_SUP_LAYER        25
 MultiBufferSprite_t WETSpriteBuf;
 uint8_t             WETIndex = 0u;
 uint8_t             WETUpdate = 0u;