增加中英文切换功能

source/Application/Graphic/GUI/GUI.c

@@ -97,46 +97,46 @@ static const uint16_t GUIMenuDisplayInit[2][120] =
         /*117*/CN_User_Menu3_03_24black, SpriteSize,              CN_User_Menu3_03_24white, /*省油建议--辅助驻车接触设定*/
     },
     {
-        /*  0*/CN_User_Menu1_01black,    CN_User_Menu1_01grey,    CN_User_Menu1_01white,    /*一级菜单--故障码*/
-        /*  3*/CN_User_Menu1_02black,    CN_User_Menu1_02grey,    CN_User_Menu1_02white,    /*一级菜单--保养通知*/
-        /*  6*/CN_User_Menu1_03black,    CN_User_Menu1_03grey,    CN_User_Menu1_03white,    /*一级菜单--保养通知设定*/
-        /*  9*/CN_User_Menu1_04black,    CN_User_Menu1_04grey,    CN_User_Menu1_04white,    /*一级菜单--用户设定*/
-        /* 12*/CN_User_Menu1_05black,    CN_User_Menu1_05grey,    CN_User_Menu1_05white,    /*一级菜单--系统延时模式*/
-        /* 15*/CN_User_Menu1_06black,    CN_User_Menu1_06grey,    CN_User_Menu1_06white,    /*一级菜单--轮胎状态显示*/
-        /* 18*/CN_User_Menu2_02_1black,  CN_User_Menu2_02_1grey,  CN_User_Menu2_02_1white,  /*保养通知--发动机&滤清器*/
-        /* 21*/CN_User_Menu2_02_2black,  CN_User_Menu2_02_2grey,  CN_User_Menu2_02_2white,  /*保养通知--燃油滤清器*/
-        /* 24*/CN_User_Menu2_02_3black,  CN_User_Menu2_02_3grey,  CN_User_Menu2_02_3white,  /*保养通知--变速箱油*/
-        /* 27*/CN_User_Menu2_02_4black,  CN_User_Menu2_02_4grey,  CN_User_Menu2_02_4white,  /*保养通知--差速器油*/
-        /* 30*/CN_User_Menu2_02_6black,  CN_User_Menu2_02_6grey,  CN_User_Menu2_02_6white,  /*保养通知--动力转向油*/
-        /* 33*/CN_User_Menu2_02_7black,  CN_User_Menu2_02_7grey,  CN_User_Menu2_02_7white,  /*保养通知--轮胎*/
-        /* 36*/CN_User_Menu2_03_01black, CN_User_Menu2_03_01grey, CN_User_Menu2_03_01white, /*通知设定--更换机油&机油滤清器*/
-        /* 39*/CN_User_Menu2_03_02black, CN_User_Menu2_03_02grey, CN_User_Menu2_03_02white, /*通知设定--更换燃油滤清器*/
-        /* 42*/CN_User_Menu2_03_03black, CN_User_Menu2_03_03grey, CN_User_Menu2_03_03white, /*通知设定--更换变速箱油*/
-        /* 45*/CN_User_Menu2_03_04black, CN_User_Menu2_03_04grey, CN_User_Menu2_03_04white, /*通知设定--更换差速器油*/
-        /* 48*/CN_User_Menu2_03_06black, CN_User_Menu2_03_06grey, CN_User_Menu2_03_06white, /*通知设定--更换动力转向液*/
-        /* 51*/CN_User_Menu2_03_07black, CN_User_Menu2_03_07grey, CN_User_Menu2_03_07white, /*通知设定--轮胎换位更换*/
-        /* 54*/CN_User_Menu2_04_9black,  CN_User_Menu2_04_9grey,  CN_User_Menu2_04_9white,  /*用户设定--亮度调节*/
-        /* 57*/CN_User_Menu2_04_7black,  CN_User_Menu2_04_7grey,  CN_User_Menu2_04_7white,  /*用户设定--语言设定*/
-        /* 60*/CN_User_Menu2_04_4black,  CN_User_Menu2_04_4grey,  CN_User_Menu2_04_4white,  /*用户设定--省油费建议设定*/
-        /* 63*/CN_User_Menu2_04_10black, CN_User_Menu2_04_10grey, CN_User_Menu2_04_10white, /*用户设定--TPMS轮胎设定*/
-        /* 66*/CN_User_Menu2_04_3black,  CN_User_Menu2_04_3grey,  CN_User_Menu2_04_3white,  /*用户设定--显示设定*/
-        /* 69*/CN_User_Menu2_05_1black,  CN_User_Menu2_05_1grey,  CN_User_Menu2_05_1white,  /*系统延时--LDWS警报演示*/
-        /* 72*/CN_User_Menu2_05_2black,  CN_User_Menu2_05_2grey,  CN_User_Menu2_05_2white,  /*系统延时--AEBS第1警报演示*/
-        /* 75*/CN_User_Menu2_05_3black,  CN_User_Menu2_05_3grey,  CN_User_Menu2_05_3white,  /*系统延时--AEBS第2警报演示*/
-        /* 78*/CN_User_Menu2_05_4black,  CN_User_Menu2_05_4grey,  CN_User_Menu2_05_4white,  /*系统延时--AEBS全力制动警报演示*/
-        /* 81*/CN_User_Menu1_13black,    CN_User_Menu1_13grey,    CN_User_Menu1_13white,    /*故障码--发动机故障码查询*/
-        /* 84*/CN_User_Menu1_14black,    CN_User_Menu1_14grey,    CN_User_Menu1_14white,    /*故障码--刹车故障码查询*/
-        /* 87*/CN_User_Menu1_15black,    CN_User_Menu1_15grey,    CN_User_Menu1_15white,    /*故障码--变速箱故障码查询*/
-        /* 90*/CN_User_Menu1_16black,    CN_User_Menu1_16grey,    CN_User_Menu1_16white,    /*故障码--雷达故障码查询*/
-        /* 93*/CN_User_Menu1_17black,    CN_User_Menu1_17grey,    CN_User_Menu1_17white,    /*故障码--摄像头故障码查询*/
-        /* 96*/CN_User_Menu1_18black,    CN_User_Menu1_18grey,    CN_User_Menu1_18white,    /*故障码--液力缓速器故障码查询*/
-        /* 99*/CN_User_Menu3_03_7black,  SpriteSize,              CN_User_Menu3_03_7white,  /*省油建议--速度设定-高速路*/
-        /*102*/CN_User_Menu3_03_8black,  SpriteSize,              CN_User_Menu3_03_8white,  /*省油建议--速度设定-一般路*/
-        /*105*/CN_User_Menu3_03_9black,  SpriteSize,              CN_User_Menu3_03_9white,  /*省油建议--发动机转速设定*/
-        /*108*/CN_User_Menu3_03_10black, SpriteSize,              CN_User_Menu3_03_10white, /*省油建议--急加速设定*/
-        /*111*/CN_User_Menu3_03_11black, SpriteSize,              CN_User_Menu3_03_11white, /*省油建议--急减速设定*/
-        /*114*/CN_User_Menu3_03_23black, SpriteSize,              CN_User_Menu3_03_23white, /*省油建议--产时间怠速设定*/
-        /*117*/CN_User_Menu3_03_24black, SpriteSize,              CN_User_Menu3_03_24white, /*省油建议--辅助驻车接触设定*/
+        CN_User_Menu1_01black,    CN_User_Menu1_01grey,    CN_User_Menu1_01white,    /*一级菜单--故障码*/
+        CN_User_Menu1_02black,    CN_User_Menu1_02grey,    CN_User_Menu1_02white,    /*一级菜单--保养通知*/
+        CN_User_Menu1_03black,    CN_User_Menu1_03grey,    CN_User_Menu1_03white,    /*一级菜单--保养通知设定*/
+        CN_User_Menu1_04black,    CN_User_Menu1_04grey,    CN_User_Menu1_04white,    /*一级菜单--用户设定*/
+        CN_User_Menu1_05black,    CN_User_Menu1_05grey,    CN_User_Menu1_05white,    /*一级菜单--系统延时模式*/
+        CN_User_Menu1_06black,    CN_User_Menu1_06grey,    CN_User_Menu1_06white,    /*一级菜单--轮胎状态显示*/
+        CN_User_Menu2_02_1black,  CN_User_Menu2_02_1grey,  CN_User_Menu2_02_1white,  /*保养通知--发动机&滤清器*/
+        CN_User_Menu2_02_2black,  CN_User_Menu2_02_2grey,  CN_User_Menu2_02_2white,  /*保养通知--燃油滤清器*/
+        CN_User_Menu2_02_3black,  CN_User_Menu2_02_3grey,  CN_User_Menu2_02_3white,  /*保养通知--变速箱油*/
+        CN_User_Menu2_02_4black,  CN_User_Menu2_02_4grey,  CN_User_Menu2_02_4white,  /*保养通知--差速器油*/
+        CN_User_Menu2_02_6black,  CN_User_Menu2_02_6grey,  CN_User_Menu2_02_6white,  /*保养通知--动力转向油*/
+        CN_User_Menu2_02_7black,  CN_User_Menu2_02_7grey,  CN_User_Menu2_02_7white,  /*保养通知--轮胎*/
+        CN_User_Menu2_03_01black, CN_User_Menu2_03_01grey, CN_User_Menu2_03_01white, /*通知设定--更换机油&机油滤清器*/
+        CN_User_Menu2_03_02black, CN_User_Menu2_03_02grey, CN_User_Menu2_03_02white, /*通知设定--更换燃油滤清器*/
+        CN_User_Menu2_03_03black, CN_User_Menu2_03_03grey, CN_User_Menu2_03_03white, /*通知设定--更换变速箱油*/
+        CN_User_Menu2_03_04black, CN_User_Menu2_03_04grey, CN_User_Menu2_03_04white, /*通知设定--更换差速器油*/
+        CN_User_Menu2_03_06black, CN_User_Menu2_03_06grey, CN_User_Menu2_03_06white, /*通知设定--更换动力转向液*/
+        CN_User_Menu2_03_07black, CN_User_Menu2_03_07grey, CN_User_Menu2_03_07white, /*通知设定--轮胎换位更换*/
+        CN_User_Menu2_04_9black,  CN_User_Menu2_04_9grey,  CN_User_Menu2_04_9white,  /*用户设定--亮度调节*/
+        CN_User_Menu2_04_7black,  CN_User_Menu2_04_7grey,  CN_User_Menu2_04_7white,  /*用户设定--语言设定*/
+        CN_User_Menu2_04_4black,  CN_User_Menu2_04_4grey,  CN_User_Menu2_04_4white,  /*用户设定--省油费建议设定*/
+        CN_User_Menu2_04_10black, CN_User_Menu2_04_10grey, CN_User_Menu2_04_10white, /*用户设定--TPMS轮胎设定*/
+        CN_User_Menu2_04_3black,  CN_User_Menu2_04_3grey,  CN_User_Menu2_04_3white,  /*用户设定--显示设定*/
+        CN_User_Menu2_05_1black,  CN_User_Menu2_05_1grey,  CN_User_Menu2_05_1white,  /*系统延时--LDWS警报演示*/
+        CN_User_Menu2_05_2black,  CN_User_Menu2_05_2grey,  CN_User_Menu2_05_2white,  /*系统延时--AEBS第1警报演示*/
+        CN_User_Menu2_05_3black,  CN_User_Menu2_05_3grey,  CN_User_Menu2_05_3white,  /*系统延时--AEBS第2警报演示*/
+        CN_User_Menu2_05_4black,  CN_User_Menu2_05_4grey,  CN_User_Menu2_05_4white,  /*系统延时--AEBS全力制动警报演示*/
+        CN_User_Menu1_13black,    CN_User_Menu1_13grey,    CN_User_Menu1_13white,    /*故障码--发动机故障码查询*/
+        CN_User_Menu1_14black,    CN_User_Menu1_14grey,    CN_User_Menu1_14white,    /*故障码--刹车故障码查询*/
+        CN_User_Menu1_15black,    CN_User_Menu1_15grey,    CN_User_Menu1_15white,    /*故障码--变速箱故障码查询*/
+        CN_User_Menu1_16black,    CN_User_Menu1_16grey,    CN_User_Menu1_16white,    /*故障码--雷达故障码查询*/
+        CN_User_Menu1_17black,    CN_User_Menu1_17grey,    CN_User_Menu1_17white,    /*故障码--摄像头故障码查询*/
+        CN_User_Menu1_18black,    CN_User_Menu1_18grey,    CN_User_Menu1_18white,    /*故障码--液力缓速器故障码查询*/
+        CN_User_Menu3_03_7black,  SpriteSize,              CN_User_Menu3_03_7white,  /*省油建议--速度设定-高速路*/
+        CN_User_Menu3_03_8black,  SpriteSize,              CN_User_Menu3_03_8white,  /*省油建议--速度设定-一般路*/
+        CN_User_Menu3_03_9black,  SpriteSize,              CN_User_Menu3_03_9white,  /*省油建议--发动机转速设定*/
+        CN_User_Menu3_03_10black, SpriteSize,              CN_User_Menu3_03_10white, /*省油建议--急加速设定*/
+        CN_User_Menu3_03_11black, SpriteSize,              CN_User_Menu3_03_11white, /*省油建议--急减速设定*/
+        CN_User_Menu3_03_23black, SpriteSize,              CN_User_Menu3_03_23white, /*省油建议--产时间怠速设定*/
+        CN_User_Menu3_03_24black, SpriteSize,              CN_User_Menu3_03_24white, /*省油建议--辅助驻车接触设定*/
 
     },
 };
