Merge branch 'wangyanan' into 'dev'

✨ feat:开放时钟设置二级菜单（可修改时间值）

See merge request !31

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -742,7 +742,7 @@ void AMT630H_GUI_Clock_Information(uint8_t Clock_Hour, uint8_t Clock_Min)
         else if(g_u8Language == EN)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0017_19_397);/*下方菜单*/
-            SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);/*返回*/
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0019_478_341);/*return*/
             SetPagePic(GRAPHICS_PAGE_0, Pic_0021_510_222);/* ： */
         }
          
@@ -767,13 +767,13 @@ void AMT630H_GUI_Clock_Information(uint8_t Clock_Hour, uint8_t Clock_Min)
         if(g_u8Language == CH)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0323_27_396);/*下方菜单*/
-            SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);/*返回*/
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);/*返回*/
             SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);/* ： */
         }
         else if(g_u8Language == EN)
         {
             SetPagePic(GRAPHICS_PAGE_0, Pic_0206_19_397);/*下方菜单*/
-            SetPagePic(GRAPHICS_PAGE_0, Pic_0324_489_338);/*返回*/
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0208_478_341);/*return*/
             SetPagePic(GRAPHICS_PAGE_0, Pic_0209_510_222);/* ： */
         }
         
@@ -1069,7 +1069,7 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
                     ;
                 }
                 /*Digital changes*/  
-                //Menu_Logic_Operation_Clock_Hour_Tenb_Set(Menu_Key_en_t enKeyType);
+                Menu_Logic_Operation_Clock_Hour_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
                 break;
             case MENU_ITEM_CLOCK_HOUR_BIT_SET:
                 /*Cursor blinking*/
@@ -1082,7 +1082,7 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
                     ;
                 }
                 /*Digital changes*/
-                //Menu_Logic_Operation_Clock_Hour_Bit_Set(Menu_Key_en_t enKeyType);
+                Menu_Logic_Operation_Clock_Hour_Bit_Set(MENU_KEY_CONFIRM_SHORT);
                 break;
             case MENU_ITEM_CLOCK_MIN_TENB_SET:
                 /*Cursor blinking*/
@@ -1095,7 +1095,7 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
                     ;
                 }
                 /*Digital changes*/
-                //Menu_Logic_Operation_Clock_Min_Tenb_Set(Menu_Key_en_t enKeyType);
+                Menu_Logic_Operation_Clock_Min_Tenb_Set(MENU_KEY_CONFIRM_SHORT);
                 break;
             case MENU_ITEM_CLOCK_MIN_BIT_SET:
                 /*Cursor blinking*/
@@ -1108,7 +1108,7 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
                     ;
                 }
                 /*Digital changes*/
-                //Menu_Logic_Operation_Clock_Min_Bit_Set(Menu_Key_en_t enKeyType);
+                Menu_Logic_Operation_Clock_Min_Bit_Set(MENU_KEY_CONFIRM_SHORT);
                 break;
             default:
                 break;
@@ -3403,7 +3403,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
             }
         }
     }
-    else if(g_u8Display_Mode == ModeDAY)
+    else if(g_u8Display_Mode == ModeNIGHT)
     {
         SetPagePic(GRAPHICS_PAGE_0, Pic_0685_48_272);
         SetPagePic(GRAPHICS_PAGE_0, Pic_0864_54_297);/*TRIP图标*/