From 73c78832ecc9a4952d1ada0ceda1ac51861da727 Mon Sep 17 00:00:00 2001 From: ipason Date: Tue, 22 Apr 2025 13:51:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86BS=E7=9A=84=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FluxUI/ui_event_homePage.c | 55 ++++++++++++++++++++++++++- components/FluxUI/ui_events.c | 1 + main/main.cpp | 48 +++++++++++++++++++++++ 3 files changed, 103 insertions(+), 1 deletion(-) diff --git a/components/FluxUI/ui_event_homePage.c b/components/FluxUI/ui_event_homePage.c index 9dc360d..43734e3 100644 --- a/components/FluxUI/ui_event_homePage.c +++ b/components/FluxUI/ui_event_homePage.c @@ -311,6 +311,8 @@ static void standard_volume_refresh(void) /*判定当前测试设备为Spirit-3*/ /*获取标准体积数据*/ fluxProtocol.nominalVolumeStage = Spirit3_Volume[fluxProtocol.currentStage-1]; + + }else if (fluxProtocol.currentDevice == Spirit6) { /*判定当前测试设备为Spirit-6*/ @@ -329,6 +331,8 @@ static void standard_volume_refresh(void) lv_label_set_text_fmt(ui_pageHome_labelNominalVolumeMax,"%.2f",VolumeMax); lv_label_set_text_fmt(ui_pageHome_labelNominalVolumeMin,"%.2f",VolumeMin); + /* 更新BS界面中各频率值 */ + /*根据标准值判定当前检测结果是否合格*/ RefreshResult(); @@ -425,11 +429,60 @@ static void comulate_result_read(lv_timer_t * timer) lv_label_set_text(ui_pageHome_labelStartTest,"Test Complete!"); } +/** + * @brief BS界面设备类型选择响应函数 + * + * 值改变后执行以下操作 + * 1.更新Home界面显示设备类型 + * 2.更改挡位调节范围 + * + * 3.更新测试标准值 + * 4.根据测试标准刷新判断结果 + * + * @param[in] e not used + */ void on_buttonStartTestBS_clicked(lv_event_t * e) { } + +/** + * @brief BS界面 带BS测试 按键按下事件 + * + * 按键按下后执行以下操作 + * 1.更新Home界面显示设备类型 + * 2.更新测试标准值 + * 3.根据测试标准刷新判断结果 + * + * @param[in] e not used + */ void on_dropdown_deviceTypeBS_valueChanged(lv_event_t * e) { - + char buf[32]={}; + uint16_t index = lv_dropdown_get_selected(e->target); + + /* 更新SD卡中的数据存储 */ + sdData.flux_test_result.current_device_type = index; + + /* 更新Home界面显示设备类型 */ + lv_dropdown_get_selected_str(e->target,buf,32); + lv_label_set_text(ui_pageHome_labelTitle, buf); + + /* 更新挡位显示范围 */ + if (index == Spirit3) + { + lv_spinbox_set_range(ui_pageHome_spinboxStage,1,4); + lv_spinbox_set_range(ui_pageHome_spinboxStageBS,1,4); + }else{ + lv_spinbox_set_range(ui_pageHome_spinboxStage,1,6); + lv_spinbox_set_range(ui_pageHome_spinboxStageBS,1,6); + } + + /* 刷新标准值 */ + standard_volume_refresh(); + +#if LOG_RECORD_ENABLE + example_write_log("on_dropdownDeviceType_valueChanged 设备类型修改成功"); +#endif + } \ No newline at end of file diff --git a/components/FluxUI/ui_events.c b/components/FluxUI/ui_events.c index 62665d7..02883f5 100644 --- a/components/FluxUI/ui_events.c +++ b/components/FluxUI/ui_events.c @@ -57,6 +57,7 @@ void on_dropdownDeviceType_valueChanged(lv_event_t * e) #if LOG_RECORD_ENABLE example_write_log("on_dropdownDeviceType_valueChanged 设备类型修改成功"); #endif + } /** diff --git a/main/main.cpp b/main/main.cpp index f86324c..2a32abb 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -11,6 +11,9 @@ #define PROGRESS_DELAY_TIME 500 +/* 声明清空测试结果的函数 */ +static void ui_bs_parm_clear(void); + extern "C" void app_main(void) { /*初始化SD卡*/ @@ -111,14 +114,20 @@ extern "C" void app_main(void) /*电源开启*/ POWER_ON; + /* 修改BS主界面中显示的数据 */ + ui_bs_parm_clear(); + /*初始上电后需要自动触发的一些小事件来更新界面界面元素*/ lv_textarea_set_text(ui_pageFluxDebug_textAreaContent,""); + /* 触发设备类型修改事件 */ lv_event_send(ui_pageSetting_dropdownDeviceType,LV_EVENT_VALUE_CHANGED,NULL); + /* 触发挡位修改事件 */ lv_event_send(ui_pageHome_spinboxStage,LV_EVENT_VALUE_CHANGED,NULL); lv_event_send(ui_pageHome_spinboxRate,LV_EVENT_VALUE_CHANGED,NULL); + /* 清除测试结果 */ lv_label_set_text(ui_pageHome_labelResultCompare,""); lv_label_set_text(ui_pageHome_labelTestResult,"-"); @@ -130,4 +139,43 @@ extern "C" void app_main(void) example_write_log("main 函数执行完毕"); #endif +} + +static void ui_bs_parm_clear(void) +{ + /* 15BPM清空 */ + lv_label_set_text(ui_pageHome_LabelRate15DOWN, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate15UP, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate15STD, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate15Result, "--.-"); + + /* 20BPM清空 */ + lv_label_set_text(ui_pageHome_LabelRate20DOWN, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate20UP, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate20STD, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate20Result, "--.-"); + + /* 25BPM清空 */ + lv_label_set_text(ui_pageHome_LabelRate25DOWN, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate25UP, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate25STD, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate25Result, "--.-"); + + /* 30BPM清空 */ + lv_label_set_text(ui_pageHome_LabelRate30DOWN, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate30UP, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate30STD, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate30Result, "--.-"); + + /* 35BPM清空 */ + lv_label_set_text(ui_pageHome_LabelRate35DOWN, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate35UP, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate35STD, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate35Result, "--.-"); + + /* 40BPM清空 */ + lv_label_set_text(ui_pageHome_LabelRate40DOWN, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate40UP, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate40STD, "--.-"); + lv_label_set_text(ui_pageHome_LabelRate40Result, "--.-"); } \ No newline at end of file