From: CCC <2393524978@qq.com> Date: Mon, 24 Jul 2023 08:22:20 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=0617b34043cf1939a00a5c1678a3f7961b7a9fda;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c index 29ca5dec..699e8eab 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c +++ b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c @@ -5,21 +5,36 @@ #ifdef __MMI_ZHSX_SUPPORT__ - -void mmi_msg_ui_action_watch_searching(void) +static void mmi_ui_msg_action_no_para_msg(uint16_t MsgId) { - printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + printf("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, MsgId); - mmi_msg_watch_searching_t * msg_info = (mmi_msg_watch_searching_t *)Hal_Mem_Alloc(sizeof(mmi_msg_watch_searching_t)); + mmi_msg_no_para_t * msg_info = (mmi_msg_no_para_t *)Hal_Mem_Alloc(sizeof(mmi_msg_no_para_t)); - memset(msg_info, 0x0, sizeof(mmi_msg_watch_searching_t)); - msg_info->header.MsgId = MMI_MSG_WATCH_SEARCHING; + memset(msg_info, 0x0, sizeof(mmi_msg_no_para_t)); + msg_info->header.MsgId = MsgId; Hal_Send_Message((TASK_ID)gui_task_id, (void *)msg_info); } +void mmi_ui_msg_action_watch_factory(void) +{ + mmi_ui_msg_action_no_para_msg(MMI_MSG_WATCH_FACTORY); +} + +void mmi_ui_msg_action_watch_power_off(void) +{ + mmi_ui_msg_action_no_para_msg(MMI_MSG_WATCH_POWER_OFF); +} + +void mmi_ui_msg_action_watch_searching(void) +{ + mmi_ui_msg_action_no_para_msg(MMI_MSG_WATCH_SEARCHING); +} + + #ifdef __MMI_WECHAT_SUPPORT__ -void mmi_msg_ui_action_wechat_incoming(void) +void mmi_ui_msg_action_wechat_incoming(void) { printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -33,7 +48,7 @@ void mmi_msg_ui_action_wechat_incoming(void) #endif #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -void mmi_msg_ui_action_vc_call_incoming(void) +void mmi_ui_msg_action_vc_call_incoming(void) { printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -48,6 +63,10 @@ void mmi_msg_ui_action_vc_call_incoming(void) } #endif +void mmi_ui_msg_action_center_number_dialing(void) +{ + mmi_ui_msg_action_no_para_msg(MMI_MSG_CENTER_NUMBER_DIALING); +} diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h index fb7a9e92..843546b7 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h +++ b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h @@ -18,13 +18,16 @@ extern "C" { #ifdef __MMI_ZHSX_SUPPORT__ -void mmi_msg_ui_action_watch_searching(void); +void mmi_ui_msg_action_watch_factory(void); +void mmi_ui_msg_action_watch_power_off(void); +void mmi_ui_msg_action_watch_searching(void); #ifdef __MMI_WECHAT_SUPPORT__ -void mmi_msg_ui_action_wechat_incoming(void); +void mmi_ui_msg_action_wechat_incoming(void); #endif #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -void mmi_msg_ui_action_vc_call_incoming(void); +void mmi_ui_msg_action_vc_call_incoming(void); #endif +void mmi_ui_msg_action_center_number_dialing(void); diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c index 1157d707..e0caa8ae 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c +++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c @@ -364,9 +364,19 @@ void watch_ui_message_handle(uint16_t msgid, void * msg) break; #endif + case MMI_MSG_WATCH_FACTORY: + //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_ui_msg_update_watch_factory(); + break; + + case MMI_MSG_WATCH_POWER_OFF: + //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_ui_msg_update_watch_power_off(); + break; + case MMI_MSG_WATCH_SEARCHING: //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_watch_server_search_update_ui(); + mmi_ui_msg_update_watch_server_search(); break; #ifdef __MMI_WECHAT_SUPPORT__ @@ -379,9 +389,16 @@ void watch_ui_message_handle(uint16_t msgid, void * msg) #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ case MMI_MSG_VC_CALL_INCOMING: //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_vc_call_incoming_update_ui(); + mmi_ui_msg_update_vc_call_incoming(); break; #endif + + case MMI_MSG_CENTER_NUMBER_DIALING: + //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + mmi_ui_msg_update_ceter_number_dialing(); + break; + + #endif default: diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h index 08c7693d..1b6a28be 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h +++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h @@ -96,10 +96,12 @@ enum #endif MMI_MODEM_RECV_SMS_NOTIFY_UI_CMD, MMI_APP_ADAPTOR_SOS_KEY_UI_HANDLE_CMD, +#ifdef __MMI_ZHSX_SUPPORT__ #ifdef __MMI_ZHSX_SUPPORT_ALIPAY__ MMI_ALIPAY_MSG_HANDLE, #endif -#ifdef __MMI_ZHSX_SUPPORT__ + MMI_MSG_WATCH_FACTORY, + MMI_MSG_WATCH_POWER_OFF, MMI_MSG_WATCH_SEARCHING, #ifdef __MMI_WECHAT_SUPPORT__ MMI_MSG_WECHAT_INCOMING, @@ -107,6 +109,8 @@ enum #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ MMI_MSG_VC_CALL_INCOMING, #endif + MMI_MSG_CENTER_NUMBER_DIALING, + #endif }; @@ -513,7 +517,7 @@ typedef struct typedef struct { UI_Inter_Msg_Header_t header; -} mmi_msg_watch_searching_t; +} mmi_msg_no_para_t; #ifdef __MMI_WECHAT_SUPPORT__ typedef struct 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 879d95f4..88ad6536 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 @@ -1422,7 +1422,7 @@ static lv_obj_t * mmi_vc_ui_create(lv_obj_t * activity_obj) return obj; } -void mmi_vc_call_incoming_update_ui(void) +void mmi_ui_msg_update_vc_call_incoming(void) { s_vc_call_ui = MMI_VC_UI_INCOMING; mmi_vc_ui_create(NULL); @@ -1459,7 +1459,7 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type) voip_rat_check_start(); // ui - mmi_msg_ui_action_vc_call_incoming(); + mmi_ui_msg_action_vc_call_incoming(); } else { 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 8631b1cd..a0fef36c 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 @@ -209,7 +209,7 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type); void mmi_vc_call_action_connecting(void); void mmi_vc_call_action_connected(void); -void mmi_vc_call_incoming_update_ui(void); +void mmi_ui_msg_update_vc_call_incoming(void); int8_t mmi_video_call_dial_req(MODEM_VIDEO_CALL_TYPE calltype, char * pContactUri); void mmi_video_call_hangup_req(BOOL bye); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c index c69d6055..1b96c9a1 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c @@ -316,7 +316,7 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id) /* content */ lv_obj_t * content = lv_cont_create(obj, NULL); - lv_obj_set_size(content, lv_obj_get_width(obj), lv_obj_get_height(obj)); + lv_obj_set_size(content, lv_obj_get_width(obj), lv_obj_get_height(obj) - 20); //lv_cont_set_layout(content, LV_LAYOUT_COLUMN_MID); LV_ASSERT_MEM(content); if(content == NULL) @@ -324,7 +324,7 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id) lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_style_transp); /* must click false */ lv_obj_set_click(content, false); - lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, 0); + lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, 20); if(ext->phone_ui_id == PHONE_UI_DIALING) { phone_dialing(content); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c index 2ca1fbdf..43d4ef32 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c @@ -709,6 +709,43 @@ static void phonebook_btn_event_cb(lv_obj_t * btn, lv_event_t e) static void phonebook_add_btn(lv_obj_t * obj, char * phone_name, char * phone_number, lv_event_cb_t event_cb) { +#ifdef __MMI_ZHSX_SUPPORT__ + lv_phonebook_obj_ext_t * ext = phonebook_get_ext();; + lv_obj_t * content = lv_cont_create(obj, NULL); + LV_ASSERT_MEM(content); + if(content == NULL) + return; + + lv_obj_set_size(content, lv_obj_get_width(obj) - 40, 75); + lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_style_transp); + //lv_cont_set_fit(content, LV_FIT_NONE); + //lv_cont_set_layout(content, LV_LAYOUT_OFF); + //lv_obj_set_click(content, false); + //lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_style_transp_fit); + //lv_cont_set_fit2(content,LV_FIT_NONE,LV_FIT_TIGHT); + //lv_obj_set_style_local_bg_color(content, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(128, 128, 128)); + lv_obj_set_style_local_pad_inner(content, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 2); + lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 153); + lv_obj_set_event_cb(content, phonebook_btn_event_cb); + phonebook_add_element(content); + + lv_obj_t * label_name = lv_label_create(content, NULL); + lv_obj_add_style(label_name, LV_OBJ_PART_MAIN, &lv_watch_font26); + lv_label_set_long_mode(label_name, LV_LABEL_LONG_SROLL); + lv_obj_set_size(label_name, lv_obj_get_width(content), 35); + lv_label_set_align(label_name, LV_LABEL_ALIGN_CENTER); + lv_label_set_text(label_name, phone_name); + lv_obj_align(label_name, content, LV_ALIGN_IN_TOP_MID, 0, 5); + lv_obj_set_click(label_name, false); + ext->label_phone_name = label_name; + + lv_obj_t * label_number = lv_label_create(content, label_name); + lv_label_set_text(label_number, phone_number); + lv_obj_align(label_number, label_name, LV_ALIGN_OUT_BOTTOM_MID, 0, 0); + ext->label_phone_number = label_number; + +#else + lv_obj_t * content = lv_cont_create(obj, NULL); LV_ASSERT_MEM(content); if(content == NULL) return; @@ -744,6 +781,7 @@ static void phonebook_add_btn(lv_obj_t * obj, char * phone_name, char * phone_nu lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_style_transp_fit); return; +#endif } static void phonebook_no_contacts_or_network_create(lv_obj_t * obj) 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 60adfd51..02ec203a 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 @@ -12,7 +12,7 @@ static watch_app_info_t s_primary_grid_menu[] = { - { ICON_PHONEBOOK, WATCH_TEXT_ID_TELEPHONE, phonebook_create_btn_event_cb}, + { ICON_PHONEBOOK, WATCH_TEXT_ID_PHONEBOOK, phonebook_create_btn_event_cb}, #if USE_LV_WATCH_SMS_MSG != 0 { ICON_SMS_MSG, WATCH_TEXT_ID_SMS_MSG, sms_msg_create_event_cb}, #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c index e9491eb5..f489f140 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c @@ -141,4 +141,73 @@ static void qrcode_prepare_destory(lv_obj_t * activity_obj) lv_watch_png_cache_all_free(); } + +#ifdef __MMI_APP_QRCODE_MENU_SUPPORT__ +static void app_qrcode_prepare_destory(lv_obj_t * activity_obj) +{ + lv_watch_png_cache_all_free(); +} + +lv_obj_t * app_qrcode_create(lv_obj_t * activity_obj) +{ + if(activity_obj == NULL) + { + lv_watch_activity_ext_t activity_ext; + memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t)); + activity_ext.actId = ACT_ID_APP_QRCODE; + activity_ext.create = app_qrcode_create; + activity_ext.prepare_destory = app_qrcode_prepare_destory; + activity_obj = lv_watch_creat_activity_obj(&activity_ext); + LV_ASSERT_MEM(activity_obj); + if(activity_obj == NULL) + return NULL; + } + + lv_obj_t * obj = lv_watch_obj_create(activity_obj); + LV_ASSERT_MEM(obj); + if(obj == NULL) + return NULL; + + lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE); + + lv_obj_t * content = lv_cont_create(obj, NULL); + lv_cont_set_fit(content, LV_FIT_NONE); + lv_obj_set_size(content, lv_obj_get_width(obj), lv_obj_get_height(obj)); + lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_image); + lv_obj_set_style_local_bg_color(content, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); + lv_cont_set_layout(content, LV_LAYOUT_OFF); + lv_obj_set_click(content, false); + lv_obj_align(content, NULL, LV_ALIGN_CENTER, 0, 0); + + // img + lv_obj_t * img = lv_img_create(content, NULL); + lv_img_set_src(img, ICON_APP_QRCODE); + lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, -10); + lv_obj_set_click(img, false); + + // + lv_obj_t * label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); + lv_label_set_text_id(label, WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT); + lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); + lv_obj_set_click(label, false); + + return obj; +} + +void app_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event) +{ + if(LV_EVENT_CLICKED == event) + { + lv_watch_png_cache_all_free(); + + lv_obj_t * obj = app_qrcode_create(NULL); + LV_ASSERT_MEM(obj); + if(obj == NULL) + return; + } +} +#endif + + #endif /*USE_LV_WATCH_QRCODE*/ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h index 58c998c1..ef4cacae 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h @@ -39,6 +39,11 @@ void qrcode_create_event_cb(lv_obj_t * btn,lv_event_t event); #if USE_LV_WATCH_LAUNCHER2 != 0 void qrcode_create_tab(lv_obj_t * par); #endif + +#ifdef __MMI_APP_QRCODE_MENU_SUPPORT__ +void app_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event); +#endif + /********************** * MACROS **********************/ 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 cea1e8c3..cacb3884 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c @@ -47,6 +47,9 @@ const struct { { ICON_SETTING_BRIGHTNESS, WATCH_TEXT_ID_BRIGHTNESS_ADJUST, setting_brightness_create_btn_action }, { ICON_SETTING_DATETIME, WATCH_TEXT_ID_DATE_AND_TIME, setting_date_time_create_btn_action}, //{ ICON_SETTING_LANGUAGE, WATCH_TEXT_ID_LANGUAGE_SWITCH, language_create_btn_action }, +#ifdef __MMI_APP_QRCODE_MENU_SUPPORT__ + { ICON_SETTING_APP_QRCODE, WATCH_TEXT_ID_APP_QRCODE, app_qrcode_create_event_cb }, +#endif #if USE_LV_WATCH_QRCODE != 0 //{ ICON_SETTING_QRCODE, WATCH_TEXT_ID_CREATE_QRCODE, qrcode_create_event_cb }, { ICON_SETTING_QRCODE, WATCH_TEXT_ID_DEVICE_QRCODE, qrcode_create_event_cb }, diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c index 399ece48..b23a7061 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c @@ -218,7 +218,7 @@ void mmi_watch_power_off(void) { printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_watch_wake_up(); + //mmi_watch_wake_up(); shutdown_confirm_btn_action(NULL, LV_EVENT_CLICKED); } #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c index 71aa057f..635a198a 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c @@ -179,6 +179,7 @@ void watch_power_on_req(void) mmi_wechat_msg_info_init(); #endif mmi_sos_number_nv_read(); + mmi_center_number_nv_read(); #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ mmi_video_call_jrtc_config_init_00(); mmi_video_call_contact_nv_read(); 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 f073fa31..6c4cc2e0 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h @@ -740,6 +740,13 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_CALL_INCOMING "R:/png/call/ICON_CALL_INCOMING.png" #define ICON_CALL_CALLING "R:/png/call/ICON_CALL_CALLING.png" +#ifdef __MMI_APP_QRCODE_MENU_SUPPORT__ +#define ICON_SETTING_APP_QRCODE "R:/png/setting/icon_seting_app_qrcode.png" +#define ICON_APP_QRCODE "R:/png/setting/ICON_APP_QRCODE.png" +#endif + + + #endif