From: @CHENG <2393524978@qq.com>
Date: Wed, 24 Jan 2024 09:33:44 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5c3f6c2b666c43bbbfb97a9effbb652915d1f7ca;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c
index a775add4..bef7a64b 100644
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c
@@ -226,6 +226,8 @@ void mmi_hsensor_bp_measure_start(void)
 
 #if USE_FR8012HAQ
     fr8012haq_measure_bp_start();
+#else
+	mmi_hsensor_hr_measure_start();
 #endif
 
 }
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 047ee42c..2f8485ea 100644
--- 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
@@ -88,6 +88,21 @@ void mmi_hengai_bp_raw_data_free(void)
 }
 
 
+void mmi_hengai_bp_back_measure_finish(void)
+{
+	mmi_hengai_bp_raw_data_fill();
+	mmi_hengai_bp_measure_action_time_string_set(0);
+	mmi_hengai_bp_measuring_flag_set(false);
+	mmi_hengai_bp_measure_raw_data_send();	
+}
+
+void mmi_hengai_bp_back_measure_action(void)
+{
+	mmi_hengai_bp_measure_action_time_string_set(1);
+	mmi_hengai_bp_measuring_flag_set(true);
+}
+
+
 static lv_obj_t * mmi_bp_screen_common_bottom_button_create(lv_obj_t * par, uint32_t text_id, lv_event_cb_t event_cb)
 {
 	lv_obj_t * imgbtn = lv_imgbtn_create(par, NULL);
@@ -395,6 +410,12 @@ void mmi_ui_msg_update_hengai_bp_measure_result(bool state, uint16_t bp_value_hi
 		
 		mmi_protocol_action_send_blood(s_bp_value_high, s_bp_value_low);
 		mmi_hengai_bp_measure_result_screen(0);
+
+		nv_watch_health_info_t health_info = {0};
+		mmi_health_info_get(&health_info);
+		health_info.blood_high_value = bp_value_high;
+		health_info.blood_low_value = bp_value_low;
+		mmi_health_info_set(&health_info);
 	}
 	else
 	{
@@ -536,7 +557,7 @@ void mmi_hengai_bp_measure_start_btn_event_cb(lv_obj_t * obj, lv_event_t e)
 	else
 	{
 		HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-		mmi_hsensor_bp_open();
+		mmi_hsensor_blood_open();
 		mmi_hengai_bp_measure_action_time_string_set(1);
 		mmi_hengai_bp_measuring_flag_set(true);
 		s_hengai_bp_measure_count = 0;
@@ -1334,7 +1355,7 @@ void mmi_heng_ai_bp_calibrate_start_screen(void)
 	else
 	{
 		HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-		mmi_hsensor_bp_open();
+		mmi_hsensor_blood_open();
 		mmi_hengai_bp_measure_action_time_string_set(1);
 		mmi_hengai_bp_measuring_flag_set(true);
 		s_hengai_bp_measure_count = 0;
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 73a5ad33..4b02ae4c 100644
--- 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
@@ -82,7 +82,9 @@ typedef struct
 
 
 
+void mmi_hengai_bp_back_measure_finish(void);
 
+void mmi_hengai_bp_back_measure_action(void);
 
 bool mmi_hengai_bp_measuring_flag_get(void);
 
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 738d0a60..8d22d581 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
@@ -38,7 +38,7 @@ void mmi_hsensor_blood_open(void)
 #if USE_FR8012HAQ
 	mmi_hsensor_close();
 #endif
-	mmi_hsensor_hr_measure_start();
+	mmi_hsensor_bp_measure_start();
 }
 
 void mmi_hsensor_spo2_open(void)
@@ -50,15 +50,6 @@ void mmi_hsensor_spo2_open(void)
 	mmi_hsensor_spo2_measure_start();
 }
 
-void mmi_hsensor_bp_open(void)
-{
-	HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-#if USE_FR8012HAQ
-	mmi_hsensor_close();
-#endif
-	mmi_hsensor_bp_measure_start();
-}
-
 bool mmi_hsensor_is_open(void)
 {
 	return true;
@@ -676,7 +667,11 @@ void mmi_health_measure_process_finish(void)
 			#ifdef __MMI_CUSTOM_HENGAI_TCMS__
 			mmi_hengai_tcms_action();
 			#endif
+			#ifdef __MMI_CUSTOM_HENGAI_HEALTH__
+			mmi_hengai_bp_back_measure_finish();
+			#else
 			mmi_health_measure_send_blood();
+			#endif
 			break;
 			
 		case MMI_HEALTH_MEASURE_SPO2:
@@ -797,6 +792,9 @@ static void mmi_health_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type, uin
 			case MMI_HEALTH_MEASURE_BLOOD:
 				s_measure_time_total = MMI_HEALTH_MEASURE_BLOOD_DURATION / MMI_HEALTH_MEASURE_CYCLE_DURATION;
 				mmi_hsensor_blood_open();
+				#ifdef __MMI_CUSTOM_HENGAI_HEALTH__
+				mmi_hengai_bp_back_measure_action();
+				#endif
 				break;
 				
 			case MMI_HEALTH_MEASURE_SPO2: