gengxin
author@CHENG <2393524978@qq.com>
Thu, 11 Jan 2024 08:21:58 +0000 (16:21 +0800)
committer@CHENG <2393524978@qq.com>
Thu, 11 Jan 2024 08:21:58 +0000 (16:21 +0800)
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c
2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h

index 43996b1..b4f59ec 100644 (file)
@@ -51,8 +51,8 @@ void health_heart_rate_display_update(void)
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_FAIL);
                        lv_obj_align(ext->label_info, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_INFO_Y);
 
-                       lv_obj_remove_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font40);
-                       lv_obj_add_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font30);
+                       lv_obj_remove_style(ext->label_value, LV_LABEL_PART_MAIN, &HEART_LABEL_MEASURE_VALUE_FONT);
+                       lv_obj_add_style(ext->label_value, LV_LABEL_PART_MAIN, &HEART_LABEL_MEASURE_FAIL_FONT);
                        lv_label_set_text_id(ext->label_value, WATCH_TEXT_ID_NOT_WEAR);
                        lv_obj_align(ext->label_value, ext->cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y);
                        lv_obj_set_hidden(ext->label_value, FALSE);
@@ -94,7 +94,7 @@ static void health_heart_rate_measure_cycle_timeout(void * para)
                                gif_close(ext->gif_info);
                                ext->gif_info = NULL;
                        }
-                       lv_obj_del(ext->gif_cont);
+                       //lv_obj_del(ext->gif_cont);
 
                        if(STATE_HEART_RATE_MEASURING == ext->measure_state)
                        {
@@ -133,7 +133,7 @@ static void health_heart_rate_measure_cycle_timeout(void * para)
                                        gif_close(ext->gif_info);
                                        ext->gif_info = NULL;
                                }
-                               lv_obj_del(ext->gif_cont);
+                               //lv_obj_del(ext->gif_cont);
                                ext->measure_state = STATE_HEART_RATE_MEASURE_DONE;
                                watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_HEART, 0);
                                watch_wakeup_time_reset();
@@ -230,7 +230,7 @@ lv_obj_t * health_heart_rate_create(lv_obj_t * activity_obj)
 
        lv_obj_t * label_info = lv_label_create(cont, NULL);
     //lv_obj_set_size(label_info, LV_HOR_RES, 30);
-       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &HEART_LABEL_MEASURE_PROMPT_FONT);
        lv_label_set_text_id(label_info, WATCH_TEXT_ID_MEASURING);
     //lv_label_set_align(label_info, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(label_info, cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_INFO_Y);
@@ -239,7 +239,7 @@ lv_obj_t * health_heart_rate_create(lv_obj_t * activity_obj)
 
        lv_obj_t * label_value = lv_label_create(cont, NULL);
     //lv_obj_set_size(label_value, LV_HOR_RES, 40);
-       lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &lv_watch_font40);
+       lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &HEART_LABEL_MEASURE_VALUE_FONT);
        lv_label_set_text(label_value, ext->heart_rate);
     //lv_label_set_align(label_value, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(label_value, cont, LV_ALIGN_IN_TOP_MID, 0, HEART_LABEL_VALUE_Y);
@@ -254,17 +254,20 @@ 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, 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, HEART_MEASURE_IMAGE_Y);
-               ext->gif_cont = gif_cont;
+               //lv_obj_t * gif_cont = lv_cont_create(cont, NULL);
+               //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, HEART_MEASURE_IMAGE_Y);
+               //ext->gif_cont = gif_cont;
 
-               ext->gif_info = gif_open(gif_cont, ANIM_HEART_RATE_MEASURING, 0);
+               //ext->gif_info = gif_open(gif_cont, ANIM_HEART_RATE_MEASURING, 0);
+               ext->gif_info = gif_open(cont, ANIM_HEART_RATE_MEASURING, 0);
                if(!ext->gif_info) 
                {
                        HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__);
                }
