gengxin

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png
similarity index 100%
rename from 2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png
rename to 2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png

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 185f657..a6bde4f 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
@@ -223,8 +223,6 @@
 
 #define __MMI_SEDENTARY_REMIND_SUPPORT__
 
-#define __MMI_REMIND_take_off_SUPPORT__
-
 #define __MMI_BP_CALIBRATE_SUPPORT__
 
 //#define __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__

diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_SOS.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_SOS.png
new file mode 100644 (file)
index 0000000..c48b1ce
Binary files /dev/null and b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/ICON_SOS.png differ

diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png
similarity index 100%
rename from 2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png
rename to 2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png

diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 485bf67..26eac8e 100644 (file)
--- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -170,6 +170,8 @@
 #define __MMI_WECHAT_SUPPORT__
 #define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__
 
+#define __MMI_MAIN_MENU_SWITCH_MENU__
+#define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
 #define __MMI_MAIN_MENU_FOUR_GRID_STYLE__
 
 #define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
@@ -223,8 +225,6 @@
 
 #define __MMI_SEDENTARY_REMIND_SUPPORT__
 
-#define __MMI_REMIND_take_off_SUPPORT__
-
 #define __MMI_BP_CALIBRATE_SUPPORT__
 
 #define __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png
similarity index 100%
rename from 2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png
rename to 2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 323c8bd..a7e53a3 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -228,8 +228,6 @@
 
 #define __MMI_SEDENTARY_REMIND_SUPPORT__
 
-#define __MMI_REMIND_take_off_SUPPORT__
-
 #define __MMI_BP_CALIBRATE_SUPPORT__
 
 #define __MMI_SLEEP_FUNCTION_SUPPORT__

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png
similarity index 100%
rename from 2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png
rename to 2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 2350571..561df18 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -228,8 +228,6 @@
 
 #define __MMI_SEDENTARY_REMIND_SUPPORT__
 
-#define __MMI_REMIND_take_off_SUPPORT__
-
 #define __MMI_BP_CALIBRATE_SUPPORT__
 
 #define __MMI_SLEEP_FUNCTION_SUPPORT__

diff --git a/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png b/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png
similarity index 100%
rename from 2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png
rename to 2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png

diff --git a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index bf4ba73..f4e34b3 100644 (file)
--- a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -200,7 +200,6 @@
 #define __MMI_SLEEP_FUNCTION_SUPPORT__
 #endif
 
-#define __MMI_REMIND_take_off_SUPPORT__
 
 #endif
 

diff --git a/2.sdk/project/Z5_Z11/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png b/2.sdk/project/Z5_Z11/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png
similarity index 100%
rename from 2.sdk/project/Z5_Z11/gui/lv_watch/resource/png/primary_function/one_page/IMAGE_ONE_PAGE_PHONE_INFO.png
rename to 2.sdk/project/Z5_Z11/gui/lv_watch/resource/png/primary_function/one_page/ICON_SOS.png

diff --git a/2.sdk/project/Z5_Z11/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_Z11/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index b9fbcaa..b23a7b2 100644 (file)
--- a/2.sdk/project/Z5_Z11/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_Z11/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -222,8 +222,6 @@
 
 #define __MMI_USER_PROFILE_SUPPORT__
 
-#define __MMI_REMIND_take_off_SUPPORT__
-
 #define __MMI_BP_CALIBRATE_SUPPORT__
 
 #define __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__