gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
index 03cafcf..1d65a69 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
@@ -353,7 +353,9 @@ void watch_ui_message_handle(uint16_t msgid, void * msg)
             break;
 #endif
                case MMI_APP_ADAPTOR_SOS_KEY_UI_HANDLE_CMD:
+                       #if USE_SOS_KEY
                        sos_key_ui_handle();
+                       #endif
                        break;
 
        #ifdef __MMI_ZHSX_SUPPORT__

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 7f7e941..44f16ea 100644 (file)
--- 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
@@ -128,9 +128,13 @@ typedef struct
 
 enum
 {
-    #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ 
+       #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
+       #if USE_HX3918
         AUTOTEST_light_leak_test= 0,
         AUTOTEST_PRESS_KEY,
+       #else
+               AUTOTEST_PRESS_KEY=0,
+       #endif
     #else
         AUTOTEST_PRESS_KEY=0,
     #endif

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c
index 2d06619..898abff 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c
@@ -46,9 +46,11 @@ static void  autotest_stoptest_btn_event_cb(lv_obj_t * btn, lv_event_t e);
 static void autotest_connect_stopbtn_event_cb(lv_obj_t * btn, lv_event_t e);
 static void camera_test_destory(void);
 static bool autotest_is_testmode_match_obj(void);
-
+#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
+#if USE_HX3918
 void autotest_light_leak_test_create(lv_obj_t * par);
-
+#endif
+#endif
 extern char * gcvt(double value, int32_t ndigit, char * buf);
 /**********************
  *  STATIC VARIABLES
@@ -59,8 +61,10 @@ const struct {
     watchLangTxtId_t txtId;
     autotest_item_create item_create;
 } autotest_itemlist[] = {
-    #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
+       #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
+       #if USE_HX3918
     { AUTOTEST_light_leak_test, WATCH_TEXT_ID_LIGHT_LEAK_TEST,autotest_light_leak_test_create },
+       #endif
     #endif
     { AUTOTEST_PRESS_KEY, WATCH_TEXT_ID_PRESS_KEY, autotest_presskey_create },
     { AUTOTEST_VERSION_INFO, WATCH_TEXT_ID_VERSION_AND_CALI, autotest_versioninfo_create },
@@ -172,7 +176,8 @@ watchLangTxtId_t autotest_get_item_textId(uint8_t num)
     return autotest_itemlist[num].txtId;
 }
 
-#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
+#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
+#if USE_HX3918
 void autotest_light_leak_test_create(lv_obj_t * par)
 {
        lv_obj_t * content = lv_cont_create(par, NULL);
@@ -206,8 +211,9 @@ void autotest_light_leak_test_create(lv_obj_t * par)
    
 }
 #endif
+#endif
 
-#ifdef __MMI_ZHSX_SUPPORT__
+#if defined(__MMI_ZHSX_SUPPORT__) && (USE_SOS_KEY)
 
 static uint8_t s_key_power_checked = 0;
 static uint8_t s_key_back_checked = 0;

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 4098972..e61c74c 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
@@ -563,9 +563,11 @@ static void factorymode_init_testmodule(void)
     ext->istest[AUTOTEST_SIMCARD] = true;
 #endif
 
-#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
+#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
+#if USE_HX3918
     ext->istest[AUTOTEST_light_leak_test] = true;
 #endif
+#endif
 
 #if FACTORY_MODE_CALL != 0
     ext->istest[AUTOTEST_CALL] = true;

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
index 985362e..b244861 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -520,10 +520,12 @@ void mmi_ui_msg_update_falldwon(void)
 void mmi_ui_msg_tp_go_back(void)
 {
 #if defined(MMI_PROJECT_Z5_DS_Z11_COMMON) || defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH)
+       #if USE_SOS_KEY
        if(true == autotest_key_back_event())
        {
                return;
        }
+       #endif
        
        lv_watch_go_back();
 #endif