@@ -700,7 +700,6 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
             /*EBS Yellow指示灯*/
             EBSWarning_State = Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
 
-
             if (((EBSLamp_State == 0x01u) || (CanStatus2 == CAN_SIG_LOST)) && (K_Line_Set.K_Line_LID21 == 0x01u))
             {
                 GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_02_1, 21u, GUI_DISP_LEMPY[1u], GUI_BLENDMODE_SRC_OVER);
@@ -2619,7 +2618,15 @@ void GUI_BG_Rep_Menu_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
@@ -2871,7 +2878,15 @@ void GUI_BG_RepSet_Menu_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu2_03_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu2_03_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
@@ -3106,7 +3121,15 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu2_04_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu2_04_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
@@ -3366,7 +3389,15 @@ void GUI_BG_Demo_Menu_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu2_05_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu2_05_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
@@ -3522,7 +3553,15 @@ void GUI_BG_Multiframe_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
@@ -3709,7 +3748,15 @@ void GUI_BG_DTCReading_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);         /*长度条*/
 
@@ -4387,7 +4434,15 @@ void GUI_BG_RepMenu_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
         GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_km, GUI_BLENDMODE_SRC_OVER);    /*KM*/
 
@@ -4958,10 +5013,17 @@ void GUI_BG_RepMenuSet_Menu_Display(uint8_t Mode)
 {
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
-        GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
-        GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_kuang, GUI_BLENDMODE_SRC_OVER); /*框*/
-        GUI_General_Display(MENU_Sprite, CN_white_queding, GUI_BLENDMODE_SRC_OVER);       /*ENTER*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+            GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_02_kuang, GUI_BLENDMODE_SRC_OVER); /*框*/
+            GUI_General_Display(MENU_Sprite, CN_white_queding, GUI_BLENDMODE_SRC_OVER);       /*ENTER*/
+        }
+        else  if (User_App.User_Language == Language_En)
+        {
+
+        }
     }
     else
     {
@@ -5312,40 +5374,47 @@ void GUI_BG_UserSet_Date_Display(uint8_t Mode)
         MOnth_Value = User_set_Num.Month;
         Data_Value = User_set_Num.Date;
 
-        GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_yue, GUI_BLENDMODE_SRC_OVER);  /*月*/
-        GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_ri, GUI_BLENDMODE_SRC_OVER);   /*日*/
-
-        switch (bCurMenuIDX)
+        if (User_App.User_Language == Language_Cn)
         {
-        case _MN_DSP_LEVEL3_4_MENU_11:
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 329u, 214u, GUI_BLENDMODE_SRC_OVER);
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 434u, 214u, GUI_BLENDMODE_SRC_OVER);
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER);
-            break;
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_yue, GUI_BLENDMODE_SRC_OVER);  /*月*/
+            GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_ri, GUI_BLENDMODE_SRC_OVER);   /*日*/
 
