设置界面返回主界面之后,恢复主界面原先的显示内容

This commit is contained in:
吴俊潮 2025-02-14 14:59:42 +08:00
parent 7d99880883
commit bd8a7d06fe
370 changed files with 40257 additions and 30133 deletions

View File

@ -120,6 +120,7 @@ void key_functions_main(void); //按键功能,主界面
void key_functions_setting(void); //按键功能,详细设置菜单界面
void num_twinkle(void); //数值闪烁数值发生变化后开始闪烁10秒无动作后闪烁停止游标移动后恢复前一时刻位置的数值
void plot_drawing(void); //实时曲线绘制
void scr_main_recover(void); //恢复主界面的各项参数显示,用于界面切换(设置界面返回主界面)
typedef enum
{

View File

@ -2,7 +2,7 @@
* @Author: wujunchao wujunchao@wuxismart.com
* @Date: 2024-12-27 11:50:56
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2025-02-07 09:27:19
* @LastEditTime: 2025-02-14 10:54:28
* @FilePath: \signal_generator\App\APP_WU\Src\apps_gather.c
* @Description: ,`customMade`, koroFileHeader查看配置 : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -1096,6 +1096,8 @@ void key_functions_setting(void) //按键功能,详细设置菜单界面
lv_obj_del(guider_ui.screen_setting);
m5data.scr_now = SCREEN_MAIN; //当前界面为主界面
scr_main_recover(); //恢复之前显示的数据
}
break;
@ -1107,6 +1109,168 @@ void key_functions_setting(void) //按键功能,详细设置菜单界面
}
}
void scr_main_recover(void) //恢复主界面的各项参数显示,用于界面切换(设置界面返回主界面)
{
// 运行时间 和 电池电量 在主界面的函数中已存在,无需额外恢复
// 曲线需要在 setup_scr_screen_main.c 中修改
//ON&OFF
if(m5data.io_mode == IO_ON)
{
lv_span_set_text(guider_ui.screen_main_spangroup_6_span, "ON");
}
else
{
lv_span_set_text(guider_ui.screen_main_spangroup_6_span, "OFF");
}
//输入&输出、工作模式&类型
switch (m5data.io_mode) //输入、输出模式切换
{
case IO_OUTPUT:
{
lv_span_set_text(guider_ui.screen_main_spangroup_3_span, "OUT");
switch (m5data.output_mode) //功能切换
{
case SIG_VOLTAGE:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Volt");
switch (m5data.output_mode_type) //功能类型切换电压V/mV
{
case VOLTAGE_MV:
{
lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "mV");
}
break;
case VOLTAGE_V:
{
lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "V");
}
break;
default:
break;
}
}
break;
case SIG_CURRENT:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Cur");
}
break;
case SIG_RESISTANT:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Res");
}
break;
case SIG_FREQUENCE:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Fre");
}
break;
case SIG_TC:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "TC");
}
break;
case SIG_RTD:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "RTD");
}
break;
default:
break;
}
}
break;
case IO_INPUT:
{
lv_span_set_text(guider_ui.screen_main_spangroup_3_span, "IN");
switch (m5data.input_mode)
{
case SIG_VOLTAGE:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Volt");
switch (m5data.input_mode_type) //功能类型切换电压V/mV
{
case VOLTAGE_MV:
{
lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "mV");
}
break;
case VOLTAGE_V:
{
lv_span_set_text(guider_ui.screen_main_spangroup_4_span, "V");
}
break;
default:
break;
}
}
break;
case SIG_CURRENT:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Cur");
}
break;
case SIG_RESISTANT:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Res");
}
break;
case SIG_FREQUENCE:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "Fre");
}
break;
case SIG_TC:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "TC");
}
break;
case SIG_RTD:
{
lv_span_set_text(guider_ui.screen_main_spangroup_5_span, "RTD");
}
break;
default:
break;
}
}
break;
default:
break;
}
//设定值&测量值
lv_img_set_src(guider_ui.screen_main_animimg_2, screen_main_animimg_2_imgs[ m5data.io_numbers[0] ]);
lv_img_set_src(guider_ui.screen_main_animimg_3, screen_main_animimg_3_imgs[ m5data.io_numbers[1] ]);
lv_img_set_src(guider_ui.screen_main_animimg_4, screen_main_animimg_4_imgs[ m5data.io_numbers[2] ]);
lv_img_set_src(guider_ui.screen_main_animimg_5, screen_main_animimg_5_imgs[ m5data.io_numbers[3] ]);
lv_img_set_src(guider_ui.screen_main_animimg_6, screen_main_animimg_6_imgs[ m5data.io_numbers[4] ]);
lv_img_set_src(guider_ui.screen_main_animimg_7, screen_main_animimg_7_imgs[ m5data.io_numbers[5] ]);
}
uint8_t twk_p = 0; //用于控制闪烁翻转
void num_twinkle(void) //数值闪烁
{

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More