+               lv_obj_set_style_local_bg_color(ext->gif_info->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+               lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_IN_TOP_MID, 0, HEART_MEASURE_IMAGE_Y);
                
                ext->cycle_timer_id = Hal_Timer_Start(HEALTH_HEART_MEASURE_CYCLE, health_heart_rate_measure_cycle_timeout, NULL, TRUE);
        
index ef51992..8ef1636 100644 (file)
@@ -36,6 +36,26 @@ extern "C" {
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 
+#define HEART_LABEL_MEASURE_PROMPT_FONT        (lv_watch_font20)
+#define HEART_LABEL_MEASURE_VALUE_FONT (lv_watch_font40)
+#define HEART_LABEL_MEASURE_FAIL_FONT  (lv_watch_font30)
+
+#elif defined(USE_LV_WATCH_UI_466_466)
+#define HEART_MEASURE_IMAGE_Y  (25 + 25)
+#define HEART_LABEL_INFO_X             (0)
+#define HEART_LABEL_INFO_Y             (135 + 135)
+#define HEART_LABEL_INFO_W             (LV_HOR_RES - HEART_LABEL_INFO_X)
+#define HEART_LABEL_INFO_H             (30 + 30)
+
+#define HEART_LABEL_VALUE_X            (0)
+#define HEART_LABEL_VALUE_Y            (165 + 165)
+#define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
+#define HEART_LABEL_VALUE_H            (50 + 50)
+
+#define HEART_LABEL_MEASURE_PROMPT_FONT        (lv_watch_font36)
+#define HEART_LABEL_MEASURE_VALUE_FONT (lv_watch_font60)
+#define HEART_LABEL_MEASURE_FAIL_FONT  (lv_watch_font40)
+
 #else
 #define HEART_MEASURE_IMAGE_Y          (40)
 #define HEART_LABEL_INFO_X             (0)
@@ -48,6 +68,9 @@ extern "C" {
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 
+#define HEART_LABEL_MEASURE_PROMPT_FONT        (lv_watch_font20)
+#define HEART_LABEL_MEASURE_VALUE_FONT (lv_watch_font40)
+#define HEART_LABEL_MEASURE_FAIL_FONT  (lv_watch_font30)
 #endif
 
 #else
@@ -64,6 +87,10 @@ extern "C" {
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 
+#define HEART_LABEL_MEASURE_PROMPT_FONT        (lv_watch_font20)
+#define HEART_LABEL_MEASURE_VALUE_FONT (lv_watch_font40)
+#define HEART_LABEL_MEASURE_FAIL_FONT  (lv_watch_font30)
+
 #elif USE_LV_WATCH_UI_240_280
 #define HEART_MEASURE_IMAGE_Y          (40)
 #define HEART_LABEL_INFO_X             (0)
@@ -76,6 +103,10 @@ extern "C" {
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 
+#define HEART_LABEL_MEASURE_PROMPT_FONT        (lv_watch_font20)
+#define HEART_LABEL_MEASURE_VALUE_FONT (lv_watch_font40)
+#define HEART_LABEL_MEASURE_FAIL_FONT  (lv_watch_font30)
+
 #else
 #define HEART_MEASURE_IMAGE_Y          (40)
 #define HEART_LABEL_INFO_X             (0)
@@ -88,6 +119,9 @@ extern "C" {
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 
+#define HEART_LABEL_MEASURE_PROMPT_FONT        (lv_watch_font20)
+#define HEART_LABEL_MEASURE_VALUE_FONT (lv_watch_font40)
+#define HEART_LABEL_MEASURE_FAIL_FONT  (lv_watch_font30)
 #endif
 
 #endif
index b38438b..226c82c 100644 (file)
@@ -53,8 +53,8 @@ void health_spo2_display_update(void)
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_FAIL);
                        lv_obj_align(ext->label_info, ext->cont, LV_ALIGN_IN_TOP_MID, 0, SPO2_LABEL_INFO_Y);
 
-                       lv_obj_remove_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font40);
-                       lv_obj_add_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font30);
+                       lv_obj_remove_style(ext->label_value, LV_LABEL_PART_MAIN, &SPO2_LABEL_MEASURE_VALUE_FONT);
+                       lv_obj_add_style(ext->label_value, LV_LABEL_PART_MAIN, &SPO2_LABEL_MEASURE_FAIL_FONT);
                        lv_label_set_text_id(ext->label_value, WATCH_TEXT_ID_NOT_WEAR);
                        lv_obj_align(ext->label_value, ext->cont, LV_ALIGN_IN_TOP_MID, 0, SPO2_LABEL_VALUE_Y);
                        lv_obj_set_hidden(ext->label_value, FALSE);
@@ -96,7 +96,7 @@ static void health_spo2_measure_cycle_timeout(void * para)
                                gif_close(ext->gif_info);
                                ext->gif_info = NULL;
                        }
-                       lv_obj_del(ext->gif_cont);
+                       //lv_obj_del(ext->gif_cont);
 
                        if(STATE_SPO2_MEASURING == ext->measure_state)
                        {
@@ -135,7 +135,7 @@ static void health_spo2_measure_cycle_timeout(void * para)
                                        gif_close(ext->gif_info);
                                        ext->gif_info = NULL;
                                }
-                               lv_obj_del(ext->gif_cont);
+                               //lv_obj_del(ext->gif_cont);
                
                                ext->measure_state = STATE_SPO2_MEASURE_DONE;
                                watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_SPO2, 0);
