gengxin

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
index 7841cc0..062dfd8 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
@@ -639,7 +639,7 @@
 
 // fall detect
 #define MMI_CUSTOMER_FALL_DETECT_THRESHOLD             (7)
-#define MMI_CUSTOMER_FALL_COUNTER_THRESHOLD            (10)
+#define MMI_CUSTOMER_FALL_COUNTER_THRESHOLD            (12) // (10)
 
 
 

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 5cd98be..d911544 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -203,7 +203,7 @@
 
 #define __MMI_POWER_ON_OFF_NO_RING__
 
-#define __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__
+//#define __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__
 
 #define __MMI_KEY_BACK_RUN_PHONEBOOK_WHEN_IN_DIAL__
 
@@ -227,7 +227,7 @@
 
 #define __MMI_REMIND_DRINK_SUPPORT__
 
-#define __MMI_SEDENTARY_REMIND_SUPPORT__
+//#define __MMI_SEDENTARY_REMIND_SUPPORT__
 
 #define __MMI_BP_CALIBRATE_SUPPORT__
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
index adc5798..97fafa6 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
@@ -12,10 +12,18 @@ static uint8_t s_remind_index = 0;
 static mmi_remind_screen_info_t s_remind_info[] =
 {
 #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
+       #if defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH)
+       { MMI_REMIND_TYPE_WAKE_UP, WATCH_TEXT_ID_SEDENTARY_PROMPT, AUDIO_REMIND_SEDENTARY, NULL},
+       #else
        { MMI_REMIND_TYPE_WAKE_UP, WATCH_TEXT_ID_WAKE_UP_PROMPT, AUDIO_REMIND_WAKE_UP, NULL},
+       #endif
 #endif
 #ifdef __MMI_REMIND_SLEEP_SUPPORT__
+       #if defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH)
+       { MMI_REMIND_TYPE_SLEEP, WATCH_TEXT_ID_MEDICINE_PROMPT, AUDIO_REMIND_MEDICINE, NULL},
+       #else
        { MMI_REMIND_TYPE_SLEEP, WATCH_TEXT_ID_SLEEP_PROMPT, AUDIO_REMIND_SLEEP, NULL},
+       #endif
 #endif
 #ifdef __MMI_REMIND_REST_SUPPORT__
        { MMI_REMIND_TYPE_REST_BEGIN, WATCH_TEXT_ID_REST_BEGIN_PROMPT, AUDIO_REMIND_REST_BEGIN, NULL},

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
index e853e3f..af7ca06 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
@@ -29,6 +29,44 @@ static mmi_watch_list_item_t settingList[] =
 {
 #ifdef __MMI_ZHSX_SUPPORT__
 
+#if defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH)
+       #if USE_LV_WATCH_QRCODE != 0
+       #ifdef __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
+       { ICON_SETTING_QRCODE, WATCH_TEXT_ID_APP_DEVICE_QRCODE, mmi_app_and_device_qrcode_create_event_cb },
+       #else
+       { ICON_SETTING_QRCODE, WATCH_TEXT_ID_DEVICE_QRCODE, qrcode_create_event_cb },
+       #endif
+       #endif
+       #if USE_LV_WATCH_SETTING_VOLUME != 0
+    { ICON_SETTING_VOLUME, WATCH_TEXT_ID_VOLUME_ADJUST, setting_volume_create_btn_action },
+       #endif
+       #if USE_LV_WATCH_SETTING_BRIGHTNESS != 0
+    //{ ICON_SETTING_BRIGHTNESS, WATCH_TEXT_ID_BRIGHTNESS_ADJUST, setting_brightness_create_btn_action },
+       #endif
+       #ifdef __MMI_USER_PROFILE_SUPPORT__
+       { ICON_SETTING_USER_PROFILE_MODE, WATCH_TEXT_ID_USER_PROFILE_MODE, mmi_user_profile_create_event_cb },
+       #endif
+       #ifdef __MMI_PAGE_MAIN_MENU_TTS_SUPPORT__
+       { ICON_SETTING_PAGE_MAIN_MENU_TTS, WATCH_TEXT_ID_PAGE_MAIN_MENU_TTS, setting_page_main_menu_tts_create_event_cb },
+       #endif
+       #ifdef __MMI_NEW_SMS_SILENT_SUPPORT__
+       { ICON_SETTING_NEW_SMS_SILENT, WATCH_TEXT_ID_NEW_SMS_SILENT, setting_new_sms_silent_create_event_cb },
+       #endif
+       #ifdef __MMI_BP_CALIBRATE_SUPPORT__
+       { BlOOD_PRESSURE_LIST_PNG, WATCH_TEXT_ID_Blood_pressure_calibration, setting_Blood_pressure_create_event_cb },
+       #endif
+       #if USE_LV_WATCH_RESTART_AND_RESET != 0
+    { ICON_SETTING_RESET, WATCH_TEXT_ID_RESTART_AND_RESET, restart_and_reset_create_btn_action },
+       #endif
+       #if USE_LV_WATCH_SHUTDOWN != 0
+    { ICON_SETTING_SHUTDOWN, WATCH_TEXT_ID_SHUTDOWN, shutdown_create_btn_action },
+       #endif
+       #if USE_LV_WATCH_SETTING_ABOUT != 0
+       { ICON_SETTING_ABOUT, WATCH_TEXT_ID_ABOUT_WATCH, setting_about_create_btn_action },
+       #endif
+
+#else
+
     //{ ICON_SETTING_LANGUAGE, WATCH_TEXT_ID_LANGUAGE_SWITCH, language_create_btn_action },
 #if USE_LV_WATCH_DIAL_SWITCH != 0
    // { ICON_SETTING_DAIL_FORMAT_SWITCH, WATCH_TEXT_ID_DAIL_REPLACE, dial_switch_create_btn_action },
@@ -80,6 +118,8 @@ static mmi_watch_list_item_t settingList[] =
        { ICON_SETTING_ABOUT, WATCH_TEXT_ID_ABOUT_WATCH, setting_about_create_btn_action },
 #endif
 
+#endif
+
 #else // __MMI_ZHSX_SUPPORT__
 
 #if USE_LV_BLUETOOTH != 0

diff --git a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
index 903917c..1b0a4bd 100644 (file)
--- a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
+++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
@@ -1031,6 +1031,8 @@ static void keypad_watch_cb(struct keypad_param *arg)
                     //sos_btn_action(NULL);
                                #ifdef __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__
                                        mmi_key_power_long_press_action();
+                               #elif defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH)
+                                       sos_create_event_cb(NULL, LV_EVENT_CLICKED);
                                #endif
                 }
             } else if(arg->key_event == KEY_EVENT_POWER_ON) {