调整界面

ghs/project.siz

 project          .intvect            1536
-project          .text             314684
-project          .rodata           410775
+project          .text             315628
+project          .rodata           410791
 project          .secinfo             120
 project          .syscall               6
 project          .romdata            9029

source/Application/APP/Key/Key.h

@@ -3,6 +3,9 @@
 
 #include "TYW_stdint.h"
 
+#define K_Line_User_RYLQQ       100
+#define K_Line_User_KQGZJ       100
+
 /*
 说明：
 1、按键类型分为两类：

source/Application/APP/Key/Key_user.c

@@ -15,8 +15,6 @@
 /*无车速限制值*/
 #define DISPSPEEDNULLMAX   66
 
-#define K_Line_User_RYLQQ       100
-#define K_Line_User_KQGZJ       100
 /*----------按键具体功能执行的回调函数-----------------------*/
 
 

source/Application/Graphic/GUI/GUI.h

@@ -170,6 +170,8 @@ static const uint16_t GUI_TPMS_MIC2_X[4] = {329u, 404u, 510u, 574u};
 static const uint16_t GUI_REP1_X[6] = {582u, 565u, 547u, 521u, 503u, 485u};
 static const uint16_t GUI_REP_X[4] = {582u, 565u, 547u, 521u};
 static const uint16_t GUI_SETREP_X[6] = {520u, 503u, 485u, 458u, 441u, 424u};
+static const uint16_t GUI_SYSSET_X[4] = {520u, 503u, 485u, 468u};
+static const uint16_t GUI_SYSSPEED[2] = {485u, 468u};
 
 static const uint16_t GUIUsetSetYPos[2] = {304u, 282u};
 static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u};
@@ -283,6 +285,9 @@ void GUI_BG_UserSet_SYSD_5_Display(uint8_t Mode);      /**/
 void GUI_BG_UserSet_SYSD_6_Display(uint8_t Mode);      /**/
 void GUI_BG_UserSet_SYSD_7_Display(uint8_t Mode);      /**/
 void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode);     /**/
+void GUI_BG_UserSet_SYSD_GSL_Display(uint8_t Mode);     /**/
+void GUI_BG_UserSet_SYSD_Ybl_Display(uint8_t Mode);  /**/
+void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode); /**/
 
 void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
 

source/Application/Graphic/Menu/Menu_user.c

@@ -1086,14 +1086,24 @@ void Level3_5Menu_4Exit(void)
 /*省油建议设定*/
 /*速度设定-高速路子菜单*/
 void Level4_4Menu_1Enter(void)
-{}
+{
+    User_set_Num.User_Gsl = User_App.User_Gsl ;
+}
 void Level4_4Menu_1Do(void)
 {
     GUI_OftenShow_Display();
     GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_UserSet_SYSD_GSL_Display(GUI_DISP_MODE_NORMAL);
 }
 void Level4_4Menu_1Exit(void)
-{}
+{
+    if (MenuFlag.Menu_Return)
+    {
+        User_App.User_Gsl = User_set_Num.User_Gsl ;
+
+        MenuFlag.Menu_Return = 0;
+    }
+}
 
 /*速度设定-一般路子菜单*/
 void Level4_4Menu_2Enter(void)
@@ -1102,6 +1112,7 @@ void Level4_4Menu_2Do(void)
 {
     GUI_OftenShow_Display();
     GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_UserSet_SYSD_Ybl_Display(GUI_DISP_MODE_NORMAL);
 }
 void Level4_4Menu_2Exit(void)
 {}
@@ -1113,6 +1124,7 @@ void Level4_4Menu_3Do(void)
 {
     GUI_OftenShow_Display();
     GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_UserSet_SYSD_Speed_Display(GUI_DISP_MODE_NORMAL);
 }
 void Level4_4Menu_3Exit(void)
 {}