gengxin

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
index 490054b..be5b077 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
@@ -36,6 +36,8 @@
 
 #define MMI_CUSTOMER_MEASURE_SPO2_DURATION             (34 * 1000) // unit:ms
 
+#define MMI_CUSTOMER_MEASURE_BLOOD_GLUCOSE_DURATION            (20 * 1000) // unit:ms
+
 
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG          false
@@ -54,6 +56,10 @@
 
 #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_FLAG          false
+
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_INTERVAL              (60 * 60) // unit:s
+
 
 //default language
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
@@ -96,6 +102,16 @@
 // low battery
 #define MMI_CUSTOMER_LOW_BATTERY_SWITCH                (MMI_WATCH_SWITCH_ON)
 
+// schedule power on/off
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH          (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR            (6) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE          (0) // 0-59
+
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH         (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR           (23) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE         (59) // 0-59
+
+
 #endif
 
 

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png
deleted file mode 100644 (file)
index adc704b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png
deleted file mode 100644 (file)
index 74e8193..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png
deleted file mode 100644 (file)
index ba173aa..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png
deleted file mode 100644 (file)
index 9033179..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png
deleted file mode 100644 (file)
index 58fa52b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index a5cc8d6..44bc307 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -163,9 +163,7 @@
 #endif
 
 //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
 //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
 
 #define __MMI_WECHAT_SUPPORT__
 #define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h
index 490054b..be5b077 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h
@@ -36,6 +36,8 @@
 
 #define MMI_CUSTOMER_MEASURE_SPO2_DURATION             (34 * 1000) // unit:ms
 
+#define MMI_CUSTOMER_MEASURE_BLOOD_GLUCOSE_DURATION            (20 * 1000) // unit:ms
+
 
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG          false
@@ -54,6 +56,10 @@
 
 #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_FLAG          false
+
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_INTERVAL              (60 * 60) // unit:s
+
 
 //default language
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
@@ -96,6 +102,16 @@
 // low battery
 #define MMI_CUSTOMER_LOW_BATTERY_SWITCH                (MMI_WATCH_SWITCH_ON)
 
+// schedule power on/off
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH          (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR            (6) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE          (0) // 0-59
+
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH         (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR           (23) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE         (59) // 0-59
+
+
 #endif
 
 

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png
deleted file mode 100644 (file)
index adc704b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png
deleted file mode 100644 (file)
index 74e8193..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png
deleted file mode 100644 (file)
index ba173aa..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png
deleted file mode 100644 (file)
index 9033179..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png
deleted file mode 100644 (file)
index 58fa52b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index c6af105..be81e8a 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -163,9 +163,7 @@
 #endif
 
 //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
 //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
 
 //#define __MMI_WECHAT_SUPPORT__
 //#define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
index 490054b..be5b077 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
@@ -36,6 +36,8 @@
 
 #define MMI_CUSTOMER_MEASURE_SPO2_DURATION             (34 * 1000) // unit:ms
 
+#define MMI_CUSTOMER_MEASURE_BLOOD_GLUCOSE_DURATION            (20 * 1000) // unit:ms
+
 
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG          false
@@ -54,6 +56,10 @@
 
 #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_FLAG          false
+
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_INTERVAL              (60 * 60) // unit:s
+
 
 //default language
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
@@ -96,6 +102,16 @@
 // low battery
 #define MMI_CUSTOMER_LOW_BATTERY_SWITCH                (MMI_WATCH_SWITCH_ON)
 
+// schedule power on/off
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH          (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR            (6) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE          (0) // 0-59
+
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH         (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR           (23) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE         (59) // 0-59
+
+
 #endif
 
 

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png
deleted file mode 100644 (file)
index adc704b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png
deleted file mode 100644 (file)
index 74e8193..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png
deleted file mode 100644 (file)
index ba173aa..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png
deleted file mode 100644 (file)
index 9033179..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png
deleted file mode 100644 (file)
index 58fa52b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png and /dev/null differ

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 4185796..78abac4 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
@@ -163,9 +163,7 @@
 #endif
 
 #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
 #define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
 
 #define __MMI_WECHAT_SUPPORT__
 #define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/mmi_default_CUSTOM.h
index 490054b..be5b077 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/mmi_default_CUSTOM.h
@@ -36,6 +36,8 @@
 
 #define MMI_CUSTOMER_MEASURE_SPO2_DURATION             (34 * 1000) // unit:ms
 
+#define MMI_CUSTOMER_MEASURE_BLOOD_GLUCOSE_DURATION            (20 * 1000) // unit:ms
+
 
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG          false
@@ -54,6 +56,10 @@
 
 #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_FLAG          false
+
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_INTERVAL              (60 * 60) // unit:s
+
 
 //default language
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
@@ -96,6 +102,16 @@
 // low battery
 #define MMI_CUSTOMER_LOW_BATTERY_SWITCH                (MMI_WATCH_SWITCH_ON)
 
+// schedule power on/off
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH          (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR            (6) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE          (0) // 0-59
+
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH         (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR           (23) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE         (59) // 0-59
+
+
 #endif
 
 

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png
deleted file mode 100644 (file)
index adc704b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_0.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png
deleted file mode 100644 (file)
index 74e8193..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_1.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png
deleted file mode 100644 (file)
index ba173aa..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_2.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png
deleted file mode 100644 (file)
index 9033179..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_3.png and /dev/null differ

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png b/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png
deleted file mode 100644 (file)
index 58fa52b..0000000
Binary files a/2.sdk/project/Z5_DS_Z12XG_DTM_SHJK/gui/lv_watch/resource/png/signal/signal/icon_signal_4.png and /dev/null differ

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 f4acbf4..f1c929c 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
@@ -163,9 +163,7 @@
 #endif
 
 #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
 #define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
 
 #define __MMI_WECHAT_SUPPORT__
 #define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__

diff --git a/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
index 490054b..be5b077 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
@@ -36,6 +36,8 @@
 
 #define MMI_CUSTOMER_MEASURE_SPO2_DURATION             (34 * 1000) // unit:ms
 
+#define MMI_CUSTOMER_MEASURE_BLOOD_GLUCOSE_DURATION            (20 * 1000) // unit:ms
+
 
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG          false
@@ -54,6 +56,10 @@
 
 #define MMI_CUSTOMER_SPO2_TIMED_INTERVAL               (60 * 60) // unit:s
 
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_FLAG          false
+
+#define MMI_CUSTOMER_BLOOD_GLUCOSE_TIMED_INTERVAL              (60 * 60) // unit:s
+
 
 //default language
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
@@ -96,6 +102,16 @@
 // low battery
 #define MMI_CUSTOMER_LOW_BATTERY_SWITCH                (MMI_WATCH_SWITCH_ON)
 
+// schedule power on/off
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH          (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR            (6) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE          (0) // 0-59
+
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH         (MMI_WATCH_SWITCH_ON)
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR           (23) // 0-23
+#define MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE         (59) // 0-59
+
+
 #endif
 
 

diff --git a/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 642bf55..427fc5c 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -163,9 +163,7 @@
 #endif
 
 #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__
 #define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__
-//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__
 
 #define __MMI_WECHAT_SUPPORT__
 #define __MMI_WECHAT_RECEIVE_AUDIO_USE_MP3__