调整清除DTC显示逻辑

source/Application/Graphic/GUI/GUI.c

@@ -6765,6 +6765,7 @@ void GUI_BG_FacDTCClear1_Display(uint8_t Mode)
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_1, 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
     {
@@ -6788,6 +6789,8 @@ void GUI_BG_FacDTCClear2_Display(uint8_t Mode)
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, 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
     {
@@ -6811,6 +6814,8 @@ void GUI_BG_FacDTCClear3_Display(uint8_t Mode)
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, 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);
     }
     else
     {
@@ -6969,7 +6974,7 @@ void GUI_BG_FacMeterExit_Display(uint8_t Mode)
     {
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_07_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
-        //GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
+        GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_07_1, GUI_BLENDMODE_SRC_OVER);
         GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
@@ -7203,6 +7208,7 @@ void GUI_BG_DeaDTCClear1_Display(uint8_t Mode)
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_1, 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
     {
@@ -7226,6 +7232,8 @@ void GUI_BG_DeaDTCClear2_Display(uint8_t Mode)
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, 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
     {
@@ -7249,6 +7257,8 @@ void GUI_BG_DeaDTCClear3_Display(uint8_t Mode)
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, 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);
     }
     else
     {
@@ -7407,7 +7417,7 @@ void GUI_BG_DeaMeterExit_Display(uint8_t Mode)
     {
         GUI_General_Display(MENU_Sprite, CN_DLR_Menu1_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
-        //GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
+        GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
         GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_07_1, GUI_BLENDMODE_SRC_OVER);
         GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);

source/Application/Graphic/Menu/Menu_user.c

@@ -137,7 +137,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},
+    /*92*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelF1_2Menu_3Enter,    LevelF1_2Menu_3Do,    LevelF1_2Menu_3Exit},
     /*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},
@@ -164,7 +164,7 @@ const _MenuOptTab   MenuOptTab[] =
 
     /*08*/{ _DEA_DSP_LEVEL1_2MENU_2,  _MN_IDX_NULL,             _MN_IDX_NULL,             _DEA_DSP_LEVEL1MENU_2,    LevelD1_2Menu_1Enter,    LevelD1_2Menu_1Do,    LevelD1_2Menu_1Exit},
     /*09*/{ _DEA_DSP_LEVEL1_2MENU_3,  _MN_IDX_NULL,             _MN_IDX_NULL,             _DEA_DSP_LEVEL1_2MENU_1,  LevelD1_2Menu_2Enter,    LevelD1_2Menu_2Do,    LevelD1_2Menu_2Exit},
-    /*10*/{ _DEA_DSP_LEVEL1_2MENU_4,  _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelD1_2Menu_3Enter,    LevelD1_2Menu_3Do,    LevelD1_2Menu_3Exit},
+    /*10*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelD1_2Menu_3Enter,    LevelD1_2Menu_3Do,    LevelD1_2Menu_3Exit},
     /*11*/{ _DEA_DSP_LEVEL0MENU_1,    _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelD1_2Menu_4Enter,    LevelD1_2Menu_4Do,    LevelD1_2Menu_4Exit},
 
     /*12*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _DEA_DSP_LEVEL1_3MENU_2,  _DEA_DSP_LEVEL1MENU_3,    LevelD1_3Menu_1Enter,    LevelD1_3Menu_1Do,    LevelD1_3Menu_1Exit},
@@ -1815,7 +1815,17 @@ void LevelF1_2Menu_3Enter(void)
 void LevelF1_2Menu_3Do(void)
 {
     GUI_OftenShow_Display();
-    GUI_BG_FacDTCClear3_Display(GUI_DISP_MODE_NORMAL);
+
+    if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
+    {
+        GUI_BG_FacDTCClear3_Display(GUI_DISP_MODE_NORMAL);
+    }
+    else
+    {
+        Common_Set_Menu_FacDea_Time_Sta(0u);
+        NextMenu(_FAC_DSP_LEVEL1_2MENU_4);
+        bCurMenuIDX = _FAC_DSP_LEVEL1_2MENU_4;
+    }
 }
 void LevelF1_2Menu_3Exit(void)
 {}
@@ -1986,7 +1996,17 @@ void LevelD1_2Menu_3Enter(void)
 void LevelD1_2Menu_3Do(void)
 {
     GUI_OftenShow_Display();
-    GUI_BG_DeaDTCClear3_Display(GUI_DISP_MODE_NORMAL);
+
+    if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
+    {
+        GUI_BG_DeaDTCClear3_Display(GUI_DISP_MODE_NORMAL);
+    }
+    else
+    {
+        Common_Set_Menu_FacDea_Time_Sta(0u);
+        NextMenu(_DEA_DSP_LEVEL1_2MENU_4);
+        bCurMenuIDX = _DEA_DSP_LEVEL1_2MENU_4;
+    }
 }
 void LevelD1_2Menu_3Exit(void)
 {}

source/Application/RTE/Common_Interface.c

@@ -82,6 +82,7 @@ static uint32_t HIGH_VOLTAGE;
 static uint32_t LOW_VOLTAGE;
 
 static uint32_t TPMS_TEST_OFF_TIME;
+static uint32_t Menu_FacDea_Time;
 
 /*每次唤醒调用*/
 void Common_DataInit(void)
@@ -124,6 +125,7 @@ void Common_DataInit(void)
     LOW_VOLTAGE = 0x0u;
 
     TPMS_TEST_OFF_TIME = 0u;
+    Menu_FacDea_Time = 0u;
 }
 
 /*以下由各个处理模块按需调用*/
@@ -381,6 +383,18 @@ void Common_Input_Para(void)
             TPMS_TEST_OFF_TIME = 0;
         }
 
+        /**/
+        if ((bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_3) || (bCurMenuIDX == _DEA_DSP_LEVEL1_2MENU_3))
+        {
+            if (Menu_FacDea_Time < 1500u)
+            {
+                Menu_FacDea_Time++;
+            }
+            else
+            {
+                ;/*Do Nothing!*/
+            }
+        }
         /**/
         if ((State_Flag.User_FDJYLQQ_FLAG == 1) || (State_Flag.User_FDJYLQQ_FLAG == 2))
         {
@@ -814,6 +828,15 @@ uint8_t Common_Get_TPMS_TEST_OFF_Time_Sta(void)
     return 0u;
 }
 
+void Common_Set_Menu_FacDea_Time_Sta(uint32_t Value)
+{
+    Menu_FacDea_Time = Value;
+}
+uint32_t Common_Get_Menu_FacDea_Time_Sta(void)
+{
+    return Menu_FacDea_Time;
+}
+
 /*EOL诊断配置数据转换为仪表配置数据*/
 void ReadDTCEOLValue_Meter_K_LINE(void)
 {

source/Application/RTE/Common_Interface.h

@@ -141,8 +141,11 @@ uint8_t Common_Get_KQGZJ_Sta (void);
 uint8_t Common_Get_DLZXY_Sta (void);
 uint8_t Common_Get_LT_Sta (void);
 
+void Common_Set_Menu_FacDea_Time_Sta(uint32_t Value);
+uint32_t Common_Get_Menu_FacDea_Time_Sta(void);
 uint8_t Common_Get_TPMS_TEST_OFF_Time_Sta(void);
 
+
 void ReadDTCEOLValue_Meter_K_LINE(void);
 void K_LINE_EOL_InitVal(void);
 

source/Driver/Graphic/images.h

@@ -646,14 +646,20 @@ enum SpriteName
     CN_Menu_FV,
     CN_Menu_HV,
     CN_Menu_SV,
+    CN_grey_enter,
     CN_grey_no,
+    CN_grey_RETURN,
+    CN_grey_return,
     CN_grey_yes,
+    CN_white_enter,
     CN_white_fuwei,
     CN_white_jieshu,
     CN_white_jieshu_1,
     CN_white_no,
     CN_white_queding,
     CN_white_quxiao,
+    CN_white_RETURN,
+    CN_white_return,
     CN_white_yes,
     CN_User_Menu1_01black,
     CN_User_Menu1_01grey,