充电时不运行健康测量，与未佩戴时提示一致；校准前后的血压测量使用不同后端模型

diff --git a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 76de68e..6ea5214 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -196,7 +196,7 @@
 
 #define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
 
-#define __MMI_TOOL_MENU_SUPPORT__
+//#define __MMI_TOOL_MENU_SUPPORT__
 
 #if 0 != USE_LV_WATCH_WEATHER
 #define __MMI_WEATHER_MENU_SUPPORT__

diff --git a/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index c158f7d..d0ab2ac 100644 (file)
--- a/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -197,7 +197,7 @@
 
 #define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
 
-#define __MMI_TOOL_MENU_SUPPORT__
+//#define __MMI_TOOL_MENU_SUPPORT__
 
 #if 0 != USE_LV_WATCH_WEATHER
 #define __MMI_WEATHER_MENU_SUPPORT__

diff --git a/2.sdk/project/Z5_HA_K18_TP/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18_TP/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 4f4aac1..8d768e1 100644 (file)
--- a/2.sdk/project/Z5_HA_K18_TP/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18_TP/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -197,7 +197,7 @@
 
 #define __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
 
-#define __MMI_TOOL_MENU_SUPPORT__
+//#define __MMI_TOOL_MENU_SUPPORT__
 
 #if 0 != USE_LV_WATCH_WEATHER
 #define __MMI_WEATHER_MENU_SUPPORT__

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
index 532494b..87c0686 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
@@ -1076,7 +1076,7 @@ void mmi_hengai_bp_measure_cycle_timeout(void * para)
        if(MMI_HR_MEASURE_CHECK_COUNT > s_hengai_bp_measure_count)
        {
                HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-               if(false == mmi_health_measure_wear_state_get())
+               if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
                {
                        HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                        
@@ -1117,7 +1117,7 @@ void mmi_hengai_bp_measure_cycle_timeout(void * para)
                if(NULL == watch_ext)
                        return;
 
-               if(false == mmi_health_measure_wear_state_get())
+               if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
                {
                        HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                        mmi_hengai_bp_measuring_flag_set(false);
@@ -1211,7 +1211,7 @@ void mmi_hengai_bp_measure_start_btn_event_cb(lv_obj_t * obj, lv_event_t e)
        lv_obj_set_hidden(watch_ext->cont_prompt_1, true);
        lv_obj_t * cont = watch_ext->cont;
        
-       if(false == mmi_health_measure_wear_state_get())
+       if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
        {
                HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                lv_obj_t * img = lv_img_create(cont, NULL);
@@ -2099,7 +2099,7 @@ void mmi_hengai_bp_calibrate_cycle_timeout(void * para)
        if(MMI_HR_MEASURE_CHECK_COUNT > s_hengai_bp_measure_count)
        {
                HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-               if(false == mmi_health_measure_wear_state_get())
+               if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
                {
                        HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                        
@@ -2140,7 +2140,7 @@ void mmi_hengai_bp_calibrate_cycle_timeout(void * para)
                if(NULL == watch_ext)
                        return;
 
-               if(false == mmi_health_measure_wear_state_get())
+               if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
                {
                        HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                        mmi_hengai_bp_measuring_flag_set(false);
@@ -2210,7 +2210,7 @@ void mmi_heng_ai_bp_calibrate_start_screen(void)
                return;
 
        lv_obj_clean(watch_ext->cont);
-       if(false == mmi_health_measure_wear_state_get())
+       if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
        {
                lv_obj_t * img = lv_img_create(watch_ext->cont, NULL);
                lv_img_set_src(img, ICON_HENGAI_BP_ALERT);
@@ -2932,7 +2932,7 @@ lv_obj_t * mmi_heng_ai_bp_screen_create(lv_obj_t * activity_obj)
                lv_obj_set_click(label_1, false);
     }
 #endif
-       else if(false == mmi_health_measure_wear_state_get())
+       else if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
        {
                lv_watch_obj_set_anim_mode(watch_obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE);
                

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c
index e6da481..d9fb84c 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c
@@ -207,6 +207,11 @@ void mmi_hengai_tcp_bp_back_measure_raw_data_send(void)
        char imei[16 + 1] = {0};
        app_adp_get_imei_req(imei);
        temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei);
+
+       if(0 == mmi_hengai_bp_calibrated_flag_get())
+               temp_len += sprintf(json_data + temp_len, "\"model_type\":0,");
+       else
+               temp_len += sprintf(json_data + temp_len, "\"model_type\":1,");
        
        char * begin_time_str = mmi_hengai_bp_measure_action_time_string_get(1);
        temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str);
@@ -501,6 +506,11 @@ void mmi_hengai_tcp_bp_measure_raw_data_send(void)
        char imei[16 + 1] = {0};
        app_adp_get_imei_req(imei);
        temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei);
+
+       if(0 == mmi_hengai_bp_calibrated_flag_get())
+               temp_len += sprintf(json_data + temp_len, "\"model_type\":0,");
+       else
+               temp_len += sprintf(json_data + temp_len, "\"model_type\":1,");
        
        char * begin_time_str = mmi_hengai_bp_measure_action_time_string_get(1);
        temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", begin_time_str);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c
index e504c1b..ded0964 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/k18_nfc_experience_ui.c
@@ -816,6 +816,11 @@ void mmi_happiness_raw_data_send(void)
        char imei[16 + 1] = {0};
        app_adp_get_imei_req(imei);
        temp_len += sprintf(json_data + temp_len, "\"device_code\":\"%s\",", imei);
+
+       if(0 == mmi_hengai_bp_calibrated_flag_get())
+               temp_len += sprintf(json_data + temp_len, "\"model_type\":0,");
+       else
+               temp_len += sprintf(json_data + temp_len, "\"model_type\":1,");
        
        temp_len += sprintf(json_data + temp_len, "\"begin_time\":\"%s\",", s_happiness_begin_time_str);
 

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 fd25581..ddb5b92 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
@@ -84,7 +84,7 @@ static void health_heart_rate_measure_cycle_timeout(void * para)
        lv_heart_rate_obj_ext_t * ext = health_heart_rate_get_ext();
     if(NULL != ext) 
        {
-               if(false == mmi_health_measure_wear_state_get())
+               if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
                {
                        if(NULL != ext->cycle_timer_id)
                        {
@@ -248,7 +248,7 @@ lv_obj_t * health_heart_rate_create(lv_obj_t * activity_obj)
        lv_obj_set_click(label_value, false);
        ext->label_value = label_value;
 
-       if(false == mmi_health_measure_wear_state_get())
+       if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
        {
                ext->measure_state = STATE_HEART_RATE_MEASURE_FAIL;
        }

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 f3efb5f..b2d8009 100644 (file)
--- 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
@@ -929,6 +929,7 @@ static void mmi_health_measure_process_timer_handle(uint32_t para)
 {
        if(false == mmi_health_measure_wear_state_get()
                || (true == mmi_is_ACT_ID_FACTORY_MODE_MAIN())
+               || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
                )
        {
                HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: should not run to here\n", __FUNCTION__, __LINE__);

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 758ff6a..3127312 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
@@ -86,7 +86,7 @@ static void health_spo2_measure_cycle_timeout(void * para)
        lv_spo2_obj_ext_t * ext = health_spo2_get_ext();
     if(NULL != ext) 
        {
-               if(FALSE == mmi_health_measure_wear_state_get())
+               if(FALSE == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
                {
                        if(NULL != ext->cycle_timer_id)
                        {
@@ -244,7 +244,7 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj)
        lv_obj_set_click(label_value, false);
        ext->label_value = label_value;
 
-       if(false == mmi_health_measure_wear_state_get())
+       if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
        {
                ext->measure_state = STATE_SPO2_MEASURE_FAIL;
        }

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 3bbaa54..32e69de 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
@@ -86,7 +86,7 @@ static void health_temperature_measure_cycle_timeout(void * para)
        lv_temperature_obj_ext_t * ext = health_temperature_get_ext();
     if(NULL != ext) 
        {
-               if(false == mmi_health_measure_wear_state_get())
+               if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
                {
                        if(NULL != ext->cycle_timer_id)
                        {
@@ -260,7 +260,7 @@ lv_obj_t * health_temperature_create(lv_obj_t * activity_obj)
        lv_obj_set_click(label_value, false);
        ext->label_value = label_value;
 
-       if(false == mmi_health_measure_wear_state_get())
+       if(false == mmi_health_measure_wear_state_get() || (HAL_CHG_CONNECTED == Hal_Charger_Get_Status()))
        {
                ext->measure_state = STATE_TEMPERATURE_MEASURE_FAIL;
        }