Commit a67b7e92 authored by 王金亮's avatar 王金亮

🐞 fix:56521 【豪进7500TFT】【模式切换】由白天切换到夜间模式,偶发失败

是因为放在界面下判断的话,有时候会已经离开此界面,但是模式没调整过来,直接放在菜单函数下,切换界面的时候直接切换模式
parent ddce1c9e
...@@ -1478,15 +1478,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1478,15 +1478,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
SetPagePic(GRAPHICS_PAGE_0, Pic_0073_456_257); SetPagePic(GRAPHICS_PAGE_0, Pic_0073_456_257);
SetPagePic(GRAPHICS_PAGE_0, Pic_0074_422_103); SetPagePic(GRAPHICS_PAGE_0, Pic_0074_422_103);
} }
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1) // if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1)
{ // {
g_u8Display_Mode = ModeDAY; // g_u8Display_Mode = ModeDAY;
g_u8Display_Mode_select = ModeDAY; // g_u8Display_Mode_select = ModeDAY;
} // }
else // else
{ // {
; // ;
} // }
break; break;
case MENU_ITEM_SELECT_NIGHTTIME: case MENU_ITEM_SELECT_NIGHTTIME:
if(g_u8Language == CH)/*处于日间模式 进入显示模式设置 :中文 光标选中夜间模式*/ if(g_u8Language == CH)/*处于日间模式 进入显示模式设置 :中文 光标选中夜间模式*/
...@@ -1509,15 +1509,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1509,15 +1509,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
SetPagePic(GRAPHICS_PAGE_0, Pic_0077_414_234); SetPagePic(GRAPHICS_PAGE_0, Pic_0077_414_234);
SetPagePic(GRAPHICS_PAGE_0, Pic_0076_461_118); SetPagePic(GRAPHICS_PAGE_0, Pic_0076_461_118);
} }
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1) // if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1)
{ // {
g_u8Display_Mode = ModeNIGHT; // g_u8Display_Mode = ModeNIGHT;
g_u8Display_Mode_select = ModeNIGHT; // g_u8Display_Mode_select = ModeNIGHT;
} // }
else // else
{ // {
; // ;
} // }
break; break;
case MENU_ITEM_SELECT_AUTO: case MENU_ITEM_SELECT_AUTO:
if(g_u8Language == CH)/*处于日间模式 进入显示模式设置 :中文 光标选中自动模式*/ if(g_u8Language == CH)/*处于日间模式 进入显示模式设置 :中文 光标选中自动模式*/
...@@ -1541,7 +1541,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1541,7 +1541,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
} }
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1) if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1)
{ {
g_u8Display_Mode_select = ModeATUO; // g_u8Display_Mode_select = ModeATUO;
if(LightR_Status == 0) if(LightR_Status == 0)
{ {
g_u8Display_Mode = ModeNIGHT; g_u8Display_Mode = ModeNIGHT;
......
...@@ -57,7 +57,8 @@ extern uint8_t GET_Backlight(void); ...@@ -57,7 +57,8 @@ extern uint8_t GET_Backlight(void);
extern uint8_t g_u8Display_Mode;
extern uint8_t g_u8Display_Mode_select;
......
...@@ -202,6 +202,8 @@ void Menu_Logic_Operation_Select_Daytime(Menu_Key_en_t enKeyType) ...@@ -202,6 +202,8 @@ void Menu_Logic_Operation_Select_Daytime(Menu_Key_en_t enKeyType)
Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 1); Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 1);
Menu_Item_Select_Set(MENU_ITEM_SELECT_NIGHTTIME, 0); Menu_Item_Select_Set(MENU_ITEM_SELECT_NIGHTTIME, 0);
Menu_Item_Select_Set(MENU_ITEM_SELECT_AUTO, 0); Menu_Item_Select_Set(MENU_ITEM_SELECT_AUTO, 0);
g_u8Display_Mode = ModeDAY;
g_u8Display_Mode_select = ModeDAY;
} }
} }
...@@ -212,6 +214,8 @@ void Menu_Logic_Operation_Select_Nighttime(Menu_Key_en_t enKeyType) ...@@ -212,6 +214,8 @@ void Menu_Logic_Operation_Select_Nighttime(Menu_Key_en_t enKeyType)
Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 0); Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 0);
Menu_Item_Select_Set(MENU_ITEM_SELECT_NIGHTTIME, 1); Menu_Item_Select_Set(MENU_ITEM_SELECT_NIGHTTIME, 1);
Menu_Item_Select_Set(MENU_ITEM_SELECT_AUTO, 0); Menu_Item_Select_Set(MENU_ITEM_SELECT_AUTO, 0);
g_u8Display_Mode = ModeNIGHT;
g_u8Display_Mode_select = ModeNIGHT;
} }
} }
...@@ -222,6 +226,7 @@ void Menu_Logic_Operation_Select_Auto(Menu_Key_en_t enKeyType) ...@@ -222,6 +226,7 @@ void Menu_Logic_Operation_Select_Auto(Menu_Key_en_t enKeyType)
Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 0); Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 0);
Menu_Item_Select_Set(MENU_ITEM_SELECT_NIGHTTIME, 0); Menu_Item_Select_Set(MENU_ITEM_SELECT_NIGHTTIME, 0);
Menu_Item_Select_Set(MENU_ITEM_SELECT_AUTO, 1); Menu_Item_Select_Set(MENU_ITEM_SELECT_AUTO, 1);
g_u8Display_Mode_select = ModeATUO;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment