From: CCC <2393524978@qq.com> Date: Mon, 18 Sep 2023 08:33:44 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6f34748446d5deacaa5445fbc1299fcb9019522b;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c index 35d19d5c..41700e35 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c +++ b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c @@ -89,6 +89,9 @@ void mmi_ui_msg_action_charging_prompt(uint32_t chg_status) void mmi_ui_msg_action_do_not_disturb(uint8_t flag) { printf("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, flag); + + if(0 == Hal_Pm_Get_State()) + return; mmi_msg_do_not_disturb_t * msg_info = (mmi_msg_do_not_disturb_t *)Hal_Mem_Alloc(sizeof(mmi_msg_do_not_disturb_t)); @@ -103,6 +106,9 @@ void mmi_ui_msg_action_do_not_disturb(uint8_t flag) #if USE_LV_WATCH_PEDOMETER != 0 void mmi_ui_msg_action_pedometer_update(void) { + if(0 == Hal_Pm_Get_State()) + return; + mmi_ui_msg_action_no_para_msg(MMI_MSG_PEDOMETER_UPDATE); } #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c index e99a3c09..10d5eb36 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c @@ -248,7 +248,7 @@ lv_obj_t * health_heart_rate_create(lv_obj_t * activity_obj) mmi_health_measure_ui_measure_start(MMI_HEALTH_MEASURE_HEART); lv_obj_t * gif_cont = lv_cont_create(cont, NULL); - lv_obj_set_size(gif_cont, LV_HOR_RES, 120); + lv_obj_set_size(gif_cont, LV_HOR_RES, 100); lv_obj_set_style_local_bg_color(gif_cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 40); ext->gif_cont = gif_cont; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c index 8669d7bc..e68e6a14 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c @@ -244,7 +244,7 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj) mmi_health_measure_ui_measure_start(MMI_HEALTH_MEASURE_SPO2); lv_obj_t * gif_cont = lv_cont_create(cont, NULL); - lv_obj_set_size(gif_cont, LV_HOR_RES, 120); + lv_obj_set_size(gif_cont, LV_HOR_RES, 120); // 100); lv_obj_set_style_local_bg_color(gif_cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 20); ext->gif_cont = gif_cont; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c index a1e26a91..d24b89ae 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c @@ -250,7 +250,7 @@ lv_obj_t * health_temperature_create(lv_obj_t * activity_obj) mmi_health_measure_ui_measure_start(MMI_HEALTH_MEASURE_TEMPERATURE); lv_obj_t * gif_cont = lv_cont_create(cont, NULL); - lv_obj_set_size(gif_cont, LV_HOR_RES, 120); + lv_obj_set_size(gif_cont, LV_HOR_RES, 100); lv_obj_set_style_local_bg_color(gif_cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 40); ext->gif_cont = gif_cont;