@@ -228,14 +228,14 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj)
        ext->img = img;
 
        lv_obj_t * label_info = lv_label_create(cont, NULL);
-       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &SPO2_LABEL_MEASURE_PROMPT_FONT);
        lv_label_set_text_id(label_info, WATCH_TEXT_ID_MEASURING);
     lv_obj_align(label_info, cont, LV_ALIGN_IN_TOP_MID, 0, SPO2_LABEL_INFO_Y);
     lv_obj_set_click(label_info, false);
        ext->label_info = label_info;
 
        lv_obj_t * label_value = lv_label_create(cont, NULL);
-       lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &lv_watch_font40);
+       lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &SPO2_LABEL_MEASURE_VALUE_FONT);
        lv_label_set_text(label_value, ext->spo2);
     //lv_label_set_align(label_value, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(label_value, cont, LV_ALIGN_IN_TOP_MID, 0, SPO2_LABEL_VALUE_Y);
@@ -250,21 +250,28 @@ 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); // 100);
-               lv_obj_set_style_local_bg_color(gif_cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
-               #if USE_LV_WATCH_UI_CIRCLE
-               lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 5);
-               #else
-               lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 20);
-               #endif
-               ext->gif_cont = gif_cont;
+               //lv_obj_t * gif_cont = lv_cont_create(cont, NULL);
+               //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);
+               //#if USE_LV_WATCH_UI_CIRCLE
+               //lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 5);
+               //#else
+               //lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 20);
+               //#endif
+               //ext->gif_cont = gif_cont;
                
-               ext->gif_info = gif_open(gif_cont, ANIM_SPO2_MEASURING, 0);
+               //ext->gif_info = gif_open(gif_cont, ANIM_SPO2_MEASURING, 0);
+               ext->gif_info = gif_open(cont, ANIM_SPO2_MEASURING, 0);
                if(!ext->gif_info) 
                {
                        HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__);
                }
+               lv_obj_set_style_local_bg_color(ext->gif_info->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+       #if USE_LV_WATCH_UI_CIRCLE
+               lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_IN_TOP_MID, 0, 5);
+       #else
+               lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
+       #endif
                
                ext->cycle_timer_id = Hal_Timer_Start(HEALTH_SPO2_MEASURE_CYCLE, health_spo2_measure_cycle_timeout, NULL, TRUE);
        
