gengxin

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 1efa2f0..b7191fc 100644 (file)
--- 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
@@ -82,13 +82,19 @@ const struct {
 #endif
 #if 1 // def __MMI_ZHSX_SUPPORT__
        #ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+       #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
        { WATCH_TEXT_ID_TEMPERATURE_TEST, mmi_factorymode_temperature_test_create_btn_cb },
+       #endif
+       #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
        { WATCH_TEXT_ID_HEART_TEST, mmi_factorymode_heart_test_create_btn_cb },
+       #ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
        { WATCH_TEXT_ID_SPO2_TEST, mmi_factorymode_spo2_test_create_btn_cb },
+       #endif
     #if USE_HX3918
     { WATCH_TEXT_ID_HANGING_CALI, mmi_factorymode_hanging_cali_create_btn_cb },
     #endif
        #endif
+       #endif
 #else
     { WATCH_TEXT_ID_SH_TEMP_MEASURE_START, factorymode_temperature_test_create_btn_cb },
     { WATCH_TEXT_ID_HR_BP_BO_TEST, factorymode_hr_bp_bo_test_create_btn_cb },

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 b7398b5..2149b2a 100644 (file)
--- 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
@@ -26,9 +26,15 @@ enum {
     GSENSOR,
 #if 1 // def __MMI_ZHSX_SUPPORT__
 #ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+       #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
        FAC_TEMPERATURE,
+       #endif
+       #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
     FAC_HEART,
+       #ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
     FAC_SPO2,
+       #endif
+       #endif
 #endif
 #else
     HEART_RATE,
@@ -88,13 +94,19 @@ static lv_obj_t * factorymode_gps_test_create(lv_obj_t * activity_obj);
 #if 1 // def __MMI_ZHSX_SUPPORT__
 static lv_obj_t * mmi_factorymode_gsensor_create(lv_obj_t * activity_obj);
 #ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
 static lv_obj_t * mmi_factorymode_temperature_test_create(lv_obj_t * activity_obj);
+#endif
+#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 static lv_obj_t * mmi_factorymode_heart_test_create(lv_obj_t * activity_obj);
+#ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
 static lv_obj_t * mmi_factorymode_spo2_test_create(lv_obj_t * activity_obj);
+#endif
 #if USE_HX3918
 static lv_obj_t * mmi_factorymode_hanging_cali_create(lv_obj_t * activity_obj);
 #endif
 #endif
+#endif
 #else
 static lv_obj_t * factorymode_gsensor_create(lv_obj_t * activity_obj);
 static void factorymode_hr_bp_bo_test_status_update(lv_anim_t * anim);
@@ -143,14 +155,23 @@ static void factorymode_test_prepare_destory(lv_obj_t * activity_obj)
 
 #if 1 // def __MMI_ZHSX_SUPPORT__
        #ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+               #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
                case FAC_TEMPERATURE:
                        mmi_tsensor_close();
                        break;
+               #endif
                        
+               #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
                case FAC_HEART:
+                       mmi_hsensor_close();
+                       break;
+               
+               #ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
                case FAC_SPO2:
                        mmi_hsensor_close();
                        break;
+               #endif
+               #endif
        #endif
 #else
         case HEART_RATE:
@@ -1643,6 +1664,7 @@ void factorymode_gsensor_create_btn_cb(lv_obj_t * btn,lv_event_t e)
 #if 1 // def __MMI_ZHSX_SUPPORT__
 #ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
 // temperature
+#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
 static void mmi_factorymode_temperature_update(lv_anim_t * anim)
 {
     char str[32]= {0};
@@ -1721,8 +1743,10 @@ void mmi_factorymode_temperature_test_create_btn_cb(lv_obj_t * btn,lv_event_t e)
                mmi_factorymode_temperature_test_create(NULL);
        }
 }
+#endif
 
 // heart
+#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 static void mmi_factorymode_heart_test_status_update(lv_anim_t * anim)
 {
     char str[32]= {0};
@@ -1804,6 +1828,7 @@ void mmi_factorymode_heart_test_create_btn_cb(lv_obj_t * btn,lv_event_t e)
 }
 
 // spo2
+#ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
 static void mmi_factorymode_spo2_test_status_update(lv_anim_t * anim)
 {
     char str[32]= {0};
@@ -1883,6 +1908,8 @@ void mmi_factorymode_spo2_test_create_btn_cb(lv_obj_t * btn,lv_event_t e)
         mmi_factorymode_spo2_test_create(NULL);
     }
 }
+#endif
+
 #if USE_HX3918
 
 #include "../../..//lv_drivers/indev/HX3918/hx3918.h"
@@ -2037,6 +2064,7 @@ void mmi_factorymode_hanging_cali_create_btn_cb(lv_obj_t * btn,lv_event_t e)
 }
 #endif
 #endif
+#endif
 
 #else