调整UE，更换图片

source/Application/APP/PowerManagement/PowerManagement_user.c

@@ -229,6 +229,7 @@ void Power_IG_ON_Init(void)
     //LongTimeNoKey_Operation_TimeRest();
     CD4051B_KL15Init();
 
+    DispSch_TotalInit();
     GUI_Display_KL15_ON_Init();
 
     /*气压1 气压2 WET气压数据初始化*/

source/Application/Graphic/GUI/GUI.c

@@ -248,6 +248,30 @@ void GUI_OftenShow_Display(void)
     }
 }
 
+void GUI_OftenShowOFF_Display(void)
+{
+    uint8_t Trip_Type = 0u;
+
+    Trip_Type = User_set_Num.Trip_Type;
+
+    GUI_AC_Temp_Dispaly(GUI_DISP_MODE_BLANK);
+    GUI_Time_Dispaly(GUI_DISP_MODE_BLANK);
+    GUI_Data_Dispaly(GUI_DISP_MODE_BLANK);
+    GUI_TFTTelltales_Display(GUI_DISP_MODE_BLANK);
+    GUI_WetGas_Dispaly(GUI_DISP_MODE_BLANK);
+    GUI_AdBlue_Dispaly(GUI_DISP_MODE_BLANK);
+    Gui_ODO_Display(GUI_DISP_MODE_BLANK);
+
+    if (Trip_Type == TRAPA)
+    {
+        Gui_TRIPA_Display(GUI_DISP_MODE_BLANK);
+    }
+    else
+    {
+        Gui_TRIPB_Display(GUI_DISP_MODE_BLANK);
+    }
+}
+
 /*-------------------------------------------------------------------------
  * Function Name  : GUI_Dynamic_DIsplay
  * Description    :

source/Application/Graphic/GUI/GUI.h

@@ -293,6 +293,7 @@ extern void GUI_Display_KL15_OFF_Init(void);
 extern void GUI_Display_Value_Init(void); /*显示数据初始化*/
 extern void GUI_Display_background(void); /*刷底图*/
 extern void GUI_OftenShow_Display(void);  /*常显界面*/
+extern void GUI_OftenShowOFF_Display(void);
 extern void GUI_Dynamic_DIsplay(void);
 
 void GUI_AC_Temp_Dispaly(uint8_t Mode);                 /*室外温度显示*/

source/Application/Graphic/Menu/Menu.h

@@ -118,6 +118,8 @@ typedef enum
     _MN_DSP_LEVEL3_5_MENU_3, /* 78 AEBS第2警报演示*/
     _MN_DSP_LEVEL3_5_MENU_4, /* 79 AEBS全力制动警报演示*/
 
+    _MN_DSP_Menu_OFF,      /*80 OFF档界面显示*/
+
     /*工厂模式*/
     _FAC_DSP_LEVEL1MENU_1, /* 80 DTC显示*/
     _FAC_DSP_LEVEL1MENU_2, /* 81 DTC清除*/
@@ -166,11 +168,13 @@ typedef struct
     uint8_t Menu_Time_Flag;       /*从Enter界面确认退出计时*/
     uint8_t Menu_Enter_Return;    /*进入Enter之前界面*/
     uint8_t Menu_Return;          /*Enter Return界面切换标记*/
-    uint8_t Menu_Key_Time;        /*按键长按时间记录*/
     uint16_t Key_Menu_Popup_time; /*上述状态持续时间*/
+    uint8_t Menu_Key_Time;        /*按键长按时间记录*/
     uint8_t Key_Menu_Popup_Flag;  /*报警界面menu按键长按 */
     uint8_t Menu_Light_Time;
     uint8_t Menu_Light_Time_Flag;
+    uint8_t Menu_Popup_Flag;
+    uint8_t MenuNum;
 } _MenuFlag;
 
 EXTERN_MEU_PROCESS _MenuFlag MenuFlag;
@@ -515,6 +519,10 @@ EXTERN_MEU_PROCESS void Level_Return_Menu_Enter(void);
 EXTERN_MEU_PROCESS void Level_Return_Menu_Do(void);
 EXTERN_MEU_PROCESS void Level_Return_Menu_Exit(void);
 
+EXTERN_MEU_PROCESS void LevelMenuOFF_Enter(void);
+EXTERN_MEU_PROCESS void LevelMenuOFF_Do(void);
+EXTERN_MEU_PROCESS void LevelMenuOFF_Exit(void);
+
 EXTERN_MEU_PROCESS void LevelF1Menu_1Enter(void);
 EXTERN_MEU_PROCESS void LevelF1Menu_1Do(void);
 EXTERN_MEU_PROCESS void LevelF1Menu_1Exit(void);

source/Application/Graphic/Menu/Menu_user.c

@@ -119,6 +119,8 @@ const _MenuOptTab   MenuOptTab[] =
     /*78*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_DSP_LEVEL2_5_MENU_3,  Level3_5Menu_3Enter,     Level3_5Menu_3Do,     Level3_5Menu_3Exit},
     /*79*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_DSP_LEVEL2_5_MENU_4,  Level3_5Menu_4Enter,     Level3_5Menu_4Do,     Level3_5Menu_4Exit},
 
+    /*80*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelMenuOFF_Enter,      LevelMenuOFF_Do,      LevelMenuOFF_Exit},
+
     /*工厂模式*/
     /*80*/{ _FAC_DSP_LEVEL1_1MENU_1,  _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_2,    _MN_IDX_NULL,             LevelF1Menu_1Enter,      LevelF1Menu_1Do,      LevelF1Menu_1Exit},
     /*81*/{ _FAC_DSP_LEVEL1MENU_2,    _FAC_DSP_LEVEL1MENU_1,    _FAC_DSP_LEVEL1MENU_3,    _MN_IDX_NULL,             LevelF1Menu_2Enter,      LevelF1Menu_2Do,      LevelF1Menu_2Exit},