-        case _MN_DSP_LEVEL3_4_MENU_12:
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 329u, 214u, GUI_BLENDMODE_SRC_OVER);
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 434u, 214u, GUI_BLENDMODE_SRC_OVER);
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER);
-            break;
+            switch (bCurMenuIDX)
+            {
+            case _MN_DSP_LEVEL3_4_MENU_11:
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 329u, 214u, GUI_BLENDMODE_SRC_OVER);
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 434u, 214u, GUI_BLENDMODE_SRC_OVER);
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER);
+                break;
 
-        case _MN_DSP_LEVEL3_4_MENU_13:
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 329u, 214u, GUI_BLENDMODE_SRC_OVER);
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 434u, 214u, GUI_BLENDMODE_SRC_OVER);
-            GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER);
-            break;
+            case _MN_DSP_LEVEL3_4_MENU_12:
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 329u, 214u, GUI_BLENDMODE_SRC_OVER);
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 434u, 214u, GUI_BLENDMODE_SRC_OVER);
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER);
+                break;
 
-        default:
-            break;
-        }
+            case _MN_DSP_LEVEL3_4_MENU_13:
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 329u, 214u, GUI_BLENDMODE_SRC_OVER);
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 434u, 214u, GUI_BLENDMODE_SRC_OVER);
+                GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 541u, 214u, GUI_BLENDMODE_SRC_OVER);
+                break;
 
