From cf97886e6d302a9ec4c5825387503258661b2d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E8=BF=8E=E7=A7=8B?= <yingqiu.hu@hljtyw.com>
Date: Wed, 29 Dec 2021 18:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4OFF=E6=A1=A3=E5=8F=91?=
 =?UTF-8?q?=E5=8A=A8=E6=9C=BA=E5=90=AF=E5=8A=A8=E6=97=B6=E9=97=B4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/APP/BackLight/BackLight_APP.c | 10 ++++++
 .../APP/Data_Fuel/Data_Fuel_User.c            |  2 +-
 source/Application/Graphic/GUI/GUI.c          | 26 +++++++++++++-
 .../Application/Graphic/UE/DisplaySch_user.c  | 34 +++++++++++++------
 .../Application/Graphic/UE/DisplaySch_user.h  | 11 +++---
 5 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/source/Application/APP/BackLight/BackLight_APP.c b/source/Application/APP/BackLight/BackLight_APP.c
index 5c26b84..b78e3a6 100644
--- a/source/Application/APP/BackLight/BackLight_APP.c
+++ b/source/Application/APP/BackLight/BackLight_APP.c
@@ -171,6 +171,16 @@ void BL_Management_service ( void )
 
     GetBGLNTCVol(0);
     /*主函数中调用第一个参数电源状态 1是 ON档 2 off 第二个参数 唤醒条件 1是TTF唤醒 2 是表盘唤醒 3 是表盘和屏都有唤醒，0无唤醒*/
+
+    if (Common_Get_IG_Sts() == COMMON_POWER_ON)
+    {
+        BackLightWakeFlag = 0u;
+    }
+    else
+    {
+        BackLightWakeFlag = 1u;
+    }
+
     BackLightSchedu(Common_Get_IG_Sts(), BackLightWakeFlag);
 }
 
diff --git a/source/Application/APP/Data_Fuel/Data_Fuel_User.c b/source/Application/APP/Data_Fuel/Data_Fuel_User.c
index a4dddec..5b0d023 100644
--- a/source/Application/APP/Data_Fuel/Data_Fuel_User.c
+++ b/source/Application/APP/Data_Fuel/Data_Fuel_User.c
@@ -158,7 +158,7 @@ void Fuel_User_KL15_ON_Processing_Service(void)
         AFCPara.CurODO = ODO_Value * 100; // m
         AFCPara.FuleConsume = 0;
         AFCPara.RPM = Espeed;          // 1
-        AFCPara.Speed = (Vspeed * 10); // 0.1
+        AFCPara.Speed = (Vspeed / 10u); // 0.1
 
         SetAFCPara((AFC_PARA *)&AFCPara);
         FuelFSM(FuelR); /*新版增加系数*/
diff --git a/source/Application/Graphic/GUI/GUI.c b/source/Application/Graphic/GUI/GUI.c
index c98a3a4..d8fdc04 100644
--- a/source/Application/Graphic/GUI/GUI.c
+++ b/source/Application/Graphic/GUI/GUI.c
@@ -1773,7 +1773,31 @@ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         Temp = Get_ID_18FEE518_Sig_Total_Engine_Hours();
-        Temp = Temp / 20u;
+
+        /*时间*/
+        GUI_General_Display(MENU_Sprite, CN_Time_wenzi, GUI_BLENDMODE_SRC_OVER);  /*时间*/
+        GUI_General_Display(MENU_Sprite, CN_Time_danwei, GUI_BLENDMODE_SRC_OVER); /*H*/
+
+        if (Temp <= 0xFAFFFFFFu)
+        {
+            Temp = Temp / 20u;
+
+            if (Temp >= 9999999u)
+            {
+                GUI_General_Digit_Display(MENU_Sprite, 9999999u, Nb_20_0, 7u, 5u, GUI_DISP_OILTEMP, 221u, GUI_BLENDMODE_SRC_OVER);
+            }
+            else
+            {
+                GUI_General_Digit_Display(MENU_Sprite, Temp, Nb_20_0, 7u, 5u, GUI_DISP_OILTEMP, 221u, GUI_BLENDMODE_SRC_OVER);
+            }
+
+            GUI_Translate_Display(MENU_Sprite, Nb_20_dian, 719u, 241u, GUI_BLENDMODE_CUSTOM); /*点*/
+        }
+        else
+        {
+            GUI_General_Digit_Display(MENU_Sprite, 9999999u, Nb_20_0, 7u, 5u, GUI_DISP_OILTEMP, 221u, GUI_BLENDMODE_SRC_OVER);
+            GUI_Translate_Display(MENU_Sprite, Nb_20_dian, 719u, 241u, GUI_BLENDMODE_CUSTOM); /*点*/
+        }
     }
     else
     {
diff --git a/source/Application/Graphic/UE/DisplaySch_user.c b/source/Application/Graphic/UE/DisplaySch_user.c
index 6d83830..3b657d7 100644
--- a/source/Application/Graphic/UE/DisplaySch_user.c
+++ b/source/Application/Graphic/UE/DisplaySch_user.c
@@ -41,10 +41,10 @@ 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_Nothing], UE_IGN_OFF, Display_Nothing, ((void *)0), Display_NothingEnter, Display_NothingService, ((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), Display_MenuEnter          , Display_MenuService          , ((void *)0)},
+    {&UE_EN[Display_Alarm]         , UE_IGN_ON , Display_Alarm         , ((void *)0), Display_AlarmEnter         , 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)
@@ -169,7 +169,7 @@ void DisplayServices(void)
     {
         HMI_Clear_KEY_CONFIRM();
     }
