充电时不测量健康数据，不上传健康测量结果

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h
index f19cade..eea912b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h
@@ -51,10 +51,10 @@ char * __hengai_data_send_end_time(void);
 
 #define MMI_HENGAI_BP_RAW_DATA_LEN     (4860) // base on sample rate
 
-#define MMI_HENGAI_BP_HIGH_VALUE_MAX   (200)
-#define MMI_HENGAI_BP_HIGH_VALUE_MIN   (100)
+#define MMI_HENGAI_BP_HIGH_VALUE_MAX   (210)
+#define MMI_HENGAI_BP_HIGH_VALUE_MIN   (80)
 #define MMI_HENGAI_BP_LOW_VALUE_MAX    (120)
-#define MMI_HENGAI_BP_LOW_VALUE_MIN    (60)
+#define MMI_HENGAI_BP_LOW_VALUE_MIN    (50)
 
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c
index 58d8d90..1d2e43b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dial/dial_element.c
@@ -669,6 +669,7 @@ static void dial_update_canvas_label(watch_element_base_t * base)
                 break;
             case LABEL_TYPE_HAPPINESS:
                                //if(health_info.happiness_value)
+                               #ifdef MMI_PROJECT_Z5_HA_K18_NFC
                                float happiness_value = mmi_hengai_happiness_value_get();
                                if(happiness_value)
                                {
@@ -703,6 +704,7 @@ static void dial_update_canvas_label(watch_element_base_t * base)
                        sprintf(infotxt, "--");
                                        x_offset = 35;
                                }
+                               #endif
                 dial_create_canvas_text(infotxt, label_dsc->label_font, label_dsc->text_color, pos.x + label_dsc->text_pos.x + x_offset, pos.y + label_dsc->text_pos.y);
                 break;
             case LABEL_TYPE_SLEEP_QUALITY:

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 b1312e9..f3efb5f 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
@@ -708,6 +708,9 @@ bool mmi_health_measure_spo2_data_ui_get(uint16_t * spo2_value)
 
 void mmi_health_measure_send_heart(void * param)
 {
+       if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
+               return ;
+       
        if(NULL == param)
        {
                HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
@@ -736,6 +739,9 @@ void mmi_health_measure_send_heart(void * param)
 
 void mmi_health_measure_send_temperature(void * param)
 {
+       if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
+               return ;
+       
        if(NULL == param)
        {
                HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
@@ -759,6 +765,9 @@ void mmi_health_measure_send_temperature(void * param)
 
 void mmi_health_measure_send_blood(void * param)
 {
+       if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
+               return ;
+       
        if(NULL == param)
        {
                HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
@@ -784,6 +793,9 @@ void mmi_health_measure_send_blood(void * param)
 
 void mmi_health_measure_send_spo2(void * param)
 {
+       if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
+               return ;
+       
        if(NULL == param)
        {
                HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
@@ -1082,7 +1094,7 @@ static void mmi_health_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type, uin
 
 bool mmi_health_measure_timed_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type)
 {
-#ifdef MMI_PROJECT_Z5_HA_K18_NFC
+#if 1 // def MMI_PROJECT_Z5_HA_K18_NFC
        if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
                return false;
 #endif
@@ -1126,7 +1138,7 @@ void mmi_health_measure_app_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type
 {
        HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 
-#ifdef MMI_PROJECT_Z5_HA_K18_NFC
+#if 1 // def MMI_PROJECT_Z5_HA_K18_NFC
        if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
                return ;
 #endif
@@ -1168,7 +1180,7 @@ void mmi_health_measure_app_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type
 
 void mmi_health_measure_ui_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type)
 {
-#ifdef MMI_PROJECT_Z5_HA_K18_NFC
+#if 1 // def MMI_PROJECT_Z5_HA_K18_NFC
        if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status())
                return ;
 #endif