From: @CHENG <2393524978@qq.com>
Date: Tue, 27 Feb 2024 08:37:04 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=2b205c0e0cc3449bf931f041a9454970cf4f5fb1;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c
index aff8dab7..aba01956 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_tcms.c
@@ -38,9 +38,13 @@ void mmi_hengai_tcms_action(void)
 {
 	HENGAI_TCMS_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 
+	if(true == mmi_watch_is_in_factory_mode())
+		return ;
+
 	if(true == mmi_health_measure_state_is_in_measure())
 		return;
 
+	HENGAI_TCMS_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 	mmi_hsensor_yyl_measure_start();
 	s_hengai_tcms_check_flag = 1;
 }
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h
index 9833a0ce..5dee672b 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode.h
@@ -266,6 +266,7 @@ void camera_preview_test_stop(void);
 
 
 #ifdef __MMI_ZHSX_SUPPORT__
+bool mmi_watch_is_in_factory_mode(void);
 void mmi_watch_reset(lv_obj_t * activity_obj);
 #endif
 
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
index 5101c5b0..f648f658 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_main.c
@@ -113,6 +113,11 @@ const struct {
 //#endif
 };
 
+
+#ifdef __MMI_ZHSX_SUPPORT__
+static bool s_is_in_factory_mode = false;
+#endif
+
 /**********************
  *      MACROS
  **********************/
@@ -221,6 +226,10 @@ lv_obj_t * factorymode_main_create(lv_obj_t * activity_obj)
 
     lv_obj_set_click(list, true);
 
+#ifdef __MMI_ZHSX_SUPPORT__
+	s_is_in_factory_mode = true;
+#endif
+	
     return obj;
 
 }
@@ -374,7 +383,23 @@ static void factorymode_main_prepare_destory(lv_obj_t * activity_obj)
     lv_watch_png_cache_all_free();
     watch_set_suspend_enable(true, ACT_ID_FACTORY_MODE_MAIN, 0);
     watch_set_suspend_enable(true, ACT_ID_FACTORY_MODE_TEST, 0);
+
+#ifdef __MMI_ZHSX_SUPPORT__
+	s_is_in_factory_mode = false;
+#endif
+
+#ifdef __MMI_CUSTOM_HENGAI_TCMS__
+	mmi_hengai_tcms_action();
+#endif
+}
+
+#ifdef __MMI_ZHSX_SUPPORT__
+bool mmi_watch_is_in_factory_mode(void)
+{
+	printf("[@CHENG_DEBUG][%s][%d]:%d\n", __FUNCTION__, __LINE__, (s_is_in_factory_mode ? 1 : 0));
+	return s_is_in_factory_mode;
 }
+#endif
 
 static void factorymode_autotest_create_btn_event_cb(lv_obj_t * btn, lv_event_t e)
 {
diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
index bc104b4b..f86930b7 100644
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
@@ -158,26 +158,17 @@ static void factorymode_test_prepare_destory(lv_obj_t * activity_obj)
 		#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
 		case FAC_TEMPERATURE:
 			mmi_tsensor_close();
-			#ifdef __MMI_CUSTOM_HENGAI_TCMS__
-			mmi_hengai_tcms_action();
-			#endif
 			break;
 		#endif
 			
 		#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 		case FAC_HEART:
 			mmi_hsensor_close();
-			#ifdef __MMI_CUSTOM_HENGAI_TCMS__
-			mmi_hengai_tcms_action();
-			#endif
 			break;
 		
 		#ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
 		case FAC_SPO2:
 			mmi_hsensor_close();
-			#ifdef __MMI_CUSTOM_HENGAI_TCMS__
-			mmi_hengai_tcms_action();
-			#endif
 			break;
 		#endif
 		#endif
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 552c99ee..1f5a7720 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
@@ -951,6 +951,12 @@ void mmi_health_measure_factory_mode_clean(void)
 	{
 		mmi_health_measure_interrupt();
 	}
+#ifdef __MMI_CUSTOM_HENGAI_TCMS__
+	else
+	{
+		mmi_hsensor_close();
+	}
+#endif
 	_lv_memset_00(&s_health_measure_run_data, sizeof(s_health_measure_run_data));
 }