-    /*确认超长 30 S*/
+    /*确认超长 15 S*/
     else if (UE_CtrlInfo.HMI_KEYInfo.u8KEY_CONFIRM == KEY_EVENT_SUPER_LONG_PRESS)
     {
         HMI_Clear_KEY_CONFIRM();
@@ -203,11 +203,16 @@ void DisplayServices(void)
     }
 }
 
+/*----开机动画----*/
 void Display_StartAnimationEnter(void)
 {
-    GUI_Display_background();
-}
+    /*硬清空所有缓存数据*/
+    loc_free_mem(WET_Sprite, MENU_Sprite);
 
+    /*使能底图窗口*/
+    JCUA_Enable_window();
+    //GUI_Display_background();
+}
 void Display_StartAnimationService(void)
 {
     uint16_t m16_FrameCnt;
@@ -221,26 +226,34 @@ void Display_StartAnimationService(void)
         GUI_Display_background();
     }
 }
-
 void Display_StartAnimationExit(void)
 {
     loc_Enable_Window_App();
 }
 
+/*----菜单----*/
+void Display_MenuEnter (void)
+{
+}
 void Display_MenuService(void)
 {
 }
+
+/*----报警----*/
+void Display_AlarmEnter (void)
+{
+}
 void Display_AlarmService(void)
 {
 }
 
+/*----Nothing----*/
 void Display_NothingEnter(void)
 {
     JCUA_Disable_window();
-    loc_Disable_Window_App( );
+    //loc_Disable_Window_App( );
     loc_free_mem(WET_Sprite, Calendar_Sprite);
 }
-
 void Display_NothingService(void)
 {
 
@@ -299,6 +312,7 @@ void GUI_DisplayServices(void)
             }
             else
             {
+                GUI_Time_OilTemp_OFF_Display(GUI_DISP_MODE_NORMAL);
                 BG_display_flag = 0u;
             }
         }
diff --git a/source/Application/Graphic/UE/DisplaySch_user.h b/source/Application/Graphic/UE/DisplaySch_user.h
index dae149e..fdd8bf7 100644
--- a/source/Application/Graphic/UE/DisplaySch_user.h
+++ b/source/Application/Graphic/UE/DisplaySch_user.h
@@ -57,13 +57,16 @@ extern UE_CtrlInfo_Struct_t UE_CtrlInfo;
 void DispSch_TotalInit(void);
 void DisplayServices(void);
 
-void Display_AlarmService(void);
-void Display_MenuService(void);
-void Display_StartAnimationService(void);
-
 void Display_StartAnimationEnter(void);
+void Display_StartAnimationService(void);
 void Display_StartAnimationExit(void);
 
+void Display_MenuEnter(void);
+void Display_MenuService(void);
+
+void Display_AlarmEnter(void);
+void Display_AlarmService(void);
+
 void Display_NothingEnter(void);
 void Display_NothingService(void);
 
-- 
2.23.0