gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
index 9f6dfe2..ddf8e92 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
@@ -39,11 +39,6 @@ static void timing_timer_callback(uint32_t param)
        }
        asl_pedometer_steps_save(false);
 
-       // disturb
-#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
-//     mmi_watch_do_not_disturb_screen_check(time.tm_min);
-#endif
-
        uos_timer_stop(timing_control_timer);
        uos_timer_start(timing_control_timer, MS_TO_TICKS(TIMING_TIMER_INTERVAL), 0, timing_timer_callback, NULL);
 }

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 10d5eb3..e5b9ca0 100644 (file)
--- 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
@@ -102,6 +102,7 @@ static void health_heart_rate_measure_cycle_timeout(void * para)
                        }
                        ext->measure_state = STATE_HEART_RATE_MEASURE_FAIL;
                        watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_HEART, 0);
+                       watch_wakeup_time_reset();
                }
                else
                {
@@ -135,6 +136,7 @@ static void health_heart_rate_measure_cycle_timeout(void * para)
                                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();
                        }
                }
     }
@@ -216,7 +218,7 @@ lv_obj_t * health_heart_rate_create(lv_obj_t * activity_obj)
 
        lv_obj_t * img = lv_img_create(cont, NULL);
        lv_img_set_src(img, ICON_HEART_RATE_MEASURE_FAIL);
-    lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 40);
+    lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, HEART_MEASURE_IMAGE_Y);
        lv_obj_set_hidden(img, true);
        ext->img = img;
 
@@ -241,7 +243,6 @@ lv_obj_t * health_heart_rate_create(lv_obj_t * activity_obj)
        if(false == mmi_health_measure_wear_state_get())
        {
                ext->measure_state = STATE_HEART_RATE_MEASURE_FAIL;
-               watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_HEART, 0);
        }
        else
        {
@@ -250,7 +251,7 @@ lv_obj_t * health_heart_rate_create(lv_obj_t * activity_obj)
                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, 40);
+               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);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
index 70586c3..c78c7e9 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h
@@ -23,6 +23,7 @@ extern "C" {
 
 
 #if USE_LV_WATCH_UI_240_320
+#define HEART_MEASURE_IMAGE_Y          (40)
 #define HEART_LABEL_INFO_X             (0)
 #define HEART_LABEL_INFO_Y             (180)
 #define HEART_LABEL_INFO_W             (LV_HOR_RES - HEART_LABEL_INFO_X)
@@ -34,6 +35,7 @@ extern "C" {
 #define HEART_LABEL_VALUE_H            (50)
 
 #elif USE_LV_WATCH_UI_240_280
+#define HEART_MEASURE_IMAGE_Y          (40)
 #define HEART_LABEL_INFO_X             (0)
 #define HEART_LABEL_INFO_Y             (155)
 #define HEART_LABEL_INFO_W             (LV_HOR_RES - HEART_LABEL_INFO_X)
@@ -45,17 +47,19 @@ extern "C" {
 #define HEART_LABEL_VALUE_H            (50)
 
 #elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define HEART_MEASURE_IMAGE_Y          (25)
 #define HEART_LABEL_INFO_X             (0)
-#define HEART_LABEL_INFO_Y             (155)
+#define HEART_LABEL_INFO_Y             (135)
 #define HEART_LABEL_INFO_W             (LV_HOR_RES - HEART_LABEL_INFO_X)
 #define HEART_LABEL_INFO_H             (30)
 
 #define HEART_LABEL_VALUE_X            (0)
-#define HEART_LABEL_VALUE_Y            (195)
+#define HEART_LABEL_VALUE_Y            (165)
 #define HEART_LABEL_VALUE_W            (LV_HOR_RES - HEART_LABEL_VALUE_X)
 #define HEART_LABEL_VALUE_H            (50)
 
 #else
+#define HEART_MEASURE_IMAGE_Y          (40)
 #define HEART_LABEL_INFO_X             (0)
 #define HEART_LABEL_INFO_Y             (180)
 #define HEART_LABEL_INFO_W             (LV_HOR_RES - HEART_LABEL_INFO_X)

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 e68e6a1..f0a1929 100644 (file)
--- 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
@@ -104,6 +104,7 @@ static void health_spo2_measure_cycle_timeout(void * para)
                        }
                        ext->measure_state = STATE_SPO2_MEASURE_FAIL;
                        watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_SPO2, 0);
+                       watch_wakeup_time_reset();
                }
                else
                {
@@ -138,6 +139,7 @@ static void health_spo2_measure_cycle_timeout(void * para)
                
                                ext->measure_state = STATE_SPO2_MEASURE_DONE;
                                watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_SPO2, 0);
+                               watch_wakeup_time_reset();
                        }
                }
     }
@@ -215,7 +217,7 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj)
 
        lv_obj_t * img = lv_img_create(cont, NULL);
        lv_img_set_src(img, ICON_SPO2_MEASURE_FAIL);
