调整界面显示

ghs/project.siz

 project          .intvect            1536
-project          .text             312556
+project          .text             312588
 project          .rodata           410775
 project          .secinfo             120
 project          .syscall               6

source/Application/APP/Key/Key_user.c

@@ -217,7 +217,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
     {
         if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
         {
-            if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_2_MENU_8)) ||
+            if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
                     ((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_11) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_22)) ||
                     ((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
             {
@@ -491,7 +491,7 @@ Key_Real_Status_en_t Key_Real_Status_Read_Enter(void)
     }
     else
     {
-        if ((Key_R >= (5500 - 300)) && (Key_R <= (5500 + 300)))
+        if ((Key_R >= (5300 - 300)) && (Key_R <= (5300 + 300)))
         {
             enKeyRealStatus = KEY_LINE_PRESS;
         }

source/Application/Graphic/GUI/GUI.c

@@ -2119,12 +2119,16 @@ void GUI_BG_RepSet_Menu_Display(uint8_t Mode)
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_03black + State_Flag.WXSD_BSXY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
         }
-        else
+        else if (bCurMenuIDX == _MN_DSP_LEVEL2_3_MENU_7)
         {
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_03black + State_Flag.WXSD_BSXY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_04black + State_Flag.WXSD_CSQY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
             GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_06black + State_Flag.WXSD_DLZXY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
         }
+        else
+        {
+            ;/*Do Nothing*/
+        }
     }
     else
     {
@@ -3311,16 +3315,26 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
 
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
-        GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_11, GUI_BLENDMODE_SRC_OVER); /*menu*/
-
         if (User_FDJYLQQ_Value > 0u)
         {
             if (User_FDJYLQQ_Value > 999u)
             {
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
+
+                //if (User_FDJYLQQ_Value > 1000)
+                //{
+                //    GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
+                //}
+                //else
+                //{
+                //    GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_14, GUI_BLENDMODE_SRC_OVER); /*即将更换*/
+                //}
+
                 GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
             }
             else
             {
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*请更换*/
                 GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
             }
 
@@ -3330,6 +3344,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
         {
             if (User_FDJYLQQ_FLAG == 1u)
             {
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
                 GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
                 GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER);  /*负号*/
 
@@ -4700,13 +4715,13 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode)
 
         if (State_Flag.ENTER_RETURN == 0)
         {
-            GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_7, GUI_BLENDMODE_SRC_OVER);
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_10, GUI_BLENDMODE_SRC_OVER);
             GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
             GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
         }
         else
         {
-            GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_8, GUI_BLENDMODE_SRC_OVER);
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_11, GUI_BLENDMODE_SRC_OVER);
             GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
             GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
         }