From: @CHENG <2393524978@qq.com> Date: Wed, 15 May 2024 06:39:46 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d324a64c42fe8479e9b84bbee1c2c3e80ade7ae4;p=mirrors%2FASR3603_Z5_DS.git gengxin --- diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_DEFAULT.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_DEFAULT.png new file mode 100644 index 00000000..ad905ef6 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_DEFAULT.png differ diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_ILLEGAL.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_ILLEGAL.png new file mode 100644 index 00000000..382feacb Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_ILLEGAL.png differ diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_NO_SIGNAL.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_NO_SIGNAL.png new file mode 100644 index 00000000..5bbfe0c2 Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_NO_SIGNAL.png differ diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_WAITTING.png b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_WAITTING.png new file mode 100644 index 00000000..a672bddf Binary files /dev/null and b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/resource/png/video_call/ICON_VIDEO_CALL_WAITTING.png differ diff --git a/2.sdk/sdk/gui/lv_watch/CMakeLists.txt b/2.sdk/sdk/gui/lv_watch/CMakeLists.txt index ab6fe582..984949ac 100644 --- a/2.sdk/sdk/gui/lv_watch/CMakeLists.txt +++ b/2.sdk/sdk/gui/lv_watch/CMakeLists.txt @@ -202,6 +202,7 @@ set(lv_watch_sources mmi_location/mmi_location.c mmi_sundry/mmi_sundry.c mmi_sundry/mmi_common.c + mmi_sundry/mmi_common_task.c framework/message/mmi_msg_zhsx.c #video call lv_apps/mmi_video_call/mmi_video_call.c @@ -213,6 +214,7 @@ set(lv_watch_sources lv_apps/health_measure/health_heart_rate.c lv_apps/health_measure/health_spo2.c lv_apps/health_measure/health_temperature.c + lv_apps/health_measure/health_atrial_fibrillation.c lv_apps/tool/tool.c lv_apps/mmi_remind/mmi_remind.c lv_apps/mmi_user_profile/mmi_user_profile.c diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h index 269555d4..f97d40f0 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h @@ -192,6 +192,9 @@ enum #endif #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ ACT_ID_HEALTH_MEASURE_TEMPERATURE, +#endif +#ifdef __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__ + ACT_ID_HEALTH_MEASURE_ATRIAL_FIBRILLATION, #endif ACT_ID_WATCH_SEARCHING, #if defined(__MMI_APP_QRCODE_MENU_SUPPORT__) || defined(__MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c index bf90e417..10c3d65d 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/launcher/launcher.c @@ -466,7 +466,9 @@ static void launcher_long_press_handler(lv_obj_t * tabview) lv_watch_png_cache_all_free(); lv_obj_t * launcher_act_obj = lv_watch_get_activity_obj(ACT_ID_LAUNCHER); if(launcher_act_obj == lv_watch_get_top_activity_obj()) { + #if USE_LV_WATCH_DIAL_SWITCH != 0 dial_switch_create(NULL, 0); + #endif } else { printf("not create dial switch when other act(e.g. phone) create above launcher\n"); } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c index 00080bae..6d4b4408 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client.c @@ -21,5 +21,10 @@ #include "mmi_jrtc_client_wulian.c" #endif +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_HZCH__ +#include "mmi_jrtc_client_hzch.c" +#endif + + #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c index f6098469..c4127a18 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c @@ -22,6 +22,10 @@ #include "mmi_video_call_wulian.c" #endif +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_HZCH__ +#include "mmi_video_call_hzch.c" +#endif + #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h index d1c054dd..1f311216 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h @@ -207,6 +207,7 @@ typedef struct { #define MMI_WATCH_VC_SECRET_LEN (16 + 1) #define MMI_WATCH_VC_TOKENS_LEN (128 + 1) #define MMI_WATCH_VC_UID_LEN (32 + 1) +#define MMI_WATCH_VC_NUMBER_LEN (16 + 1) @@ -237,6 +238,9 @@ uint8_t mmi_vc_get_call_volume(void); #include "mmi_video_call_wulian.h" #endif +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_HZCH__ +#include "mmi_video_call_hzch.h" +#endif #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c index 92ac5c81..908d45d8 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c @@ -256,6 +256,7 @@ static lv_obj_t * mmi_main_menu_style_one_page_display(lv_obj_t * tab, void * bt lv_tileview_add_element(lv_obj_get_parent(tab), btn); lv_obj_align(btn, cont, LV_ALIGN_CENTER, 0, 0); +#ifndef __MMI_PAGE_MAIN_MENU_NO_TEXT__ lv_obj_t * label = lv_label_create(cont, NULL); lv_obj_add_style(label, LV_LABEL_PART_MAIN, &MMI_MAIN_MENU_ONE_PAGE_STYLE_TEXT_FONT); lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL_CIRC); @@ -264,6 +265,7 @@ static lv_obj_t * mmi_main_menu_style_one_page_display(lv_obj_t * tab, void * bt lv_label_set_text_id(label, txtId); lv_obj_set_click(label, false); lv_obj_align(label, cont, LV_ALIGN_IN_BOTTOM_MID, 0, -20); +#endif return btn; } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c index 32265a8f..36435651 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c @@ -95,6 +95,43 @@ static mmi_page_main_menu_info_t s_main_menu_one_page[] = #endif {{ ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb}, AUDIO_MAIN_MENU_SETTINGS}, +#elif defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH) + {{ ICON_DIALPAD_ONE_PAGE, WATCH_TEXT_ID_DIALPAD, dialpad_create_event_cb}, AUDIO_MAIN_MENU_DIALPAD}, + {{ ICON_PHONEBOOK_ONE_PAGE, WATCH_TEXT_ID_PHONEBOOK, phonebook_create_btn_event_cb}, AUDIO_MAIN_MENU_PHONEBOOK}, + #if USE_LV_WATCH_SMS_MSG != 0 + {{ ICON_SMS_MSG_ONE_PAGE, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb}, AUDIO_MAIN_MENU_SMS}, + #endif + #ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__ + {{ ICON_CALLLOG_ONE_PAGE, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb}, AUDIO_MAIN_MENU_CALL_LOG}, + #endif + {{ ICON_SOS_ONE_PAGE, WATCH_TEXT_ID_SOS, sos_create_event_cb}, AUDIO_MAIN_MENU_SOS}, + #ifdef __MMI_PAGE_MAIN_MENU_ADD_WEATHER__ + #ifdef __MMI_WEATHER_MENU_SUPPORT__ + {{ ICON_WEATHER_ONE_PAGE, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb}, AUDIO_MAIN_MENU_WEATHER}, + #endif + #endif + + #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ + {{ ICON_HEART_RATE_ONE_PAGE, WATCH_TEXT_ID_PHYSICAL_EXAMINATION, health_heart_rate_create_event_cb}, AUDIO_MAIN_MENU_HEART_RATE}, + #endif + #ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__ + {{ ICON_SPO2_ONE_PAGE, WATCH_TEXT_ID_SPO2, health_spo2_create_event_cb}, AUDIO_MAIN_MENU_SPO2}, + #endif + #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ + {{ ICON_TEMPERATURE_ONE_PAGE, WATCH_TEXT_ID_TEMPERATURE, health_temperature_create_event_cb}, AUDIO_MAIN_MENU_TEMPERATURE}, + #endif + #ifdef __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__ + {{ ICON_ATRIAL_FIBRILLATION_ONE_PAGE, WATCH_TEXT_ID_ATRIAL_FIBRILLATION, health_atrial_fibrillation_create_event_cb}, AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION}, + #endif + + #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ + {{ ICON_VIDEOCALL_ONE_PAGE, WATCH_TEXT_ID_VIDEOCALL, mmi_video_call_create_event_cb}, AUDIO_MAIN_MENU_VIDEO_CALL}, + #endif + #ifdef __MMI_TOOL_MENU_SUPPORT__ + {{ ICON_TOOL_ONE_PAGE, WATCH_TEXT_ID_TOOL, mmi_tool_menu_create_event_cb}, AUDIO_MAIN_MENU_TOOL}, + #endif + {{ ICON_SETTING_ONE_PAGE, WATCH_TEXT_ID_SETTINGS, setting_create_event_cb}, AUDIO_MAIN_MENU_SETTINGS}, + #else {{ ICON_PHONEBOOK_ONE_PAGE, WATCH_TEXT_ID_PHONEBOOK, phonebook_create_btn_event_cb}, AUDIO_MAIN_MENU_PHONEBOOK}, diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c index 6bf3f287..5598313d 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c @@ -13,8 +13,10 @@ static const mmi_watch_list_item_t s_tool_menu_list[] = { ICON_TOOL_STOPWATCH, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb }, { ICON_TOOL_TIMER, WATCH_TEXT_ID_TIMER, timer_create_event_cb }, #ifdef __MMI_WEATHER_MENU_SUPPORT__ +#ifndef __MMI_PAGE_MAIN_MENU_ADD_WEATHER__ { ICON_TOOL_WEATHER, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb }, #endif +#endif #ifdef __MMI_CUSTOM_BEI_KE_RUI_SHENG__ { ICON_TOOL_AI, WATCH_TEXT_ID_AI_TALK, mmi_ai_talk_create_event_cb }, #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.h b/2.sdk/sdk/gui/lv_watch/lv_watch.h index 370090c9..877cc4fa 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.h @@ -175,6 +175,7 @@ extern "C" { #include "mmi_protocol/mmi_protocol_fzd.h" #include "mmi_protocol/mmi_protocol_sms.h" #include "mmi_sundry/mmi_sundry.h" +#include "mmi_sundry/mmi_common_task.h" #include "framework/message/mmi_msg_zhsx.h" #include "lv_apps/mmi_video_call/mmi_video_call.h" #include "lv_apps/mmi_wechat/wechat.h" @@ -182,6 +183,7 @@ extern "C" { #include "lv_apps/health_measure/health_heart_rate.h" #include "lv_apps/health_measure/health_spo2.h" #include "lv_apps/health_measure/health_temperature.h" +#include "lv_apps/health_measure/health_atrial_fibrillation.h" #include "lv_apps/tool/tool.h" #include "lv_apps/mmi_remind/mmi_remind.h" #include "lv_apps/mmi_user_profile/mmi_user_profile.h" 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 09e3f6af..e1c093f9 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h @@ -86,9 +86,17 @@ extern "C" { #endif #define AUDIO_MAIN_MENU_SOS "R:/audio/main_menu/AUDIO_MAIN_MENU_SOS.mp3" +#ifdef __MMI_PAGE_MAIN_MENU_ADD_WEATHER__ +#ifdef __MMI_WEATHER_MENU_SUPPORT__ +#define AUDIO_MAIN_MENU_WEATHER "R:/audio/main_menu/AUDIO_MAIN_MENU_WEATHER.mp3" +#endif +#endif #ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ #define AUDIO_MAIN_MENU_TEMPERATURE "R:/audio/main_menu/AUDIO_MAIN_MENU_TEMPERATURE.mp3" #endif +#ifdef __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__ +#define AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION "R:/audio/main_menu/AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION.mp3" +#endif #ifdef __MMI_WECHAT_SUPPORT__ #define AUDIO_MAIN_MENU_WECHAT "R:/audio/main_menu/AUDIO_MAIN_MENU_WECHAT.mp3" #endif @@ -115,9 +123,11 @@ extern "C" { #define AUDIO_MAIN_MENU_DIALPAD NULL #define AUDIO_MAIN_MENU_CALL_LOG NULL #define AUDIO_MAIN_MENU_SOS NULL +#define AUDIO_MAIN_MENU_WEATHER NULL #define AUDIO_MAIN_MENU_HEART_RATE NULL #define AUDIO_MAIN_MENU_SPO2 NULL #define AUDIO_MAIN_MENU_TEMPERATURE NULL +#define AUDIO_MAIN_MENU_ATRIAL_FIBRILLATION NULL #define AUDIO_MAIN_MENU_WECHAT NULL #define AUDIO_MAIN_MENU_CAMERA NULL #define AUDIO_MAIN_MENU_ALBUM NULL @@ -226,11 +236,22 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_DIALPAD_ONE_PAGE "R:/png/primary_function/one_page/icon_dialpad.png" #define ICON_CALLLOG_ONE_PAGE "R:/png/primary_function/one_page/ICON_CALLLOG.png" +#ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__ #define ICON_HEART_RATE_ONE_PAGE "R:/png/primary_function/one_page/icon_heart_rate.png" +#endif +#ifdef __MMI_HEALTH_MEASURE_SPO2_SUPPORT__ #define ICON_SPO2_ONE_PAGE "R:/png/primary_function/one_page/ICON_SPO2.png" +#endif +#ifdef __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ #define ICON_TEMPERATURE_ONE_PAGE "R:/png/primary_function/one_page/ICON_TEMPERATURE.png" +#endif +#ifdef __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__ +#define ICON_ATRIAL_FIBRILLATION_ONE_PAGE "R:/png/primary_function/one_page/ICON_ATRIAL_FIBRILLATION.png" +#endif +#ifdef __MMI_WECHAT_SUPPORT__ #define ICON_WECHAT_ONE_PAGE "R:/png/primary_function/one_page/icon_wechat.png" +#endif #if USE_LV_WATCH_CAMERA != 0 #define ICON_CAMERA_ONE_PAGE "R:/png/primary_function/one_page/icon_camera.png" #define ICON_ALBUM_ONE_PAGE "R:/png/primary_function/one_page/icon_album.png" @@ -242,6 +263,11 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_VIDEOCALL_ONE_PAGE "R:/png/primary_function/one_page/icon_videocall.png" #endif +#ifdef __MMI_PAGE_MAIN_MENU_ADD_WEATHER__ +#ifdef __MMI_WEATHER_MENU_SUPPORT__ +#define ICON_WEATHER_ONE_PAGE "R:/png/primary_function/one_page/ICON_WEATHER.png" +#endif +#endif #ifdef __MMI_TOOL_MENU_SUPPORT__ #define ICON_TOOL_ONE_PAGE "R:/png/primary_function/one_page/ICON_TOOL.png" #endif @@ -889,6 +915,12 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_VIDEO_CALL_VOLUME_BTN "R:/png/video_call/ICON_VIDEO_CALL_VOLUME_BTN.png" #define ICON_VIDEO_CALL_CONTACT_PHOTO "R:/png/video_call/ICON_VIDEO_CALL_CONTACT_PHOTO.png" +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_HZCH__ +#define ICON_VIDEO_CALL_DEFAULT "R:/png/video_call/ICON_VIDEO_CALL_DEFAULT.png" +#define ICON_VIDEO_CALL_NO_SIGNAL "R:/png/video_call/ICON_VIDEO_CALL_NO_SIGNAL.png" +#define ICON_VIDEO_CALL_ILLEGAL "R:/png/video_call/ICON_VIDEO_CALL_ILLEGAL.png" +#define ICON_VIDEO_CALL_WAITTING "R:/png/video_call/ICON_VIDEO_CALL_WAITTING.png" +#endif #endif // wechat