-    lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 40);
+    lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, SPO2_MEASURE_IMAGE_Y);
        lv_obj_set_hidden(img, true);
        ext->img = img;
 
@@ -237,7 +239,6 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj)
        if(false == mmi_health_measure_wear_state_get())
        {
                ext->measure_state = STATE_SPO2_MEASURE_FAIL;
-               watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_SPO2, 0);
        }
        else
        {
@@ -246,7 +247,11 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj)
                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_240_240_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);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
index 1a58c79..652b7d4 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h
@@ -23,6 +23,7 @@ extern "C" {
 
 
 #if USE_LV_WATCH_UI_240_320
+#define SPO2_MEASURE_IMAGE_Y           (40)
 #define SPO2_LABEL_INFO_X              (0)
 #define SPO2_LABEL_INFO_Y              (180)
 #define SPO2_LABEL_INFO_W              (LV_HOR_RES - SPO2_LABEL_INFO_X)
@@ -34,6 +35,7 @@ extern "C" {
 #define SPO2_LABEL_VALUE_H             (50)
 
 #elif USE_LV_WATCH_UI_240_280
+#define SPO2_MEASURE_IMAGE_Y           (40)
 #define SPO2_LABEL_INFO_X              (0)
 #define SPO2_LABEL_INFO_Y              (155)
 #define SPO2_LABEL_INFO_W              (LV_HOR_RES - SPO2_LABEL_INFO_X)
@@ -45,17 +47,19 @@ extern "C" {
 #define SPO2_LABEL_VALUE_H             (50)
 
 #elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define SPO2_MEASURE_IMAGE_Y           (25)
 #define SPO2_LABEL_INFO_X              (0)
-#define SPO2_LABEL_INFO_Y              (155)
+#define SPO2_LABEL_INFO_Y              (135)
 #define SPO2_LABEL_INFO_W              (LV_HOR_RES - SPO2_LABEL_INFO_X)
 #define SPO2_LABEL_INFO_H              (30)
 
 #define SPO2_LABEL_VALUE_X             (0)
-#define SPO2_LABEL_VALUE_Y             (195)
+#define SPO2_LABEL_VALUE_Y             (165)
 #define SPO2_LABEL_VALUE_W             (LV_HOR_RES - SPO2_LABEL_VALUE_X)
 #define SPO2_LABEL_VALUE_H             (50)
 
 #else
+#define SPO2_MEASURE_IMAGE_Y           (40)
 #define SPO2_LABEL_INFO_X              (0)
 #define SPO2_LABEL_INFO_Y              (180)
 #define SPO2_LABEL_INFO_W              (LV_HOR_RES - SPO2_LABEL_INFO_X)

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 d24b89a..b689592 100644 (file)
--- 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
@@ -104,6 +104,7 @@ static void health_temperature_measure_cycle_timeout(void * para)
                        }
                        ext->measure_state = STATE_TEMPERATURE_MEASURE_FAIL;
                        watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_TEMPERATURE, 0);
+                       watch_wakeup_time_reset();
                }
                else
                {
@@ -137,6 +138,7 @@ static void health_temperature_measure_cycle_timeout(void * para)
                                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();
                        }
                }
     }
@@ -218,7 +220,7 @@ lv_obj_t * health_temperature_create(lv_obj_t * activity_obj)
 
        lv_obj_t * img = lv_img_create(cont, NULL);
        lv_img_set_src(img, ICON_TEMPERATURE_MEASURE_FAIL);
-    lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 40);
+    lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_MEASURE_IMAGE_Y);
        lv_obj_set_hidden(img, true);
        ext->img = img;
 
@@ -243,7 +245,6 @@ lv_obj_t * health_temperature_create(lv_obj_t * activity_obj)
        if(false == mmi_health_measure_wear_state_get())
        {
                ext->measure_state = STATE_TEMPERATURE_MEASURE_FAIL;
-               watch_set_suspend_enable(true, ACT_ID_HEALTH_MEASURE_TEMPERATURE, 0);
        }
        else
        {
@@ -252,7 +253,7 @@ lv_obj_t * health_temperature_create(lv_obj_t * activity_obj)
                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, 40);