-        GUI_General_Digit_Display(MENU_Sprite, 20u, Nb_20_0, 2u, 0u, GUIUsetSetYPos, 226u, GUI_BLENDMODE_SRC_OVER);
-        GUI_General_Digit_Display(MENU_Sprite, YEAR_Value, Nb_20_0, 2u, 0u, GUIUsetSetYPosX, 226u, GUI_BLENDMODE_SRC_OVER);
+            default:
+                break;
+            }
 
-        GUI_General_Digit_Display(MENU_Sprite, MOnth_Value, Nb_20_0, 2u, 0u, GUIUsetSetMPosX, 226u, GUI_BLENDMODE_SRC_OVER);
+            GUI_General_Digit_Display(MENU_Sprite, 20u, Nb_20_0, 2u, 0u, GUIUsetSetYPos, 226u, GUI_BLENDMODE_SRC_OVER);
+            GUI_General_Digit_Display(MENU_Sprite, YEAR_Value, Nb_20_0, 2u, 0u, GUIUsetSetYPosX, 226u, GUI_BLENDMODE_SRC_OVER);
 
-        GUI_General_Digit_Display(MENU_Sprite, Data_Value, Nb_20_0, 2u, 0u, GUIUsetSetDPosX, 226u, GUI_BLENDMODE_SRC_OVER);
+            GUI_General_Digit_Display(MENU_Sprite, MOnth_Value, Nb_20_0, 2u, 0u, GUIUsetSetMPosX, 226u, GUI_BLENDMODE_SRC_OVER);
+
+            GUI_General_Digit_Display(MENU_Sprite, Data_Value, Nb_20_0, 2u, 0u, GUIUsetSetDPosX, 226u, GUI_BLENDMODE_SRC_OVER);
+        }
+        else  if (User_App.User_Language == Language_En)
+        {
+
+        }
     }
     else
     {
@@ -6723,17 +6792,24 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode)
         GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
 
