调整报警之后无法返回原来界面BUG

source/Application/Graphic/Menu/Menu.h

@@ -199,13 +199,16 @@ typedef struct
     uint8_t Menu_Time_Flag;        /*从Enter界面确认退出计时*/
     uint8_t Menu_Enter_Return;     /*进入Enter之前界面*/
     uint8_t Menu_Return;           /*Enter Return界面切换标记*/
+
     uint16_t Key_Menu_Popup_time;  /*报警状态持续时间*/
     uint8_t Menu_Key_Time;         /*按键长按时间记录*/
     uint8_t Key_Menu_Popup_Flag;   /*报警界面menu按键长按 */
+
     uint8_t Menu_Popup_Flag;       /*界面状态 0-通常 1-报警 2-工厂 3-经销商 4-仪表自我诊断*/
     uint8_t Key_MenuTest_Long;     /**/
     uint8_t Key_MenuTest_ShortNum; /**/
     uint8_t Menu_Factory;          /*工厂模式*/
+
     uint8_t Menu_Dealer;           /*经销商模式*/
     uint8_t Menu_Test;             /*仪表自我诊断模式*/
     uint8_t Meun_Test_Dealer;      /*自我诊断模式进入经销商模式标记*/

source/Application/Graphic/Menu/Menu_user.c

@@ -18,10 +18,12 @@ uint8_t     bNextMenuIDX;
 uint8_t     bCurMenuIDX;
 uint8_t     bMainMenuIDX;
 uint8_t     bOldMenuIDX;
+uint8_t     Menu_DTC_DisTime;
 
+#pragma alignvar(8)
 _MenuFlag    MenuFlag   ;
 
-uint8_t Menu_DTC_DisTime;
+
 
 const _MenuOptTab   MenuOptTab[] =
 {

source/Application/Graphic/UE/DisplaySch_user.c

@@ -307,11 +307,14 @@ void Display_NothingService(void)
 
 void GUI_DisplayServices(void)
 {
+    uint16_t DispVSpeed = 0u;
+    uint16_t DispESpeed = 0u;
     uint32_t PowerStatus = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
     HMI_MENU_Sta = Get_Cur_HMI();
     PowerStatus = Common_Get_IG_Sts();
+    DispVSpeed = Common_Get_Disp_V_Speed();
 
     if (HMI_MENU_Sta == Display_Alarm)
     {
@@ -326,6 +329,15 @@ void GUI_DisplayServices(void)
         {
             MenuFlag.Menu_Popup_Flag = 1u;
 
+            if (bCurMenuIDX < _MN_DSP_Menu_OFF)
+            {
+                MenuFlag.Meun_Test_Dealer = bCurMenuIDX ;
+            }
+            else
+            {
+                MenuFlag.Meun_Test_Dealer = 0u;
+            }
+
             NextMenu(_MN_DSP_LEVEPOPUP);
             bCurMenuIDX = _MN_DSP_LEVEPOPUP;
         }
@@ -362,8 +374,16 @@ void GUI_DisplayServices(void)
             {
                 MenuFlag.Menu_Popup_Flag = 0u;
 
-                NextMenu( MenuFlag.Menu_Flag);
-                bCurMenuIDX = MenuFlag.Menu_Flag;
+                if (DispVSpeed > 66u)
+                {
+                    NextMenu(MenuFlag.Menu_Flag);
+                    bCurMenuIDX = MenuFlag.Menu_Flag;
+                }
+                else
+                {
+                    NextMenu(MenuFlag.Meun_Test_Dealer);
+                    bCurMenuIDX = MenuFlag.Meun_Test_Dealer;
+                }
             }
 
             if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) ||
@@ -571,17 +591,7 @@ void Meter_Mode_conversion(void)
         }
         else
         {
-            if (DispVSpeed > 66u)
-            {
-                if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
-                {
-                    NextMenu(MenuFlag.Menu_Flag);
-                }
-            }
-            else
-            {
-                ; /*Do Nothing!*/
-            }
+            ;/*Do Nothing!*/
         }
     }
 }
\ No newline at end of file