+               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);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
index 37d1ec3..c65c2f1 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h
@@ -24,6 +24,7 @@ extern "C" {
 
 #if 1
 #if USE_LV_WATCH_UI_240_320
+#define TEMPERATURE_MEASURE_IMAGE_Y            (40)
 #define TEMPERATURE_LABEL_INFO_X               (0)
 #define TEMPERATURE_LABEL_INFO_Y               (180)
 #define TEMPERATURE_LABEL_INFO_W               (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X)
@@ -35,6 +36,7 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
 #elif USE_LV_WATCH_UI_240_280
+#define TEMPERATURE_MEASURE_IMAGE_Y            (40)
 #define TEMPERATURE_LABEL_INFO_X               (0)
 #define TEMPERATURE_LABEL_INFO_Y               (155)
 #define TEMPERATURE_LABEL_INFO_W               (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X)
@@ -46,17 +48,19 @@ extern "C" {
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
 #elif USE_LV_WATCH_UI_240_240_CIRCLE
+#define TEMPERATURE_MEASURE_IMAGE_Y            (25)
 #define TEMPERATURE_LABEL_INFO_X               (0)
-#define TEMPERATURE_LABEL_INFO_Y               (155)
+#define TEMPERATURE_LABEL_INFO_Y               (135)
 #define TEMPERATURE_LABEL_INFO_W               (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X)
 #define TEMPERATURE_LABEL_INFO_H               (30)
 
 #define TEMPERATURE_LABEL_VALUE_X              (0)
-#define TEMPERATURE_LABEL_VALUE_Y              (195)
+#define TEMPERATURE_LABEL_VALUE_Y              (165)
 #define TEMPERATURE_LABEL_VALUE_W              (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X)
 #define TEMPERATURE_LABEL_VALUE_H              (50)
 
 #else
+#define TEMPERATURE_MEASURE_IMAGE_Y            (40)
 #define TEMPERATURE_LABEL_INFO_X               (0)
 #define TEMPERATURE_LABEL_INFO_Y               (180)
 #define TEMPERATURE_LABEL_INFO_W               (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X)

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
index 0612b08..025644d 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
@@ -214,6 +214,17 @@ static void sms_msg_list_create(lv_obj_t * obj, lv_ll_t * sms_list)
 \r
        lv_obj_t * list = lv_list_create(content,NULL);\r
        LV_ASSERT_MEM(list);\r
+#if 0 //def USE_LV_WATCH_UI_240_240_CIRCLE\r
+       lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES - 20 - 20);\r
+       lv_obj_add_style(list, LV_LIST_PART_BG,&lv_watch_style_transp);\r
+       lv_obj_set_style_local_pad_inner(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);\r
+       lv_obj_set_style_local_pad_left(list,  LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6 + 4);\r
+       lv_obj_set_style_local_pad_right(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6 + 4);\r
+       lv_obj_set_style_local_pad_top(list,  LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15);\r
+       lv_obj_set_style_local_pad_bottom(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15);\r
+       lv_obj_set_style_local_outline_width(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);\r
+#else\r
+\r
        lv_obj_set_size(list,LV_HOR_RES,LV_VER_RES);//set list size\r
        lv_obj_add_style(list, LV_LIST_PART_BG,&lv_watch_style_transp);\r
        lv_obj_set_style_local_pad_inner(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 20);\r
@@ -222,6 +233,7 @@ static void sms_msg_list_create(lv_obj_t * obj, lv_ll_t * sms_list)
        lv_obj_set_style_local_pad_top(list,  LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15);\r
     lv_obj_set_style_local_pad_bottom(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15);\r
        lv_obj_set_style_local_outline_width(list, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);\r
+#endif\r
        lv_list_set_edge_flash(list,true);\r
        lv_obj_align(list,content,LV_ALIGN_CENTER,0,0);\r
        lv_list_set_scrollbar_mode(list,LV_SCROLLBAR_MODE_OFF);//close scroll bar\r
@@ -335,6 +347,7 @@ void sms_msg_app_new_sms_info_ind(app_adp_new_sms_info_ind_t *sms_info)
 \r
        #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__\r
                if(false == mmi_watch_is_in_do_not_disturb_time())\r
+       #endif\r
                {\r
                        Hal_NFFS_File_Play_Onetime(AUDIO_SETTING_AUDIO_MSG, query_current_volume(), NULL, 0);\r
                        Hal_Vibrator_Play_Onetime(NULL, 1000);\r
@@ -357,7 +370,6 @@ void sms_msg_app_new_sms_info_ind(app_adp_new_sms_info_ind_t *sms_info)
                        //notify ui \r
                        app_adaptor_recv_sms_notsify_update_ui();\r
                }\r
-       #endif\r
        }\r
 \r
 #if SMS_MSG_TEST != 0\r
@@ -746,7 +758,11 @@ static void mbox_sms_label(lv_sms_item_ext_t * ext)
 \r
                lv_obj_t * msg_ta = lv_textarea_create(mbox_count, NULL);\r
                LV_ASSERT_MEM(msg_ta);\r
+       #ifdef USE_LV_WATCH_UI_240_240_CIRCLE\r
+               lv_obj_set_size(msg_ta, LV_HOR_RES - 20 * 2, LV_VER_RES - 20 - 15 * 2 - 40);\r
+       #else\r
                lv_obj_set_size(msg_ta, LV_HOR_RES - 15 * 2, LV_VER_RES - 20 - 15 * 2 - 40);\r
+       #endif\r
                lv_obj_add_style(msg_ta, LV_TEXTAREA_PART_BG,&lv_watch_font26);\r
                lv_obj_set_style_local_bg_opa(msg_ta, LV_TEXTAREA_PART_BG,LV_STATE_DEFAULT, LV_OPA_0);\r
                lv_textarea_set_text(msg_ta,ext->smsmsg.data);\r