-        if (State_Flag.ENTER_RETURN == 0u)
+        if (User_App.User_Language == Language_Cn)
         {
-            GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_10, GUI_BLENDMODE_SRC_OVER);
-            GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
-            GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
+            if (State_Flag.ENTER_RETURN == 0u)
+            {
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_10, GUI_BLENDMODE_SRC_OVER);
+                GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
+                GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
+            }
+            else
+            {
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_11, GUI_BLENDMODE_SRC_OVER);
+                GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
+                GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
+            }
         }
-        else
+        else if (User_App.User_Language == Language_En)
         {
-            GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_11, GUI_BLENDMODE_SRC_OVER);
-            GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
-            GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
+
         }
     }
     else
@@ -7051,7 +7127,14 @@ void GUI_FacMenu_Display(uint8_t Mode)
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);        /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);      /*长度条*/
 
-        GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_06_1black, GUI_BLENDMODE_SRC_OVER);
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_06_1black, GUI_BLENDMODE_SRC_OVER);
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+            GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_06_1black, GUI_BLENDMODE_SRC_OVER);
+        }
     }
     else
     {
@@ -7072,7 +7155,15 @@ void GUI_BG_FacMenu_Display(uint8_t Mode)
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*显示*/
-        GUI_General_Display(MENU_Sprite, CN_Fty_Menu1_wenzi, GUI_BLENDMODE_SRC_OVER);  /*menu*/
+        if (User_App.User_Language == Language_Cn)
+        {
+            GUI_General_Display(MENU_Sprite, CN_Fty_Menu1_wenzi, GUI_BLENDMODE_SRC_OVER);  /*menu*/
+        }
+        else if (User_App.User_Language == Language_En)
+        {
+            GUI_General_Display(MENU_Sprite, CN_Fty_Menu1_wenzi, GUI_BLENDMODE_SRC_OVER);  /*menu*/
+        }
+
         GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);        /*line*/
         GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER);      /*长度条*/
 

