From: @CHENG <2393524978@qq.com> Date: Wed, 17 Jan 2024 08:03:52 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=a29905550efe83adc4ea29183e78b85eddb91cc6;p=mirrors%2FASR3603_Z5.git gengxin --- 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 cd871f72..49232c15 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 @@ -105,6 +105,11 @@ void mmi_incoming_call_auto_answer_action(void) #define MMI_PHONE_CALL_BTN_Y_OFFSET (-30) #define MMI_PHONE_CALL_LEFT_BTN_X_OFFSET (30) #define MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET (-30) +#elif defined(USE_LV_WATCH_UI_466_466) +#define MMI_PHONE_CALL_BTN_Y_OFFSET (-60) +#define MMI_PHONE_CALL_LEFT_BTN_X_OFFSET (70) +#define MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET (-70) + #else #define MMI_PHONE_CALL_BTN_Y_OFFSET (-30) #define MMI_PHONE_CALL_LEFT_BTN_X_OFFSET (30) @@ -124,7 +129,11 @@ static void phone_dialing(lv_obj_t * content) //label dialing lv_obj_t * label = lv_label_create(content, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font30); +#else lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); +#endif lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_text_id(label, WATCH_TEXT_ID_DAILING); lv_obj_set_click(label, false); @@ -135,11 +144,19 @@ static void phone_dialing(lv_obj_t * content) //img lv_obj_t * img = lv_img_create(content, NULL); lv_img_set_src(img, ICON_CALL_OUTGOING); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 30); +#else lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 10); +#endif //name or number label = lv_label_create(content, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40); +#else lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); +#endif lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL); lv_obj_set_width(label, lv_obj_get_width(content) - 10); @@ -186,7 +203,11 @@ static void phone_ring(lv_obj_t * content) //label ringing label = lv_label_create(content, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font30); +#else lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); +#endif lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_text_id(label, WATCH_TEXT_ID_RINGING); lv_obj_set_click(label, false); @@ -197,11 +218,19 @@ static void phone_ring(lv_obj_t * content) //img lv_obj_t * img = lv_img_create(content, NULL); lv_img_set_src(img, ICON_CALL_INCOMING); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 30); +#else lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 10); +#endif //name or number label = lv_label_create(content, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40); +#else lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); +#endif lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL); lv_obj_set_width(label, lv_obj_get_width(content) - 10); @@ -248,11 +277,19 @@ static void phone_connected(lv_obj_t * content) //img lv_obj_t * img = lv_img_create(content, NULL); lv_img_set_src(img, ICON_CALL_CALLING); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 30); +#else lv_obj_align(img, content, LV_ALIGN_IN_TOP_MID, 0, 10); +#endif //name or number lv_obj_t * label = lv_label_create(content, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40); +#else lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); +#endif lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL); lv_obj_set_width(label, lv_obj_get_width(content) - 10); @@ -271,7 +308,11 @@ static void phone_connected(lv_obj_t * content) //duration label = lv_label_create(content, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font30); +#else lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); +#endif lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_label_set_text(label, "00:00"); lv_obj_set_click(label, false); @@ -1072,6 +1113,31 @@ lv_obj_t * call_prompt_create(lv_obj_t * activity_obj) } #ifdef __MMI_ZHSX_SUPPORT__ +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_t * cont = lv_cont_create(obj, NULL); + lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES); + lv_obj_add_style(cont, LV_OBJ_PART_MAIN, &lv_watch_cont_opa2); + + lv_obj_t * label = lv_label_create(cont, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40); + //lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + //lv_obj_set_size(label, LV_HOR_RES * 5 / 6, LV_VER_RES / 2); + lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_CARD); + lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -30); + + lv_obj_t * btn = lv_btn_create(cont, NULL); + lv_obj_set_size(btn, 140, 70); + lv_obj_set_event_cb(btn, call_prompt_ok_btn_action); + lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -60); + lv_obj_add_protect(btn, LV_PROTECT_PRESS_LOST); + + lv_obj_t * label_btn = lv_label_create(btn, NULL); + lv_label_set_text_id(label_btn, WATCH_TEXT_ID_OK); + lv_obj_add_style(label_btn, LV_LABEL_PART_MAIN, &lv_watch_font40); + +#else + lv_obj_t * cont = lv_cont_create(obj, NULL); lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES); lv_obj_add_style(cont, LV_OBJ_PART_MAIN, &lv_watch_cont_opa2); @@ -1093,6 +1159,7 @@ lv_obj_t * call_prompt_create(lv_obj_t * activity_obj) lv_obj_t * label_btn = lv_label_create(btn, NULL); lv_label_set_text_id(label_btn, WATCH_TEXT_ID_OK); lv_obj_add_style(label_btn, LV_LABEL_PART_MAIN, &lv_watch_font26); +#endif #else lv_obj_t * cont = lv_cont_create(obj, NULL); lv_obj_set_size(cont, LV_HOR_RES * 5 / 6, LV_VER_RES / 2); @@ -1231,7 +1298,11 @@ static void volume_btn_action(lv_obj_t * obj, lv_event_t e) return; } +#ifdef USE_LV_WATCH_UI_466_466 + slider_create(NULL, SETTING_CALL_SPEAKER, 150, slider_event_cb); +#else slider_create(NULL, SETTING_CALL_SPEAKER, 40, slider_event_cb); +#endif } static void phone_obj_hide_anim_end(lv_obj_t * anim) @@ -1267,6 +1338,18 @@ static lv_obj_t * ring_off_content_create(lv_obj_t * par) // } else { // lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12); // } +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_set_style_local_radius(content, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 15); + lv_obj_set_size(content, LV_HOR_RES - 100, 70); + lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10); + lv_cont_set_layout(content, LV_LAYOUT_CENTER); + lv_obj_set_click(content, false); + + lv_obj_t * label = lv_label_create(content, NULL); + lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + +#else lv_obj_set_style_local_radius(content, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 15); lv_obj_set_size(content, LV_HOR_RES - 40, 50); lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10); @@ -1276,6 +1359,7 @@ static lv_obj_t * ring_off_content_create(lv_obj_t * par) lv_obj_t * label = lv_label_create(content, NULL); lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20); lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); +#endif if(ext->phone_ui_id == PHONE_UI_CONNECTED) { char tmp[20] = ""; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c index c2f09f28..f58677e0 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone_api.c @@ -556,7 +556,6 @@ void phone_voice_call_req(char * number) strncpy(call_params.number, number, NV_CONTACTS_MAX_NUMBER_LEN); -#ifndef __MMI_ZHSX_SUPPORT__ phonebook_contact_t * contact_info = phonebook_get_contact_info(number); if(NULL != contact_info) { Hal_Mem_Copy(call_params.name, contact_info->contact_name, NV_CONTACTS_MAX_NAME_LEN); @@ -564,7 +563,10 @@ void phone_voice_call_req(char * number) call_params.img_src_small = contact_info->img_src_small; Hal_Mem_Free(contact_info); - } else { + } +#ifndef __MMI_ZHSX_SUPPORT__ + else + { call_params.img_src = ICON_FAMILY; call_params.img_src_small = ICON_FAMILY_SMALL; }