From: @CHENG <2393524978@qq.com> Date: Wed, 4 Dec 2024 12:38:39 +0000 (+0800) Subject: youhua X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5aaff26eb963de3791b41867daf7f31b7aeef237;p=mirrors%2FASR3603_Z5.git youhua --- diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c index f52f6f48..6929b75c 100644 --- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c +++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor.c @@ -72,8 +72,9 @@ void mmi_health_info_get(nv_watch_health_info_t * health_info) health_info->blood_low_value = s_health_info.blood_low_value; health_info->spo2_value = s_health_info.spo2_value; health_info->body_value = s_health_info.body_value; - memcpy(&(health_info->heart_time), &(s_health_info.heart_time), sizeof(hal_rtc_t)); + //memcpy(&(health_info->heart_time), &(s_health_info.heart_time), sizeof(hal_rtc_t)); #endif + _lv_memcpy(&(health_info->heart_time), &(s_health_info.heart_time), sizeof(hal_rtc_t)); } void mmi_health_info_set(nv_watch_health_info_t * health_info) @@ -83,7 +84,8 @@ void mmi_health_info_set(nv_watch_health_info_t * health_info) s_health_info.blood_low_value = health_info->blood_low_value; s_health_info.spo2_value = health_info->spo2_value; s_health_info.body_value = health_info->body_value; - memcpy(&(s_health_info.heart_time), &(health_info->heart_time), sizeof(hal_rtc_t)); + //memcpy(&(s_health_info.heart_time), &(health_info->heart_time), sizeof(hal_rtc_t)); + _lv_memcpy(&(s_health_info.heart_time), &(health_info->heart_time), sizeof(hal_rtc_t)); uint32_t nv_data_length = sizeof(nv_watch_health_info_t); diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h index 709b84b7..2b359af8 100644 --- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h +++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.h @@ -27,7 +27,7 @@ extern "C" { #define MMI_GUI_TIMING_TIMER_INTERVAL (3 * 1000) // ms #define MMI_GUI_TIMING_TASK_PRIORITY 219 -#define MMI_GUI_TIMING_TASK_STACK_SIZE (1024 * 8) // (1 * 1024) +#define MMI_GUI_TIMING_TASK_STACK_SIZE (1024 * 4) // (1 * 1024) #define MMI_GUI_TIMING_MSG_QUEUE_SIZE (16) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.h index b853e199..c55026f8 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.h @@ -19,7 +19,7 @@ extern "C" { #ifdef __MMI_CUSTOM_HENGAI_SLEEP_K18__ #define MMI_WATCH_SLEEP_TASK_PRIORITY 221 -#define MMI_WATCH_SLEEP_TASK_STACK_SIZE (1024 * 16) // (1 * 1024) +#define MMI_WATCH_SLEEP_TASK_STACK_SIZE (1024 * 8) // (1 * 1024) #define MMI_WATCH_SLEEP_MSG_QUEUE_SIZE (32) // (16) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c index f56d5305..bdec4315 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c @@ -693,10 +693,14 @@ void mmi_health_measure_send_heart(void * param) mmi_protocol_action_send_heart(heart_value); + hal_rtc_t cur_time = {0}; nv_watch_health_info_t health_info = {0}; mmi_health_info_get(&health_info); health_info.heart_value = heart_value; - Hal_Rtc_Gettime(&(health_info.heart_time)); + //Hal_Rtc_Gettime(&(health_info.heart_time)); + Hal_Rtc_Gettime(&cur_time); + _lv_memcpy(&(health_info.heart_time), &cur_time, sizeof(hal_rtc_t)); + mmi_health_info_set(&health_info); } @@ -1136,7 +1140,7 @@ void mmi_health_measure_factory_mode_clean(void) #define MMI_HEALTH_MEASURE_TASK_PRIORITY 221 -#define MMI_HEALTH_MEASURE_TASK_STACK_SIZE (1024 * 16) // (8 * 1024) +#define MMI_HEALTH_MEASURE_TASK_STACK_SIZE (8 * 1024) #define MMI_HEALTH_MEASURE_MSG_QUEUE_SIZE (16) TASK_HANDLE * s_health_measure_task_id = NULL;