From: CCC <2393524978@qq.com> Date: Thu, 24 Aug 2023 07:50:42 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e65457d1f279161930aeca8f00a22e4414a0b8f9;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h index 913dda45..f0c6985a 100644 --- a/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_K7/gui/lv_watch/mmi_default_CUSTOM.h @@ -6,7 +6,9 @@ //server ip -// fzd debug-lab.xcloudtech.com:9000; fzd-api.xcloudtech.com:9000; wulian-8.134.110.49:30346 +// fzd debug-lab.xcloudtech.com:9000; fzd-api.xcloudtech.com:9000 +// wulian-8.134.110.49:30346 +// tongxin debug-tcptest.tx.kidxin.com:20500; tongxin-tcp.tx.kidxin.com:20500 #define MMI_CUSTOMER_IP_ADDRESS "api.xcloudtech.com" // "8.134.110.49" // "lab.xcloudtech.com" #define MMI_CUSTOMER_IP_PORT (9000) // (30346) // (9000) @@ -74,7 +76,8 @@ #define MMI_CUSTOMER_STEP_GOAL (10000) - +// dial pad +#define MMI_CUSTOMER_DIAL_PAD_SWITCH (1) diff --git a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 560e01d6..766238ad 100644 --- a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -158,6 +158,7 @@ #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__ //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ #define __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__ +//#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__ #define __MMI_WECHAT_SUPPORT__ 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 e433d04b..7d679510 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 @@ -869,6 +869,7 @@ const void * lang_text_ch[] = { "禁用时段", // WATCH_TEXT_ID_FORBIDDEN_PERIOD, "设备无网络", // WATCH_TEXT_ID_DEVICE_NO_NETWORK, "设备未绑定", // WATCH_TEXT_ID_DEVICE_NOT_BIND, + "拨号盘已关闭\n请在APP上打开", // WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT, 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 5b42b675..77aee06f 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 @@ -869,6 +869,7 @@ const void * lang_text_en[] = { "Forbidden period", // WATCH_TEXT_ID_FORBIDDEN_PERIOD, "No network", // WATCH_TEXT_ID_DEVICE_NO_NETWORK, "Not bind", // WATCH_TEXT_ID_DEVICE_NOT_BIND, + "Dial pad switch off", // WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT, //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c index 931b8db8..fdd66aa4 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c +++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c @@ -443,6 +443,7 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId) case NV_SECTION_UI_DIAL_PAD_SWITCH: dial_pad_switch = lv_mem_alloc(SectionLen); memset(dial_pad_switch, 0x0, SectionLen); + mmi_dial_pad_switch_nv_default(dial_pad_switch); TempData = (char *)dial_pad_switch; break; 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 28192de4..7ff25968 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -876,6 +876,7 @@ enum WATCH_TEXT_ID_FORBIDDEN_PERIOD, /* "禁用时段" "Forbidden period" */ WATCH_TEXT_ID_DEVICE_NO_NETWORK, /* "设备无网络" "No network" */ WATCH_TEXT_ID_DEVICE_NOT_BIND, /* "设备未绑定" "Not bind" */ + WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT, /* "拨号盘已关闭\n请在APP上打开" "Dial pad switch off" */ diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c index 70adbc2d..35401c9a 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c @@ -69,6 +69,12 @@ void mmi_dial_pad_switch_nv_read(void) } } +void mmi_dial_pad_switch_nv_default(nv_watch_switch_t * data) +{ + data->switch_flag = MMI_DIAL_PAD_SWITCH_DEFAULT; +} + +// 0-close; 1-open uint8_t mmi_dial_pad_switch_get(void) { if(0 == s_dial_pad_switch_init) @@ -125,6 +131,19 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj) lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE); ext = lv_obj_allocate_ext_attr(obj, sizeof(lv_dialpad_obj_ext_t)); +#ifdef __MMI_ZHSX_SUPPORT__ + if(0 == mmi_dial_pad_switch_get()) // close + { + lv_obj_t * label = lv_label_create(obj, NULL); + lv_label_set_text_id(label, WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT); + lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); + lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10); + + return obj; + } +#endif + //phone number text area ext->ta = lv_textarea_create(obj, NULL); lv_textarea_set_cursor_hidden(ext->ta, true); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h index 6f42ba28..d4ae90de 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.h @@ -40,6 +40,7 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj); void dialpad_create_event_cb(lv_obj_t * btn, lv_event_t e); #ifdef __MMI_ZHSX_SUPPORT__ void mmi_dial_pad_switch_set(uint8_t value); +void mmi_dial_pad_switch_nv_default(nv_watch_switch_t * data); #endif /********************** diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c index a9fd40c2..c3b9468d 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c @@ -122,11 +122,11 @@ void * wechat_actId_ext_get(lv_watch_Activity_Id_t actId) if(NULL == activity_obj) return NULL; - lv_obj_t * obj = NULL; - lv_watch_get_child_obj(activity_obj, lv_watch_obj_signal, &obj); - if(NULL != obj) + lv_obj_t * watch_obj = NULL; + lv_watch_get_child_obj(activity_obj, lv_watch_obj_signal, &watch_obj); + if(NULL != watch_obj) { - void * ext = lv_obj_get_ext_attr(obj); + void * ext = lv_obj_get_ext_attr(watch_obj); return ext; } @@ -540,11 +540,11 @@ void wechat_msg_item_delete_ok_btn_event_cb(lv_obj_t * obj, lv_event_t e) lv_obj_t * label_prompt = lv_label_create(ext->delete_bg, NULL); lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &lv_watch_font26_black); lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_DEL_SUCCESS); - lv_obj_align(label_prompt, ext->delete_bg, LV_ALIGN_CENTER, 0, -30); + lv_obj_align(label_prompt, ext->delete_bg, LV_ALIGN_CENTER, 0, -10); wechat_msg_info_index_item_delete(s_wechat_selected_item_index); - ext->delete_timer_id = Hal_Timer_Start(1000 * 2, wechat_msg_item_delete_success_timer_cb, ext, false); + ext->delete_timer_id = Hal_Timer_Start(1500, wechat_msg_item_delete_success_timer_cb, ext, false); } } } @@ -567,9 +567,38 @@ void wechat_chat_list_msg_item_delete_create(void) if(NULL != ext && NULL != ext->cont) { ext->delete_bg = lv_cont_create(ext->cont, NULL); - lv_obj_set_size(ext->delete_bg, LV_HOR_RES, LV_VER_RES); lv_obj_set_style_local_bg_color(ext->delete_bg, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_make(0xB6, 0xF7, 0xFF)); +#if 0 + + + lv_obj_t * btn_delete_current = lv_btn_create(ext->delete_bg, NULL); + lv_obj_set_size(btn_delete_current, LV_HOR_RES - 20, 50); + lv_obj_set_style_local_bg_color(btn_delete_current, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, lv_color_make(0x47, 0xA6, 0xFF)); + lv_obj_set_style_local_radius(btn_delete_current, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, 10); + lv_obj_set_style_local_bg_color(btn_delete_current, LV_OBJ_PART_MAIN, LV_STATE_PRESSED, lv_color_make(0x47, 0xA6, 0xFF)); + lv_obj_set_style_local_radius(btn_delete_current, LV_OBJ_PART_MAIN, LV_STATE_PRESSED, 10); + lv_obj_align(btn_delete_current, NULL, LV_ALIGN_IN_TOP_MID, 0, 40); + lv_obj_set_event_cb(btn_delete_current, wechat_msg_item_delete_cancel_btn_event_cb); + + lv_obj_t * label_delete_current = lv_label_create(btn_delete_current, NULL); + lv_obj_add_style(label_delete_current, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_label_set_text_id(label_delete_current, WATCH_TEXT_ID_CANCEL); + + + lv_obj_t * btn_delete_all = lv_btn_create(ext->delete_bg, btn_delete_current); + lv_obj_set_style_local_bg_color(btn_delete_all, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, lv_color_make(0x47, 0xA6, 0xFF)); + lv_obj_set_style_local_bg_color(btn_delete_all, LV_OBJ_PART_MAIN, LV_STATE_PRESSED, lv_color_make(0x47, 0xA6, 0xFF)); + lv_obj_align(btn_delete_all, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 10, -20); + lv_obj_set_event_cb(btn_delete_all, wechat_msg_item_delete_cancel_btn_event_cb); + + lv_obj_t * label_delete_cancel = lv_label_create(btn_0, NULL); + lv_obj_add_style(label_0, LV_LABEL_PART_MAIN, &lv_watch_font26); + lv_label_set_text_id(label_0, WATCH_TEXT_ID_CANCEL); + + + +#endif lv_obj_t * label_prompt = lv_label_create(ext->delete_bg, NULL); lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &lv_watch_font26_black); @@ -690,12 +719,12 @@ void wechat_msg_sending_screen_prepare_destory(lv_obj_t * activity_obj) sending_ext->result_timer_id = NULL; } - WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - if(NULL != sending_ext->sending_anim.var) - { - lv_anim_del(sending_ext->sending_anim.var, NULL); - sending_ext->sending_anim.var = NULL; - } + //WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + //if(NULL != sending_ext->sending_anim.var) + //{ + // lv_anim_del(sending_ext->sending_anim.var, NULL); + // sending_ext->sending_anim.var = NULL; + //} } } @@ -1397,15 +1426,15 @@ void wechat_chat_list_voice_item_play_action(lv_wechat_msg_list_ext_t * list_pag } } -void wechat_chat_list_voice_item_event_cb(lv_obj_t * img, lv_event_t e) +void wechat_chat_list_voice_item_event_cb(lv_obj_t * cont, lv_event_t e) { - lv_wechat_msg_list_item_ext_t * list_item_ext = (lv_wechat_msg_list_item_ext_t *)lv_obj_get_ext_attr(img); + lv_wechat_msg_list_item_ext_t * list_item_ext = (lv_wechat_msg_list_item_ext_t *)lv_obj_get_ext_attr(cont); if(NULL == list_item_ext) return; s_wechat_selected_item_index = list_item_ext->item_index; - lv_obj_t * scrl = lv_obj_get_parent(img); + lv_obj_t * scrl = lv_obj_get_parent(cont); lv_obj_t * list_page = lv_obj_get_parent(scrl); //lv_obj_t * scrl = lv_page_get_scrl(list_page); @@ -1427,7 +1456,7 @@ void wechat_chat_list_voice_item_event_cb(lv_obj_t * img, lv_event_t e) { list_page_ext->pressing = false; - lv_obj_t * play_img = lv_obj_get_child_back(img, NULL); + lv_obj_t * play_img = lv_obj_get_child_back(cont, NULL); nv_watch_wechat_msg_item_info_t * msg_item = NULL; wechat_msg_info_index_item_get(s_wechat_selected_item_index, &msg_item); diff --git a/2.sdk/sdk/gui/lv_watch/mmi_default.h b/2.sdk/sdk/gui/lv_watch/mmi_default.h index d549e4cf..d7698091 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_default.h +++ b/2.sdk/sdk/gui/lv_watch/mmi_default.h @@ -194,6 +194,13 @@ extern "C" #define MMI_PEDOMETER_STEP_GOAL_DEFAULT (10000) #endif +// dial pad +#ifdef MMI_CUSTOMER_DIAL_PAD_SWITCH +#define MMI_DIAL_PAD_SWITCH_DEFAULT MMI_CUSTOMER_DIAL_PAD_SWITCH +#else +#define MMI_DIAL_PAD_SWITCH_DEFAULT (1) // open +#endif +