增加报警1分钟不显示，调整按键初始化相应时间，调整图片，FV00.07

source/Application/Graphic/Menu/Menu_user.c

@@ -144,6 +144,9 @@ void MenuInit(void)
     {
         ;/*do nothing*/
     }
+
+    /*数据初始化*/
+    MenuFlag.Key_Menu_Popup_time = 0u;
 }
 void MenuManage(void)
 {

source/Application/Graphic/UE/DisplaySch_user.c

@@ -83,12 +83,21 @@ void DisplayServices(void)
     {
         popupID = Popup_Get_Current_Message( );
 
-        if ( popupID != 0xffffu )
+        if ((popupID != 0xffffu ) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
         {
             UE_EN [ Display_Alarm ]         = UE_Enable;
         }
         else
         {
+            if (MenuFlag.Key_Menu_Popup_time != 0x00u)
+            {
+                MenuFlag.Key_Menu_Popup_time --;
+            }
+            else
+            {
+                ;/*Do Nothing!*/
+            }
+
             UE_EN [ Display_Alarm ]          = UE_Disable;
 
             if ( PowerStatus == COMMON_POWER_ON )
@@ -101,35 +110,9 @@ void DisplayServices(void)
             }
         }
     }
-    DispSch_xxxMs_Logic(10u);
-}
-
-void Display_StartAnimationEnter(void)
-{
-    GUI_Display_background();
-}
-
-void Display_StartAnimationService(void)
-{
-    uint16_t m16_FrameCnt;
-
-    HMI_StartAnimationFrameCnt++;
-    m16_FrameCnt = HMI_StartAnimationFrameCnt;
-    if ( (m16_FrameCnt % 3) == 0 )
-    {
-        loc_Disable_Window_App( );
-        //GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
-        GUI_Display_background();
-    }
-}
 
-void Display_StartAnimationExit(void)
-{
-    loc_Enable_Window_App( );
-}
+    DispSch_xxxMs_Logic(10u);
 
-void Display_MenuService(void)
-{
     /*上短*/
     if ( UE_CtrlInfo.HMI_KEYInfo.u8KEY_UP == KEY_EVENT_SHORT_PRESS )
     {
@@ -193,6 +176,35 @@ void Display_MenuService(void)
         ;/*do nothing*/
     }
 }
+
+void Display_StartAnimationEnter(void)
+{
+    GUI_Display_background();
+}
+
+void Display_StartAnimationService(void)
+{
+    uint16_t m16_FrameCnt;
+
+    HMI_StartAnimationFrameCnt++;
+    m16_FrameCnt = HMI_StartAnimationFrameCnt;
+    if ( (m16_FrameCnt % 3) == 0 )
+    {
+        loc_Disable_Window_App( );
+        //GUI_Display_Animation_Frame(m16_FrameCnt / 3u);
+        GUI_Display_background();
+    }
+}
+
+void Display_StartAnimationExit(void)
+{
+    loc_Enable_Window_App( );
+}
+
+void Display_MenuService(void)
+{
+
+}
 void Display_AlarmService(void)
 {
 

source/Application/RTE/Common_Interface.c

@@ -320,7 +320,7 @@ void Common_Input_Para(void)
         }
 
         /**/
-        if (RTE_Read_KL15_Voltage() <= 23500) /*A2*/
+        if (RTE_Read_KL15_Voltage() <= (23500 - 800)) /*A2*/
         {
             if (LOW_VOLTAGE_TIME1 <= 3500)
                 LOW_VOLTAGE_TIME1++;
@@ -332,7 +332,7 @@ void Common_Input_Para(void)
             LOW_VOLTAGE_TIME1 = 0;
         }
 
-        if (RTE_Read_KL15_Voltage() >= 25000) /*A2*/
+        if (RTE_Read_KL15_Voltage() >= (25000 - 800)) /*A2*/
         {
             if (LOW_VOLTAGE_TIME2 <= 5000)
                 LOW_VOLTAGE_TIME2++;
@@ -344,7 +344,7 @@ void Common_Input_Para(void)
             LOW_VOLTAGE_TIME2 = 0;
         }
         //
-        if (RTE_Read_KL15_Voltage() >= 30400) /*A2*/
+        if (RTE_Read_KL15_Voltage() >= (30400 - 800)) /*A2*/
         {
             if (HIGH_VOLTAGE_TIME1 <= 3500)
                 HIGH_VOLTAGE_TIME1++;
@@ -356,7 +356,7 @@ void Common_Input_Para(void)
             HIGH_VOLTAGE_TIME1 = 0;
         }
 
-        if (RTE_Read_KL15_Voltage() <= 29400) /*A2*/
+        if (RTE_Read_KL15_Voltage() <= (29400 - 800)) /*A2*/
         {
             if (HIGH_VOLTAGE_TIME2 <= 5000)
                 HIGH_VOLTAGE_TIME2++;

source/Driver/Graphic/images.c

@@ -229,7 +229,7 @@ static const t_PicStruct Pic_Attribute[] =
     { /*CN_Alarm_drive_44_wenzi1_4   X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103E7680u },
     { /*CN_Alarm_drive_44_wenzi1_5   X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103EEBC0u },
     { /*CN_Alarm_drive_44_wenzi1_7   X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x103F6100u },
-    { /*CN_Alarm_drive_44_wenzi2   X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x103FD640u },
+    { /*CN_Alarm_drive_44_wenzi2   X390_Y276.png*/ 390u, 276u, 400u, 44u, ARGB8888, 0x103FD640u },
     { /*CN_Alarm_drive_44_wenzi2_1   X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x1040E940u },
     { /*CN_Alarm_drive_05_image   X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10415E80u },
     { /*CN_Alarm_drive_05_wenzi  X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1041CF00u },

source/System/tasks.c

@@ -260,7 +260,6 @@ void Sys_Exact_50us_Tasks(void)
         SEG_LCD_Window_Control_Service();
     }
     Buzzer_Play_ISR();
-    Data_Mileage_ISR();
 }
 /*============================================================================*/
 
@@ -274,7 +273,7 @@ void Sys_Exact_50us_Tasks(void)
 ------------------------------------------------------------------------------*/
 void Sys_Exact_100ms_Tasks(void)
 {
-    //Data_Mileage_ISR();
+    Data_Mileage_ISR();
     Service_OFF_Timing_Process();
     Fuel_User_KL15_OFF_Processing_Service();
 }