source/Application/Graphic/GUI/GUI.h

@@ -260,17 +260,17 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
     {CN_Alarm_drive_44_image,    CN_Alarm_drive_44_wenzi2_1,  CN_Alarm_drive_44_wenzi2,   CN_Alarm_drive_44_wenzi2_1,  CN_Alarm_drive_44_wenzi2},  /*67.      更换轮胎・轮胎位置*/
 };
 
-static const uint32_t GUIWedk_Cn[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu};
-static const uint32_t GUIWedk_En[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu};
-static const uint32_t GUIMenuWedk[7u] = {CN_ri, CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat};
-static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6,
+static const uint16_t GUIWedk_Cn[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu};
+static const uint16_t GUIWedk_En[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu};
+static const uint16_t GUIMenuWedk[7u] = {CN_ri, CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat};
+static const uint16_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6,
                                       CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12
                                      };
-static const uint32_t GUIMETERY[5u] = {Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, CN_Fty_Menu2_08_A};
-static const uint32_t GUIMETERYNUM[16u] = {Nb_15_0, Nb_15_1, Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, Nb_15_6, Nb_15_7,
+static const uint16_t GUIMETERY[5u] = {Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, CN_Fty_Menu2_08_A};
+static const uint16_t GUIMETERYNUM[16u] = {Nb_15_0, Nb_15_1, Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, Nb_15_6, Nb_15_7,
                                            Nb_15_8, Nb_15_9, CN_Fty_Menu2_08_A, CN_Fty_Menu2_08_B, CN_Fty_Menu2_08_C, CN_Fty_Menu2_08_D, CN_Fty_Menu2_08_E, CN_Fty_Menu2_08_F
                                           };
-static const uint32_t GUIDTCNUM[16u] = {CN_Nb_28_0, CN_Nb_28_1, CN_Nb_28_2, CN_Nb_28_3, CN_Nb_28_4, CN_Nb_28_5, CN_Nb_28_6, CN_Nb_28_7, CN_Nb_28_8, CN_Nb_28_9,
+static const uint16_t GUIDTCNUM[16u] = {CN_Nb_28_0, CN_Nb_28_1, CN_Nb_28_2, CN_Nb_28_3, CN_Nb_28_4, CN_Nb_28_5, CN_Nb_28_6, CN_Nb_28_7, CN_Nb_28_8, CN_Nb_28_9,
                                         CN_Alarm_Fault_A, CN_Alarm_Fault_B, CN_Alarm_Fault_C, CN_Alarm_Fault_D, CN_Alarm_Fault_E, CN_Alarm_Fault_F
                                        };
 

source/Application/K_BUS/kwp2000_service.c

@@ -533,7 +533,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
         case 0x49: /* 辅助驻车 */
             K_Line_Set.K_Line_LID49 = RequestData[2];
             User_App.User_Parking   = K_Line_Set.K_Line_LID49;
-                                      (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
+            (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x49;
             Tx_Len = 2;
             DTCstatusCHGFFK_Line = 1;