From: CCC <2393524978@qq.com> Date: Tue, 22 Aug 2023 07:22:58 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c0974048b9221912a77e6ce49fc22d0435ec9161;p=mirrors%2FASR3603_Z5.git gengxin --- 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 3292eade..4d854abd 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 @@ -742,20 +742,23 @@ static void phonebook_add_btn(lv_obj_t * obj, char * phone_name, char * phone_nu 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_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_style_transp); + //lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_black_tight); //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_bg_color(content, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(128, 128, 128)); // LV_COLOR_MAKE(0xFF, 0x6F, 0x91) + lv_obj_set_style_local_bg_color(content, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0xB9, 0x86, 0xFF)); // LV_COLOR_MAKE(0x47, 0xA6, 0xFF)); + lv_obj_set_style_local_radius(content, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_DPI/15); 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_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 156); + lv_obj_set_click(content, true); 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_obj_add_style(label_name, LV_OBJ_PART_MAIN, &lv_watch_font26_black); // &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); @@ -817,7 +820,7 @@ static void phonebook_no_contacts_or_network_create(lv_obj_t * obj) lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_obj_set_click(label, false); lv_label_set_text_id(label, WATCH_TEXT_ID_NO_CONTACTS); // WATCH_TEXT_ID_NO_CONTACTS_OR_NETWORK); - lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, 0); + lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10); return; } 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 7da1dac1..a8a96fef 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 @@ -71,7 +71,7 @@ const struct { #elif USE_LV_WATCH_UPGRADE_RS != 0 { ICON_SETTING_UPGRADE, WATCH_TEXT_ID_SYSTEM_UPGRADE, setting_fota_create_btn_action }, #else - { ICON_SETTING_UPGRADE, WATCH_TEXT_ID_SYSTEM_UPGRADE, btn_event_cb }, + //{ ICON_SETTING_UPGRADE, WATCH_TEXT_ID_SYSTEM_UPGRADE, btn_event_cb }, #endif //{ &icon_setting_time_zone, WATCH_TEXT_ID_TIME_ZONE, btn_action }, //{ &icon_setting_add_friends, WATCH_TEXT_ID_ADD_FRIEND_ADJUST, btn_action }, diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c index 8d999e07..ccb636bf 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c @@ -516,7 +516,7 @@ static void sms_msg_no_network_or_sim_create(lv_obj_t * obj) lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_obj_set_click(label, false); lv_label_set_text_id(label, WATCH_TEXT_ID_NO_SIM_CARD); - lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, 0); + lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10); #else @@ -989,7 +989,7 @@ static void sms_no_msg_create(lv_obj_t * obj) lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_obj_set_click(label, false); lv_label_set_text_id(label, WATCH_TEXT_ID_NO_VOICE_MSG); - lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, 0); + lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -10); return; }