index 61e8552..2fbc9cf 100644 (file)
@@ -36,6 +36,26 @@ extern "C" {
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 
+#define SPO2_LABEL_MEASURE_PROMPT_FONT (lv_watch_font20)
+#define SPO2_LABEL_MEASURE_VALUE_FONT  (lv_watch_font40)
+#define SPO2_LABEL_MEASURE_FAIL_FONT   (lv_watch_font30)
+
+#elif defined(USE_LV_WATCH_UI_466_466)
+#define SPO2_MEASURE_IMAGE_Y   (25 + 25)
+#define SPO2_LABEL_INFO_X              (0)
+#define SPO2_LABEL_INFO_Y              (135 + 135)
+#define SPO2_LABEL_INFO_W              (LV_HOR_RES - SPO2_LABEL_INFO_X)
+#define SPO2_LABEL_INFO_H              (30 + 30)
+
+#define SPO2_LABEL_VALUE_X             (0)
+#define SPO2_LABEL_VALUE_Y             (165 + 165)
+#define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
+#define SPO2_LABEL_VALUE_H             (50 + 50)
+
+#define SPO2_LABEL_MEASURE_PROMPT_FONT (lv_watch_font36)
+#define SPO2_LABEL_MEASURE_VALUE_FONT  (lv_watch_font60)
+#define SPO2_LABEL_MEASURE_FAIL_FONT   (lv_watch_font40)
+
 #else
 #define SPO2_MEASURE_IMAGE_Y           (40)
 #define SPO2_LABEL_INFO_X              (0)
@@ -48,6 +68,9 @@ extern "C" {
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 
+#define SPO2_LABEL_MEASURE_PROMPT_FONT (lv_watch_font20)
+#define SPO2_LABEL_MEASURE_VALUE_FONT  (lv_watch_font40)
+#define SPO2_LABEL_MEASURE_FAIL_FONT   (lv_watch_font30)
 #endif
 
 #else
@@ -64,6 +87,10 @@ extern "C" {
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 
+#define SPO2_LABEL_MEASURE_PROMPT_FONT (lv_watch_font20)
+#define SPO2_LABEL_MEASURE_VALUE_FONT  (lv_watch_font40)
+#define SPO2_LABEL_MEASURE_FAIL_FONT   (lv_watch_font30)
+
 #elif USE_LV_WATCH_UI_240_280
 #define SPO2_MEASURE_IMAGE_Y           (40)
 #define SPO2_LABEL_INFO_X              (0)
@@ -76,6 +103,10 @@ extern "C" {
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 
+#define SPO2_LABEL_MEASURE_PROMPT_FONT (lv_watch_font20)
+#define SPO2_LABEL_MEASURE_VALUE_FONT  (lv_watch_font40)
+#define SPO2_LABEL_MEASURE_FAIL_FONT   (lv_watch_font30)
+
 #else
 #define SPO2_MEASURE_IMAGE_Y           (40)
 #define SPO2_LABEL_INFO_X              (0)
@@ -88,6 +119,9 @@ extern "C" {
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 
+#define SPO2_LABEL_MEASURE_PROMPT_FONT (lv_watch_font20)
+#define SPO2_LABEL_MEASURE_VALUE_FONT  (lv_watch_font40)
+#define SPO2_LABEL_MEASURE_FAIL_FONT   (lv_watch_font30)
 #endif
 
 #endif
index 4c689ad..718f339 100644 (file)
@@ -53,8 +53,8 @@ void health_temperature_display_update(void)
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_FAIL);
                        lv_obj_align(ext->label_info, ext->cont, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_LABEL_INFO_Y);
 
-                       lv_obj_remove_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font40);
-                       lv_obj_add_style(ext->label_value, LV_LABEL_PART_MAIN, &lv_watch_font30);
+                       lv_obj_remove_style(ext->label_value, LV_LABEL_PART_MAIN, &TEMPERATURE_LABEL_MEASURE_VALUE_FONT);
+                       lv_obj_add_style(ext->label_value, LV_LABEL_PART_MAIN, &TEMPERATURE_LABEL_MEASURE_FAIL_FONT);
                        lv_label_set_text_id(ext->label_value, WATCH_TEXT_ID_NOT_WEAR);
                        lv_obj_align(ext->label_value, ext->cont, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_LABEL_VALUE_Y);
                        lv_obj_set_hidden(ext->label_value, FALSE);
@@ -96,7 +96,7 @@ static void health_temperature_measure_cycle_timeout(void * para)
                                gif_close(ext->gif_info);
                                ext->gif_info = NULL;
                        }
-                       lv_obj_del(ext->gif_cont);
+                       //lv_obj_del(ext->gif_cont);
 
                        if(STATE_TEMPERATURE_MEASURING == ext->measure_state)
                        {
@@ -119,7 +119,17 @@ static void health_temperature_measure_cycle_timeout(void * para)
 
                                        value1 = (uint8_t)value;
                                        value2 = (uint8_t)((value - value1) * 10);
+
+                               #if 1
+                                       char * uincode_str = "2103"; // \u2103
+                                       char utf8_str[8] = {0};
+                                       uint8_t output_len = 0;
+                                       
+                                       mmi_unicode_hex_str_to_utf8_str(uincode_str, strlen(uincode_str), utf8_str, &output_len);
+                                       sprintf(ext->body_value, "%d.%d %s", value1, value2, utf8_str);
+                               #else
                                        sprintf(ext->body_value, "%d.%d %s", value1, value2, lang_get_text_by_id(WATCH_TEXT_ID_TEMPERATURE_UNIT)); // 0x2103
+                               #endif
                                }
                                ext->measure_state = STATE_TEMPERATURE_MEASURING;
                        }
@@ -135,7 +145,7 @@ static void health_temperature_measure_cycle_timeout(void * para)
                                        gif_close(ext->gif_info);
                                        ext->gif_info = NULL;
                                }
