From: CCC <2393524978@qq.com> Date: Wed, 20 Dec 2023 07:50:02 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9650c2cdf059cbf99afd8ae4bb496438a62a0755;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_DRINK.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_DRINK.mp3 new file mode 100644 index 00000000..a60b9bc7 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_DRINK.mp3 differ diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_HOME.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_HOME.mp3 new file mode 100644 index 00000000..81f54f1e Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_HOME.mp3 differ diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_MEDICINE.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_MEDICINE.mp3 new file mode 100644 index 00000000..6aeb41c5 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_MEDICINE.mp3 differ diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_REST_BEGIN.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_REST_BEGIN.mp3 new file mode 100644 index 00000000..99ba3a08 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_REST_BEGIN.mp3 differ diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_REST_END.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_REST_END.mp3 new file mode 100644 index 00000000..fcd84804 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_REST_END.mp3 differ diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_SLEEP.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_SLEEP.mp3 new file mode 100644 index 00000000..120958c6 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_SLEEP.mp3 differ diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_WAKE_UP.mp3 b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_WAKE_UP.mp3 new file mode 100644 index 00000000..94d2c4d7 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/audio/AUDIO_REMIND_WAKE_UP.mp3 differ diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_NEW_SMS_SILENT.png b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_NEW_SMS_SILENT.png index ccd896d7..48d83ea3 100644 Binary files a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_NEW_SMS_SILENT.png and b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/resource/png/setting/ICON_SETTING_NEW_SMS_SILENT.png differ diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c index e85d0392..b5ecba73 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c @@ -883,6 +883,12 @@ const void * lang_text_ch[] = { "小图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, "工具箱", // WATCH_TEXT_ID_TOOL, "该起床了", // WATCH_TEXT_ID_WAKE_UP_PROMPT, + "该睡觉了", // WATCH_TEXT_ID_SLEEP_PROMPT, + "该休息了", // WATCH_TEXT_ID_REST_BEGIN_PROMPT, + "休息结束了", // WATCH_TEXT_ID_REST_END_PROMPT, + "该回家了", // WATCH_TEXT_ID_HOME_PROMPT, + "该吃药了", // WATCH_TEXT_ID_MEDICINE_PROMPT, + "该喝水了", // WATCH_TEXT_ID_DRINK_PROMPT, "上传照片？", // WATCH_TEXT_ID_UPLOAD_PHOTO_Q, "发送", // WATCH_TEXT_ID_COMMON_SEND, "发送中", // WATCH_TEXT_ID_COMMON_SENDING, diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c index 55757efa..536e08d0 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c @@ -884,6 +884,12 @@ const void * lang_text_en[] = { "Small icon", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, "Tool", // WATCH_TEXT_ID_TOOL, "time to wake up", // WATCH_TEXT_ID_WAKE_UP_PROMPT, + "time to sleep", // WATCH_TEXT_ID_SLEEP_PROMPT, + "time to rest", // WATCH_TEXT_ID_REST_BEGIN_PROMPT, + "rest finished", // WATCH_TEXT_ID_REST_END_PROMPT, + "time to go home", // WATCH_TEXT_ID_HOME_PROMPT, + "time to take medicine", // WATCH_TEXT_ID_MEDICINE_PROMPT, + "time to drink", // WATCH_TEXT_ID_DRINK_PROMPT, "Upload photo?", // WATCH_TEXT_ID_UPLOAD_PHOTO_Q, "Send", // WATCH_TEXT_ID_COMMON_SEND, "Sending", // WATCH_TEXT_ID_COMMON_SENDING, diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h index 823cc3a9..f858d973 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -890,6 +890,12 @@ enum WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, /* "小图标" "Small icon" */ WATCH_TEXT_ID_TOOL, /* "工具箱" "Tool" */ WATCH_TEXT_ID_WAKE_UP_PROMPT, /* "该起床了" "time to wake up" */ + WATCH_TEXT_ID_SLEEP_PROMPT, /* "该睡觉了" "time to sleep" */ + WATCH_TEXT_ID_REST_BEGIN_PROMPT, /* "该休息了" "time to rest" */ + WATCH_TEXT_ID_REST_END_PROMPT, /* "休息结束了" "rest finished" */ + WATCH_TEXT_ID_HOME_PROMPT, /* "该回家了" "time to go home" */ + WATCH_TEXT_ID_MEDICINE_PROMPT, /* "该吃药了" "time to take medicine" */ + WATCH_TEXT_ID_DRINK_PROMPT, /* "该喝水了" "time to drink" */ WATCH_TEXT_ID_UPLOAD_PHOTO_Q, /* "上传照片？" "Upload photo?" */ WATCH_TEXT_ID_COMMON_SEND, /* "发送" "Send" */ WATCH_TEXT_ID_COMMON_SENDING, /* "发送中" "Sending" */ diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h index bbbfdaa1..b2de9bfa 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h @@ -46,6 +46,20 @@ extern "C" { #if defined(__MMI_REMIND_SLEEP_SUPPORT__) || defined(__MMI_CUSTOM_HENG_AI__) #define AUDIO_REMIND_SLEEP "R:/audio/AUDIO_REMIND_SLEEP.mp3" #endif +#ifdef __MMI_REMIND_REST_SUPPORT__ +#define AUDIO_REMIND_REST_BEGIN "R:/audio/AUDIO_REMIND_REST_BEGIN.mp3" +#define AUDIO_REMIND_REST_END "R:/audio/AUDIO_REMIND_REST_END.mp3" +#endif +#ifdef __MMI_REMIND_HOME_SUPPORT__ +#define AUDIO_REMIND_HOME "R:/audio/AUDIO_REMIND_HOME.mp3" +#endif +#if defined(__MMI_REMIND_MEDICINE_SUPPORT__) || defined(__MMI_REMIND_CUSTOM_MEDICINE_SUPPORT__) +#define AUDIO_REMIND_MEDICINE "R:/audio/AUDIO_REMIND_MEDICINE.mp3" +#endif +#ifdef __MMI_REMIND_DRINK_SUPPORT__ +#define AUDIO_REMIND_DRINK "R:/audio/AUDIO_REMIND_DRINK.mp3" +#endif + #ifdef __MMI_SEDENTARY_REMIND_SUPPORT__ #define AUDIO_REMIND_SEDENTARY "R:/audio/AUDIO_REMIND_SEDENTARY.mp3" #endif diff --git a/2.sdk/sdk/gui/lv_watch/mmi_default.h b/2.sdk/sdk/gui/lv_watch/mmi_default.h index f471898c..d36fa4ff 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_default.h +++ b/2.sdk/sdk/gui/lv_watch/mmi_default.h @@ -208,6 +208,26 @@ extern "C" #define MMI_WHITE_LIST_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open #endif +// low battery switch +#ifdef MMI_CUSTOMER_LOW_BATTERY_SWITCH +#define MMI_LOW_BATTERY_SWITCH_DEFAULT MMI_CUSTOMER_LOW_BATTERY_SWITCH +#else +#define MMI_LOW_BATTERY_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open +#endif + +// fall down switch +#ifdef MMI_CUSTOMER_FALL_DOWN_SWITCH +#define MMI_FALL_DOWN_SWITCH_DEFAULT MMI_CUSTOMER_FALL_DOWN_SWITCH +#else +#define MMI_FALL_DOWN_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open +#endif + +// take off switch +#ifdef MMI_CUSTOMER_TAKE_OFF_SWITCH +#define MMI_TAKE_OFF_SWITCH_DEFAULT MMI_CUSTOMER_TAKE_OFF_SWITCH +#else +#define MMI_TAKE_OFF_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open +#endif //main menu style #ifdef MMI_CUSTOMER_MAIN_MENU_STYLE