@@ -291,8 +293,7 @@ void LevelPopup_Enter(void)
 {}
 void LevelPopup_Do(void)
 {
-    GUI_OftenShow_Display();
-    GUI_Dynamic_DIsplay();
+    GUI_General_Popup();
 }
 void LevelPopup_Exit(void)
 {}
@@ -1590,6 +1591,17 @@ void Level_Return_Menu_Exit(void)
     State_Flag.ENTER_RETURN = 0;
 }
 
+/*OFF档运行时间显示*/
+void LevelMenuOFF_Enter(void)
+{}
+void LevelMenuOFF_Do(void)
+{
+    GUI_OftenShowOFF_Display();
+    GUI_Time_OilTemp_OFF_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelMenuOFF_Exit(void)
+{}
+
 /*----工厂模式----*/
 /*----工厂模式----DTC显示-----*/
 void LevelF1Menu_1Enter(void)

source/Application/Graphic/UE/DisplaySch_user.c

@@ -57,10 +57,20 @@ void DispSch_TotalInit(void)
     m_st.Get_IG_OFF_Timer = Get_IG_Off;
     m_st.TotalSize = Display_MAX;
     DispSch_Init(Mem, loc, &m_st, 0u);
+
     for (i = 0u; i < Display_MAX; i++)
     {
         UE_EN[i] = UE_Disable;
     }
+
+    if (BG_display_flag == 0u)
+    {
+        BG_display_flag = 1u;
+        MenuFlag.MenuNum = 0u;
+        MenuFlag.Menu_Popup_Flag = 0u ;
+
+        MenuInit();
+    }
 }
 
 void DisplayServices(void)
@@ -84,7 +94,10 @@ void DisplayServices(void)
     }
     else
     {
-        popupID = Popup_Get_Current_Message();
+        if (K_Line_Set.K_Line_LID51 == 0x01u)
+        {
+            popupID = Popup_Get_Current_Message();
+        }
 
         if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
         {
@@ -280,56 +293,67 @@ void GUI_DisplayServices(void)
     HMI_MENU_Sta = Get_Cur_HMI();
     PowerStatus = Common_Get_IG_Sts();
 
-    if (BG_display_flag == 0)
+    if (HMI_MENU_Sta == Display_Alarm)
     {
-        BG_display_flag = 1;
+        loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
 
-        MenuInit();
+        if (Common_Get_window_Sta() != 1u)
+        {
+            JCUA_Enable_window();
+        }
+
+        if (MenuFlag.Menu_Popup_Flag == 0u)
+        {
+            MenuFlag.Menu_Popup_Flag = 1u;
+            MenuFlag.MenuNum = bCurMenuIDX;
+
+            NextMenu(_MN_DSP_LEVEPOPUP);
+        }
     }
-    else
+    else if ((HMI_MENU_Sta == Display_Menu) || (HMI_MENU_Sta == Display_Nothing))
     {
-        /*if ((HMI_MENU_Sta == Display_Alarm) && (PowerStatus == COMMON_POWER_ON))*/
-        if (HMI_MENU_Sta == Display_Alarm)
+        if (PowerStatus == COMMON_POWER_ON)
         {
-            loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
-
-            if (Common_Get_window_Sta() != 1u)
+            if (MenuFlag.Menu_Popup_Flag == 1u)
             {
-                JCUA_Enable_window();
+                MenuFlag.Menu_Popup_Flag = 0u;
+                NextMenu( MenuFlag.MenuNum );
             }
 
-            GUI_General_Popup();
-        }
-        else
-        {
-            if (PowerStatus == COMMON_POWER_ON)
+            if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) ||
+                    (bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1))
             {
-                if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) ||
-                        (bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1))
-                {
-                    loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
-                    if (Common_Get_window_Sta() != 0u)
-                    {
-                        JCUA_Disable_window();
-                    }
-                }
-                else
+                loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
+                if (Common_Get_window_Sta() != 0u)
                 {
-                    loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
-                    if (Common_Get_window_Sta() != 1u)
-                    {
-                        JCUA_Enable_window();
-                    }
+                    JCUA_Disable_window();
                 }
-
-                MenuManage();
             }
             else
             {
-                GUI_Time_OilTemp_OFF_Display(GUI_DISP_MODE_NORMAL);
-                BG_display_flag = 0u;
+                loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
+                if (Common_Get_window_Sta() != 1u)
+                {
+                    JCUA_Enable_window();
+                }
             }
         }
+        else
+        {
+            ;/*Do Nothing!*/
+            //BG_display_flag = 0u;
+            //NextMenu(_MN_DSP_Menu_OFF);
+        }
+    }
+
+    if (PowerStatus == COMMON_POWER_ON)
+    {
+        MenuManage();
+    }
+    else
+    {
+        GUI_Time_OilTemp_OFF_Display(GUI_DISP_MODE_NORMAL);
+        BG_display_flag = 0u;
     }
 }