-                               lv_obj_del(ext->gif_cont);
+                               //lv_obj_del(ext->gif_cont);
                                ext->measure_state = STATE_TEMPERATURE_MEASURE_DONE;
                                watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_TEMPERATURE, 0);
                                watch_wakeup_time_reset();
@@ -232,7 +242,7 @@ lv_obj_t * health_temperature_create(lv_obj_t * activity_obj)
 
        lv_obj_t * label_info = lv_label_create(cont, NULL);
     //lv_obj_set_size(label_info, LV_HOR_RES, 30);
-       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &TEMPERATURE_LABEL_MEASURE_PROMPT_FONT);
        lv_label_set_text_id(label_info, WATCH_TEXT_ID_MEASURING);
     //lv_label_set_align(label_info, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(label_info, cont, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_LABEL_INFO_Y);
@@ -241,7 +251,7 @@ lv_obj_t * health_temperature_create(lv_obj_t * activity_obj)
 
        lv_obj_t * label_value = lv_label_create(cont, NULL);
     //lv_obj_set_size(label_value, LV_HOR_RES, 40);
-       lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &lv_watch_font40);
+       lv_obj_add_style(label_value, LV_LABEL_PART_MAIN, &TEMPERATURE_LABEL_MEASURE_VALUE_FONT);
        lv_label_set_text(label_value, ext->body_value);
     //lv_label_set_align(label_value, LV_LABEL_ALIGN_CENTER);
     lv_obj_align(label_value, cont, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_LABEL_VALUE_Y);
@@ -256,17 +266,20 @@ 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, 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, TEMPERATURE_MEASURE_IMAGE_Y);
-               ext->gif_cont = gif_cont;
+               //lv_obj_t * gif_cont = lv_cont_create(cont, NULL);
+               //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, TEMPERATURE_MEASURE_IMAGE_Y);
+               //ext->gif_cont = gif_cont;
 
