调整菜单显示

ghs/project.siz

 project          .intvect            1536
-project          .text             320172
+project          .text             320316
 project          .rodata           411103
 project          .secinfo             120
 project          .syscall               6

source/Application/APP/Key/Key.h

@@ -127,4 +127,6 @@ extern Key_Set_en_t Key_Parameter_Set_Super_Long_Press_Time(uint16_t u16Time);
 /*获取IG状态*/
 extern Key_IGN_en_t Key_Get_IGN_Status(void);
 
+extern uint8_t Common_Get_RetMenu_Flag(void);
+
 #endif
\ No newline at end of file

source/Application/APP/Key/Key_user.c

@@ -593,8 +593,10 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
     }
 }
 
-
-
+uint8_t Common_Get_RetMenu_Flag(void)
+{
+    return MenuFlag.Menu_Flag;
+}
 /*------------读按键实时状态的回调函数-------------------------------------------*/
 Key_Real_Status_en_t Key_Real_Status_Read_Enter(void);
 Key_Real_Status_en_t Key_Real_Status_Read_Return(void);

source/Application/Graphic/GUI/GUI.c

@@ -2707,12 +2707,18 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
                 GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
             }
         }
-        else
+        else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_5)
         {
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
         }
+        else
+        {
+            GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
+            GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
+            GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
+        }
     }
     else
     {
@@ -2833,7 +2839,7 @@ void GUI_BG_UserSetMenu6_Display(uint8_t Mode)
     uint8_t Flag = 0;
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
-        //GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_11black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
+        GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
     }
     else
     {