调整图片BUG,增加按键长按功能

source/Application/APP/Key/Key_user.h

@@ -2,9 +2,9 @@
 #define KEY_USER_H__
 
 
-
 extern void Key_KL30_Init_EXample(void);
 extern void Key_Wakeup_Init_EXample(void);
 
-
+void Menu_Key_Up_Dsp(void);
+void Menu_Key_Down_Dsp(void);
 #endif
\ No newline at end of file

source/Application/Graphic/GUI/GUI.h

@@ -17,8 +17,8 @@
 #define FState_COilTimeOutNum 60u /*3S*/
 
 #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10301)) /*硬件版本号   HV:01.02.02*/
-#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10003))   /*软件版本号   SV:01.01.05*/
-#define systemSupplierECUFlashInformationApp ((uint16_t)(2))          /*FLASH版本号 FV:00.14*/
+#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10004))   /*软件版本号   SV:01.01.05*/
+#define systemSupplierECUFlashInformationApp ((uint16_t)(6))          /*FLASH版本号 FV:00.14*/
 
 typedef struct
 {
@@ -312,7 +312,7 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable_En[] =
     {CN_Alarm_drive_33_image,    EN_Alarm_drive_33_wenzi2,    EN_Alarm_drive_33_wenzi1,   EN_Alarm_stop_36_wenzi1,     EN_Alarm_stop_36_wenzi2},   /*46.第七组 充电异常-请与五十铃公司联系*/
     {CN_Alarm_drive_55_image,    EN_Alarm_drive_55_wenzi1_1,  EN_Alarm_drive_55_wenzi1_2, EN_Alarm_drive_55_wenzi1_1,  EN_Alarm_stop_55_wenzi1_2}, /*47.      AMT異常-请联系经销商*/
     {CN_Alarm_drive_37_image,    EN_Alarm_drive_37_wenzi,     SpriteSize,                 EN_Alarm_drive_37_wenzi,     SpriteSize},                /*48.第八组 补充燃料-油箱单位*/
-    {CN_Alarm_drive_56_image,    EN_Alarm_drive_56_wenzi1,    SpriteSize,                 EN_Alarm_stop_56_wenzi1_1,   EN_Alarm_stop_56_wenzi1_2}, /*49.      AMT过热-选择合适的档位*/
+    {CN_Alarm_drive_56_image,    EN_Alarm_drive_56_wenzi1,    SpriteSize,                 EN_Alarm_stop_56_wenzi1_1,   EN_Alarm_stop_43_wenzi2  }, /*49.      AMT过热-选择合适的档位*/
     {CN_Alarm_drive_56_image,    EN_Alarm_drive_56_wenzi2,    SpriteSize,                 EN_Alarm_drive_56_wenzi2,    SpriteSize},                /*50.      AMT磨耗-离合器磨损*/
     {CN_Alarm_drive_33_image,    EN_Alarm_drive_39_wenzi1,    SpriteSize,                 EN_Alarm_drive_39_wenzi1,    SpriteSize},                /*51.      低电压报警*/
     {CN_Alarm_drive_33_image,    EN_Alarm_drive_39_wenzi2,    SpriteSize,                 EN_Alarm_drive_39_wenzi2,    SpriteSize},                /*52.      过电压报警*/

source/Application/Graphic/Menu/Menu.h

@@ -278,15 +278,15 @@ typedef struct
 
 typedef struct
 {
+    uint16_t Key_Menu_Popup_time;  /*报警状态持续时间*/
+    uint8_t Menu_Key_Time;         /*按键长按时间记录*/
+    uint8_t Key_Menu_Popup_Flag;   /*报警界面menu按键长按 */
+
     uint8_t Menu_Flag;             /*主界面标记*/
     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; /**/
@@ -297,6 +297,10 @@ typedef struct
     uint8_t Meun_Test_Dealer;      /*自我诊断模式进入经销商模式标记*/
     uint8_t Menu_StaFlag;          /**/
 
+    uint8_t Menu_Key_Up_Flag;
+    uint8_t Menu_Key_Down_Flag;
+    uint16_t  reserve;            /*预留*/
+
 } _MenuFlag;
 
 EXTERN_MEU_PROCESS _MenuFlag MenuFlag;

source/Application/Sound_Alarm/Sound_List.h

@@ -77,7 +77,7 @@ static const SoundAttributeStruct SoundList[SND_INDEX_MAX] =
     -------------------------------------------------------------------------------------*/
     {/*00  SND_Key_Notremoved  */ SND_SRC_Key_Notremoved   ,   SND_TYPE_NORMAL, },
     {/*    SND_LDWS            */ SND_SRC_LDWS             ,   SND_TYPE_NORMAL, },
-    {/*    SND_Collision_Level1*/ SND_SRC_Collision_L1     ,   SND_TYPE_NORMAL, },
+    {/*    SND_Collision_Level1*/ SND_SRC_Collision_L1     ,   SND_TYPE_MULTI, },
     {/*    SND_Collision_Level2*/ SND_SRC_Collision_L2     ,   SND_TYPE_NORMAL, },
     {/*    SND_Collision_Level3*/ SND_SRC_Collision_L3     ,   SND_TYPE_NORMAL, },
     {/*01  SND_Braking         */ SND_SRC_Braking          ,   SND_TYPE_NORMAL, },
@@ -93,13 +93,13 @@ static const SoundAttributeStruct SoundList[SND_INDEX_MAX] =
     {/*11  SND_DS_SPEED        */ SND_SRC_DS_SPEED         ,   SND_TYPE_NORMAL, },
     {/*12  SND_ROWS_SPEED      */ SND_SRC_ROWS_SPEED       ,   SND_TYPE_NORMAL, },
     {/*13  SND_Roll_SPEED      */ SND_SRC_Roll_SPEED       ,   SND_TYPE_NORMAL, },
-    {/*14  SND_EVSC_SPEED      */ SND_SRC_EVSC_SPEED       ,   SND_TYPE_NORMAL, },
+    {/*14  SND_EVSC_SPEED      */ SND_SRC_EVSC_SPEED       ,   SND_TYPE_MULTI, },
     {/*15  SND_DPD_SPEED1      */ SND_SRC_DPD_SPEED1       ,   SND_TYPE_NORMAL, },
     {/*15  SND_DPD_SPEED2      */ SND_SRC_DPD_SPEED2       ,   SND_TYPE_NORMAL, },
     {/*15  SND_DPD_SPEED4      */ SND_SRC_DPD_SPEED4       ,   SND_TYPE_NORMAL, },
     {/*16  SND_NEES            */ SND_SRC_NEES             ,   SND_TYPE_NORMAL, },
     {/*17  SND_ECO_STOP        */ SND_SRC_ECO_STOP         ,   SND_TYPE_NORMAL, },
-    {/*18  SND_Cyclone_High4HZ */ SND_SRC_Cyclone_High4HZ  ,   SND_TYPE_NORMAL, },
+    {/*18  SND_Cyclone_High4HZ */ SND_SRC_Cyclone_High4HZ  ,   SND_TYPE_MULTI, },
     {/*18  SND_Cyclone_High0_5 */ SND_SRC_Cyclone_High0_5  ,   SND_TYPE_NORMAL, },
     {/*19  SND_SEATBELT_SPEED  */ SND_SRC_SEATBELT_SPEED   ,   SND_TYPE_NORMAL, },
     {/*20  SND_Fuel_Saving     */ SND_SRC_Fuel_Saving      ,   SND_TYPE_NORMAL, },

source/Application/Sound_Alarm/Sound_Source.h

@@ -103,13 +103,13 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
     {/*11 SND_SRC_DS_SPEED        */  0x00u,   12,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,   1000u,   },/*11       DS 警报   */
     {/*12 SND_SRC_ROWS_SPEED      */  0x00u,   13,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,   1000u,   },/*12       ROWS 警报 */
     {/*13 SND_SRC_Roll_SPEED      */  0x00u,   14,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,   1000u,   },/*13       Roll 警报 */
-    {/*14 SND_SRC_EVSC_SPEED      */  0x01u,   15,   SND_CYCLE_NONSTOP,  SND_MODE_LOOP  ,    250u,   },/*14 4HZ 2 EVSC */
+    {/*14 SND_SRC_EVSC_SPEED      */  0x01u,   15,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,    250u,   },/*14 4HZ 2 EVSC */
     {/*15 SND_SRC_DPD_SPEED       */  0x03u,   16,                   3,  SND_MODE_SINGLE,   1000u,   },/*15 1HZ 4 DPD 手动再生 */
     {/*15 SND_SRC_DPD_SPEED       */  0x03u,   16,                   3,  SND_MODE_SINGLE,    500u,   },/*15 2HZ 4 DPD 手动再生 */
     {/*15 SND_SRC_DPD_SPEED       */  0x03u,   16,                   3,  SND_MODE_SINGLE,    250u,   },/*15 4HZ 4 DPD 手动再生 */
     {/*16 SND_SRC_NEES            */  0x00u,   17,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,   1000u,   },/*16       NEES */
     {/*17 SND_SRC_ECO_STOP        */  0x00u,   18,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,   1000u,   },/*17       eco stop */
-    {/*18 SND_SRC_Cyclone_High    */  0x03u,   19,   SND_CYCLE_NONSTOP,  SND_MODE_LOOP  ,    250u,   },/*18 4HZ   4 气悬车高调整 */
+    {/*18 SND_SRC_Cyclone_High    */  0x03u,   19,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,    250u,   },/*18 4HZ   4 气悬车高调整 */
     {/*18 SND_SRC_Cyclone_High    */  0x03u,   19,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,   2000u,   },/*18 0.5HZ 4 气悬车高调整 */
     {/*19 SND_SRC_SEATBELT_SPEED  */  0x02u,   20,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,    500u,   },/*19 2HZ   3 安全带 */
     {/*20 SND_SRC_Fuel_Saving     */  0x03u,   21,   SND_CYCLE_NONSTOP,  SND_MODE_SINGLE,   1000u,   },/*20 1HZ   4 省油耗建议 */

source/System/tasks.c

@@ -93,6 +93,7 @@
 
 #include "UART.h"
 #include "GenDelay.h"
+#include "Key_user.h"
 
 static uint32_t K_Line1ms_count;
 extern uint8_t BackOdoFlagSta;
@@ -281,6 +282,9 @@ void Sys_Run_Mode_100ms_Tasks(void)
     Drive_Info_Speed1_Plus_Conversion();
     Drive_Info_Speed2_Plus_Conversion();
 
+    Menu_Key_Up_Dsp();
+    Menu_Key_Down_Dsp();
+
     //YZHD_Count++;
     //if (YZHD_Count == 20)
     //{