调整按键，开机时序相关功能。

source/Application/APP/Key/Key.c

@@ -308,7 +308,7 @@ void Key_Init(void)
     /*按键动作时间*/
     stKeyParameter.u16KeyLoosenTime = 100U;
     stKeyParameter.u16KeyShortPressTime = 40U;
-    stKeyParameter.u16KeyLongPressTime = 2000U;
+    stKeyParameter.u16KeyLongPressTime = 1500U;
     stKeyParameter.u16KeySuperLongPressTime = 10000U;
     stKeyParameter.u16KeyValidOFFTime = 200U; /*按键动作时间*/
     stKeyParameter.u16KeyValidONTime = 1000U;

source/Application/Graphic/GUI/GUI.c

@@ -1768,12 +1768,16 @@ void GUI_Time_OilTemp_Display(uint8_t Mode)
  --------------------------------------------------------------------------*/
 void GUI_Time_OilTemp_OFF_Display(uint8_t Mode)
 {
+    uint32_t Temp = 0u;
+
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
+        Temp = Get_ID_18FEE518_Sig_Total_Engine_Hours();
+        Temp = Temp / 20u;
     }
     else
     {
-        GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+        GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
     }
 }
 

source/Application/Graphic/UE/DisplaySch_user.c

@@ -40,10 +40,11 @@ uint32_t Get_IG_Off(void)
 }
 
 static const DispSch_Attr_st loc[] =
-    {
-        {&UE_EN[Display_StartAnimation], UE_IGN_ON, Display_StartAnimation, ((void *)0), Display_StartAnimationEnter, Display_StartAnimationService, Display_StartAnimationExit},
-        {&UE_EN[Display_Menu], UE_IGN_ON, Display_Menu, ((void *)0), ((void *)0), Display_MenuService, ((void *)0)},
-        {&UE_EN[Display_Alarm], UE_IGN_ON, Display_Alarm, ((void *)0), ((void *)0), Display_AlarmService, ((void *)0)},
+{
+    {&UE_EN[Display_StartAnimation], UE_IGN_ON, Display_StartAnimation, ((void *)0), Display_StartAnimationEnter, Display_StartAnimationService, Display_StartAnimationExit},
+    {&UE_EN[Display_Menu], UE_IGN_ON, Display_Menu, ((void *)0), ((void *)0), Display_MenuService, ((void *)0)},
+    {&UE_EN[Display_Alarm], UE_IGN_ON, Display_Alarm, ((void *)0), ((void *)0), Display_AlarmService, ((void *)0)},
+    {&UE_EN[Display_Nothing], UE_IGN_OFF, Display_Nothing, ((void *)0), Display_NothingEnter, Display_NothingService, ((void *)0)},
 };
 
 void DispSch_TotalInit(void)
@@ -85,9 +86,19 @@ void DisplayServices(void)
     {
         popupID = Popup_Get_Current_Message();
 
+
         if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
         {
             UE_EN[Display_Alarm] = UE_Enable;
+
+            if (PowerStatus == COMMON_POWER_ON)
+            {
+                ; /*不处理*/
+            }
+            else
+            {
+                UE_EN[Display_Nothing] = UE_Disable;
+            }
         }
         else
         {
@@ -109,6 +120,7 @@ void DisplayServices(void)
             else
             {
                 UE_EN[Display_Menu] = UE_Disable;
+                UE_EN[Display_Nothing] = UE_Enable;
             }
         }
 
@@ -222,11 +234,25 @@ void Display_AlarmService(void)
 {
 }
 
+void Display_NothingEnter(void)
+{
+    JCUA_Disable_window();
+    loc_Disable_Window_App( );
+    loc_free_mem(WET_Sprite, Calendar_Sprite);
+}
+
+void Display_NothingService(void)
+{
+
+}
+
 void GUI_DisplayServices(void)
 {
+    uint32_t PowerStatus = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
     HMI_MENU_Sta = Get_Cur_HMI();
+    PowerStatus = Common_Get_IG_Sts();
 
     if (BG_display_flag == 0)
     {
@@ -236,6 +262,7 @@ void GUI_DisplayServices(void)
     }
     else
     {
+        /*if ((HMI_MENU_Sta == Display_Alarm) && (PowerStatus == COMMON_POWER_ON))*/
         if (HMI_MENU_Sta == Display_Alarm)
         {
             loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
@@ -249,25 +276,31 @@ void GUI_DisplayServices(void)
         }
         else
         {
-            if ((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1))
+            if (PowerStatus == COMMON_POWER_ON)
             {
-                loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
-                if (Common_Get_window_Sta() != 0u)
+                if ((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1))
                 {
-                    JCUA_Disable_window();
+                    loc_Del_Sprite(ADAS_Sprite, Gear_Sprite);
+                    if (Common_Get_window_Sta() != 0u)
+                    {
+                        JCUA_Disable_window();
+                    }
                 }
+                else
+                {
+                    loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
+                    if (Common_Get_window_Sta() != 1u)
+                    {
+                        JCUA_Enable_window();
+                    }
+                }
+
+                MenuManage();
             }
             else
             {
-                loc_Del_Sprite(MENU_Sprite, MENU_Sprite);
-                if (Common_Get_window_Sta() != 1u)
-                {
-                    JCUA_Enable_window();
-                }
+                BG_display_flag = 0u;
             }
-
-            MenuManage();
-            // BG_display_flag = 0;
         }
     }
 }

source/Application/Graphic/UE/DisplaySch_user.h

@@ -47,6 +47,7 @@ typedef enum
     Display_StartAnimation,
     Display_Menu,
     Display_Alarm,
+    Display_Nothing,
 
     Display_MAX,
 } DisplayName;
@@ -63,6 +64,9 @@ void Display_StartAnimationService(void);
 void Display_StartAnimationEnter(void);
 void Display_StartAnimationExit(void);
 
+void Display_NothingEnter(void);
+void Display_NothingService(void);
+
 void GUI_DisplayServices(void);
 
 void HMI_Set_KEY_CtrlRight(uint8_t u8KeyVal);

source/System/init.c

@@ -170,7 +170,6 @@ void Sys_Startup_Init(void)
 
     /*30电初始化*/
     APP_Startup_Init(u8ResetFlag);
-    APP_Startup_Init(u8ResetFlag);
     TestBackupRam = 0x11223344UL;
 
     /*外发要用到EEP数据，位置移动*/