界面切换BUG修复
This commit is contained in:
parent
5463828f53
commit
4fc90961e3
|
@ -390,12 +390,13 @@ void scr_modbus_config_recover(void)
|
||||||
void scr_modbus_trx_recover(void)
|
void scr_modbus_trx_recover(void)
|
||||||
{
|
{
|
||||||
//清空数据、发送、接收框
|
//清空数据、发送、接收框
|
||||||
lv_label_set_text(guider_ui.screen_modbus_display_label_Data,"");
|
lv_label_set_text(guider_ui.screen_modbus_display_value_Data,"");
|
||||||
lv_label_set_text(guider_ui.screen_modbus_display_label_Tx,"");
|
lv_label_set_text(guider_ui.screen_modbus_display_value_Tx,"");
|
||||||
lv_label_set_text(guider_ui.screen_modbus_display_label_Rx,"");
|
lv_label_set_text(guider_ui.screen_modbus_display_value_Rx,"");
|
||||||
|
|
||||||
mod_mas_trx_cursor = MOD_TRX_PREVIOUS;
|
mod_mas_trx_cursor = MOD_TRX_PREVIOUS;
|
||||||
mod_mas_trx_cursor_prv = MOD_TRX_NONE;
|
mod_mas_trx_cursor_prv = MOD_TRX_NONE;
|
||||||
|
trx_items_check(mod_mas_trx_cursor, mod_mas_trx_cursor_prv);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t trx_focus_cnt = 0;
|
uint8_t trx_focus_cnt = 0;
|
||||||
|
@ -635,6 +636,7 @@ void key_functions_modbus(void)
|
||||||
delay_cnt(200); //不加延时有概率卡死
|
delay_cnt(200); //不加延时有概率卡死
|
||||||
}
|
}
|
||||||
//加载trx界面
|
//加载trx界面
|
||||||
|
scr_modbus_trx_recover();
|
||||||
lv_scr_load(guider_ui.screen_modbus_display);
|
lv_scr_load(guider_ui.screen_modbus_display);
|
||||||
lv_obj_clear_flag(guider_ui.screen_modbus_display, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_clear_flag(guider_ui.screen_modbus_display, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
|
||||||
|
@ -747,9 +749,14 @@ void key_functions_modbus(void)
|
||||||
lv_scr_load(guider_ui.screen_modbus_config);
|
lv_scr_load(guider_ui.screen_modbus_config);
|
||||||
lv_obj_clear_flag(guider_ui.screen_modbus_config, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_clear_flag(guider_ui.screen_modbus_config, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
|
||||||
|
menu_data.scr_now = SCREEN_MODBUS_MASTER_CONFIG;
|
||||||
|
|
||||||
//隐藏trx界面
|
//隐藏trx界面
|
||||||
lv_obj_add_flag(guider_ui.screen_modbus_display, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(guider_ui.screen_modbus_display, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
|
||||||
|
//熄灭当前游标
|
||||||
|
trx_items_check(MOD_TRX_NONE, mod_mas_trx_cursor);
|
||||||
|
|
||||||
current_operation = MODBUS_MASTER_CONFIG;
|
current_operation = MODBUS_MASTER_CONFIG;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue