调整显示bug

source/Application/APP/Key/Key_user.c

@@ -1129,7 +1129,11 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
             /*----无车速，有报警----*/
             if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
             {
-                ; /*Do Nothing!*/
+                /*自检模式进入经销商模式*/
+                if (bCurMenuIDX == _MN_DSP_Menu_Test)
+                {
+                    K_Line_Set.K_Line_LID51 = 0x02;
+                }
             }
             else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
             {

source/Application/Graphic/GUI/GUI.c

@@ -6605,7 +6605,7 @@ void GUI_Display_DTC_Server(void)
         {
             DTCNumTime = 0u;
 
-            if (DTCNumDis < 2u)
+            if (DTCNumDis < (DTCNumeber - 1u))
             {
                 DTCNumDis++;
             }
@@ -6617,7 +6617,7 @@ void GUI_Display_DTC_Server(void)
     }
     else
     {
-        if (DTCNumDis < 2u)
+        if (DTCNumDis < (DTCNumeber - 1u))
         {
             DTCNumDis++;
         }
@@ -6627,13 +6627,14 @@ void GUI_Display_DTC_Server(void)
         }
     }
 
-    DTCNum = Display_DTC[0u].Disp_True_False +
-             Display_DTC[1u].Disp_True_False +
-             Display_DTC[2u].Disp_True_False ;
+    for (i = 0u; i < (DTCNumeber - 1u); i++)
+    {
+        DTCNum += Display_DTC[i].Disp_True_False;
+    }
 
     if (DTCNum == 0u)
     {
-        DTCNumDis = 3u;
+        DTCNumDis = DTCNumeber;
     }
 
     if (Display_DTC[DTCNumDis].Disp_True_False == 1u)

source/Application/Graphic/GUI/GUI.h

@@ -11,6 +11,7 @@
 
 #define Language_En 0u
 #define Language_Cn 1u
+#define DTCNumeber  3u
 
 #define FState_COilTimeOutNum 60u /*3S*/
 

source/Application/Graphic/Menu/Menu.h

@@ -198,7 +198,7 @@ typedef struct
     uint8_t Menu_Key_Time;         /*按键长按时间记录*/
     uint8_t Key_Menu_Popup_Flag;   /*报警界面menu按键长按 */
     uint8_t Menu_Popup_Flag;       /*界面状态 0-通常 1-报警 2-工厂 3-经销商 4-仪表自我诊断*/
-    uint8_t MenuNum;               /*历史界面保存*/
+    uint8_t MenuNum;               /*未用*/
     uint8_t Key_MenuTest_Long;     /**/
     uint8_t Key_MenuTest_ShortNum; /**/
     uint8_t Menu_Factory;          /*工厂模式*/

source/Application/Graphic/Menu/Menu_user.c

@@ -138,7 +138,7 @@ const _MenuOptTab   MenuOptTab[] =
     /*90*/{ _FAC_DSP_LEVEL1_2MENU_2,  _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_2,    LevelF1_2Menu_1Enter,    LevelF1_2Menu_1Do,    LevelF1_2Menu_1Exit},
     /*91*/{ _FAC_DSP_LEVEL1_2MENU_3,  _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1_2MENU_1,  LevelF1_2Menu_2Enter,    LevelF1_2Menu_2Do,    LevelF1_2Menu_2Exit},
     /*92*/{ _FAC_DSP_LEVEL1_2MENU_4,  _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelF1_2Menu_3Enter,    LevelF1_2Menu_3Do,    LevelF1_2Menu_3Exit},
-    /*93*/{ _FAC_DSP_LEVEL1MENU_2,    _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelF1_2Menu_4Enter,    LevelF1_2Menu_4Do,    LevelF1_2Menu_4Exit},
+    /*93*/{ _FAC_DSP_LEVEL0MENU_1,    _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelF1_2Menu_4Enter,    LevelF1_2Menu_4Do,    LevelF1_2Menu_4Exit},
 
     /*94*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1_3MENU_2,  _FAC_DSP_LEVEL1MENU_3,    LevelF1_3Menu_1Enter,    LevelF1_3Menu_1Do,    LevelF1_3Menu_1Exit},
     /*95*/{ _MN_IDX_NULL,             _FAC_DSP_LEVEL1_3MENU_1,  _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_3,    LevelF1_3Menu_2Enter,    LevelF1_3Menu_2Do,    LevelF1_3Menu_2Exit},

source/Application/Graphic/UE/DisplaySch_user.c

@@ -66,7 +66,6 @@ void DispSch_TotalInit(void)
     if (BG_display_flag == 0u)
     {
         BG_display_flag = 1u;
-        MenuFlag.MenuNum = 0u;
         MenuFlag.Menu_Popup_Flag = 0u ;
 
         MenuInit();
@@ -92,9 +91,10 @@ void DisplayServices(void)
     }
     else
     {
+        /*获取四种模式*/
         Meter_Mode_conversion();
 
-        if (K_Line_Set.K_Line_LID51 == 0x01u)
+        if ((K_Line_Set.K_Line_LID51 == 0x01u) && (MenuFlag.Menu_Test != 1u))
         {
             popupID = Popup_Get_Current_Message();
         }
@@ -299,7 +299,6 @@ void GUI_DisplayServices(void)
         if (MenuFlag.Menu_Popup_Flag == 0u)
         {
             MenuFlag.Menu_Popup_Flag = 1u;
-            //MenuFlag.MenuNum = bCurMenuIDX;
 
             NextMenu(_MN_DSP_LEVEPOPUP);
             bCurMenuIDX = _MN_DSP_LEVEPOPUP;