-               ext->gif_info = gif_open(gif_cont, ANIM_TEMPERATURE_MEASURING, 0);
+               //ext->gif_info = gif_open(gif_cont, ANIM_TEMPERATURE_MEASURING, 0);
+               ext->gif_info = gif_open(cont, ANIM_TEMPERATURE_MEASURING, 0);
                if(!ext->gif_info) 
                {
                        HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: gif open fail\n", __FUNCTION__, __LINE__);
                }
+               lv_obj_set_style_local_bg_color(ext->gif_info->container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+               lv_obj_align(ext->gif_info->container, NULL, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_MEASURE_IMAGE_Y);
                
                ext->cycle_timer_id = Hal_Timer_Start(TEMPERATURE_MEASURE_CYCLE, health_temperature_measure_cycle_timeout, NULL, TRUE);
        
index dcd60d4..27751e4 100644 (file)
@@ -36,6 +36,26 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
+#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT  (lv_watch_font20)
+#define TEMPERATURE_LABEL_MEASURE_VALUE_FONT   (lv_watch_font40)
+#define TEMPERATURE_LABEL_MEASURE_FAIL_FONT            (lv_watch_font30)
+
+#elif defined(USE_LV_WATCH_UI_466_466)
+#define TEMPERATURE_MEASURE_IMAGE_Y            (25 + 25)
+#define TEMPERATURE_LABEL_INFO_X               (0)
+#define TEMPERATURE_LABEL_INFO_Y               (135 + 135)
+#define TEMPERATURE_LABEL_INFO_W               (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X)
+#define TEMPERATURE_LABEL_INFO_H               (30 + 30)
+
+#define TEMPERATURE_LABEL_VALUE_X              (0)
+#define TEMPERATURE_LABEL_VALUE_Y              (165 + 165)
+#define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
+#define TEMPERATURE_LABEL_VALUE_H              (50 + 50)
+
+#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT  (lv_watch_font36)
+#define TEMPERATURE_LABEL_MEASURE_VALUE_FONT   (lv_watch_font60)
+#define TEMPERATURE_LABEL_MEASURE_FAIL_FONT            (lv_watch_font40)
+
 #else
 #define TEMPERATURE_MEASURE_IMAGE_Y            (40)
 #define TEMPERATURE_LABEL_INFO_X               (0)
@@ -48,6 +68,10 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
+#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT  (lv_watch_font20)
+#define TEMPERATURE_LABEL_MEASURE_VALUE_FONT   (lv_watch_font40)
+#define TEMPERATURE_LABEL_MEASURE_FAIL_FONT            (lv_watch_font30)
+
 #endif
 
 #else
@@ -64,6 +88,10 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
+#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT  (lv_watch_font20)
+#define TEMPERATURE_LABEL_MEASURE_VALUE_FONT   (lv_watch_font40)
+#define TEMPERATURE_LABEL_MEASURE_FAIL_FONT            (lv_watch_font30)
+
 #elif USE_LV_WATCH_UI_240_280
 #define TEMPERATURE_MEASURE_IMAGE_Y            (40)
 #define TEMPERATURE_LABEL_INFO_X               (0)
@@ -76,6 +104,10 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
+#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT  (lv_watch_font20)
+#define TEMPERATURE_LABEL_MEASURE_VALUE_FONT   (lv_watch_font40)
+#define TEMPERATURE_LABEL_MEASURE_FAIL_FONT            (lv_watch_font30)
+
 #else
 #define TEMPERATURE_MEASURE_IMAGE_Y            (40)
 #define TEMPERATURE_LABEL_INFO_X               (0)
@@ -88,6 +120,10 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
+#define TEMPERATURE_LABEL_MEASURE_PROMPT_FONT  (lv_watch_font20)
+#define TEMPERATURE_LABEL_MEASURE_VALUE_FONT   (lv_watch_font40)
+#define TEMPERATURE_LABEL_MEASURE_FAIL_FONT            (lv_watch_font30)
+
 #endif
 
 #endif