From: CCC <2393524978@qq.com> Date: Sat, 11 Nov 2023 08:01:41 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=98cec752565aa1a70298755b88be7f9c0d1f418f;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_fzd.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_fzd.c index 16f1956d..9103dfc3 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_fzd.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_fzd.c @@ -123,7 +123,7 @@ static void mmi_video_call_jrtc_on_state(lv_task_t * task) if(MMI_VIDEO_CALL_STATE_NONE != mmi_video_call_params_state_get()) { - mmi_vc_ring_off_no_carrier(1); + mmi_vc_ring_off_screen(); } break; @@ -166,13 +166,16 @@ static int8_t mmi_video_call_jrtc_open(const char* roomid, MODEM_VIDEO_CALL_TYPE char ticket[MMI_WATCH_VC_TICKET_LEN] = {0}; memcpy(ticket, t_ticket, MMI_WATCH_VC_TICKET_LEN - 1); - //char imei[16] = {0}; - //app_adp_get_imei_req(imei); - //strncpy(ticket, imei, 16); - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s,%d\n", __FUNCTION__, __LINE__, roomid, calltype); VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s\n", __FUNCTION__, __LINE__, ticket); + if (NULL == roomid || NULL == ticket) + { + VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: params error\n", __FUNCTION__, __LINE__); + mmi_video_call_jrtc_clean_up(); + return -1; + } + Hal_Mem_Set(&s_video_call_jrtc, 0, sizeof(MMI_VIDEO_CALL_JRTC_T)); if (MODEM_VIDEO_CALL_TYPE_VIDEO == calltype) @@ -230,12 +233,15 @@ void mmi_video_call_hangup_req(BOOL bye) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %p,%d\n", __FUNCTION__, __LINE__, s_video_call_jrtc.jrtc_ptr, err); - jrtc_close(s_video_call_jrtc.jrtc_ptr, err); - s_video_call_jrtc.closing = 1; + if(!s_video_call_jrtc.closing) + { + jrtc_close(s_video_call_jrtc.jrtc_ptr, err); + s_video_call_jrtc.closing = 1; + } } else { - mmi_vc_ring_off_no_carrier(0); + mmi_vc_ring_off_screen(); } } @@ -266,12 +272,15 @@ void mmi_video_call_reject_req(BOOL bye) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %p,%d\n", __FUNCTION__, __LINE__, s_video_call_jrtc.jrtc_ptr, err); - jrtc_close(s_video_call_jrtc.jrtc_ptr, err); - s_video_call_jrtc.closing = 1; + if(!s_video_call_jrtc.closing) + { + jrtc_close(s_video_call_jrtc.jrtc_ptr, err); + s_video_call_jrtc.closing = 1; + } } else { - mmi_vc_ring_off_no_carrier(0); + mmi_vc_ring_off_screen(); } } diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_tongxin.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_tongxin.c index d2adb7b3..bb865a45 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_tongxin.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_tongxin.c @@ -222,8 +222,11 @@ void mmi_video_call_hangup_req(BOOL bye) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %p,%d\n", __FUNCTION__, __LINE__, s_video_call_jrtc.jrtc_ptr, err); - jrtc_close(s_video_call_jrtc.jrtc_ptr, err); - s_video_call_jrtc.closing = 1; + if(!s_video_call_jrtc.closing) + { + jrtc_close(s_video_call_jrtc.jrtc_ptr, err); + s_video_call_jrtc.closing = 1; + } } else { @@ -258,8 +261,11 @@ void mmi_video_call_reject_req(BOOL bye) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %p,%d\n", __FUNCTION__, __LINE__, s_video_call_jrtc.jrtc_ptr, err); - jrtc_close(s_video_call_jrtc.jrtc_ptr, err); - s_video_call_jrtc.closing = 1; + if(!s_video_call_jrtc.closing) + { + jrtc_close(s_video_call_jrtc.jrtc_ptr, err); + s_video_call_jrtc.closing = 1; + } } else { diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_wulian.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_wulian.c index d702a90d..1b72f03e 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_wulian.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_jrtc_client_wulian.c @@ -130,7 +130,7 @@ static void mmi_video_call_jrtc_on_state(lv_task_t * task) if(MMI_VIDEO_CALL_STATE_NONE != mmi_video_call_params_state_get()) { - mmi_vc_ring_off_no_carrier(1); + mmi_vc_ring_off_screen(); } break; @@ -178,6 +178,13 @@ static int8_t mmi_video_call_jrtc_open(const char* roomid, MODEM_VIDEO_CALL_TYPE char ticket[64+8] = "ab2671af32b7278ca5e7ad9e26b488aff6640569eaa5b8e1f690d8ac298f6e61"; #endif + if (NULL == roomid) // || NULL == ticket) + { + VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: params error\n", __FUNCTION__, __LINE__); + mmi_video_call_jrtc_clean_up(); + return -1; + } + Hal_Mem_Set(&s_video_call_jrtc, 0, sizeof(MMI_VIDEO_CALL_JRTC_T)); if (MODEM_VIDEO_CALL_TYPE_VIDEO == calltype) @@ -237,12 +244,15 @@ void mmi_video_call_hangup_req(BOOL bye) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %p,%d\n", __FUNCTION__, __LINE__, s_video_call_jrtc.jrtc_ptr, err); - jrtc_close(s_video_call_jrtc.jrtc_ptr, err); - s_video_call_jrtc.closing = 1; + if(!s_video_call_jrtc.closing) + { + jrtc_close(s_video_call_jrtc.jrtc_ptr, err); + s_video_call_jrtc.closing = 1; + } } else { - mmi_vc_ring_off_no_carrier(0); + mmi_vc_ring_off_screen(); } } @@ -273,12 +283,15 @@ void mmi_video_call_reject_req(BOOL bye) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %p,%d\n", __FUNCTION__, __LINE__, s_video_call_jrtc.jrtc_ptr, err); - jrtc_close(s_video_call_jrtc.jrtc_ptr, err); - s_video_call_jrtc.closing = 1; + if(!s_video_call_jrtc.closing) + { + jrtc_close(s_video_call_jrtc.jrtc_ptr, err); + s_video_call_jrtc.closing = 1; + } } else { - mmi_vc_ring_off_no_carrier(0); + mmi_vc_ring_off_screen(); } } 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 2a48ad51..dd8ca269 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 @@ -19,10 +19,6 @@ extern "C" { #include "../../../lv_ex_conf.h" #endif -#if 0 -void voip_alarm_ind(void); -#endif - #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ @@ -40,8 +36,7 @@ void voip_alarm_ind(void); #define ENABLE_VIDEO_SCALE 1 -#define VOIP_PHONE_RING_OFF_ANIMATION_TIME 0 -#define VOIP_PHONE_RING_OFF_CONTINUE_TIME 1500 /*ms*/ +#define MMI_VC_RING_OFF_ANIM_TIMEOUT (1500) /*ms*/ #define LV_COLOR_HEX3(c) LV_COLOR_MAKE((uint8_t) (((c >> 4) & 0xF0) | ((c >> 8) & 0xF)), \ (uint8_t) ((uint32_t)(c & 0xF0) | ((c & 0xF0) >> 4)), \ @@ -157,8 +152,6 @@ typedef enum }MMI_VIDEO_CALL_STATE_E; -#define VOIP_RING_OFF_TIMER_LEN 1000 - typedef struct { MMI_VIDEO_CALL_STATE_E state; //int32_t index; /* Connection Index for use with, eg, AT+CHLD */ @@ -208,9 +201,9 @@ typedef struct { * GLOBAL PROTOTYPES **********************/ -bool mmi_video_call_is_in_call(void); +bool mmi_vc_is_in_call(void); -void video_call_create_event_cb(lv_obj_t *btn, lv_event_t e); +void mmi_video_call_create_event_cb(lv_obj_t *btn, lv_event_t e); bool mmi_vc_connect_check_req(void); @@ -239,4 +232,5 @@ uint8_t mmi_vc_get_call_volume(void); } /* extern "C" */ #endif -#endif /*VIDEOCALL_H*/ +#endif + diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c index 0fcfa610..0dbfc3b2 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c @@ -100,6 +100,11 @@ lv_vc_call_obj_ext_t * mmi_vc_call_get_ext(void) return(ext); } +static void mmi_vc_call_params_clean(void) +{ + _lv_memset_00(&s_video_call_params, sizeof(MMI_VIDEO_CALL_PARAMS_T)); +} + static void mmi_vc_call_screen_clean(void) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -164,14 +169,6 @@ static void voip_volume_btn_action(lv_obj_t * obj, lv_event_t e) slider_create(NULL, SETTING_VOIP_SPEAKER, 40, voip_slider_action); } -static void voip_phone_obj_hide_anim_end(lv_anim_t * anim) -{ - (void)anim; - printf("%s %d\n", __FUNCTION__, __LINE__); - - mmi_vc_call_screen_clean(); -} - static void mmi_vc_get_time_elaps(uint32_t last_time, char * str, int8_t size) { hal_rtc_t rtc_curr; // current rtc time @@ -220,12 +217,6 @@ static lv_obj_t * mmi_vc_ring_off_content_create(lv_obj_t * par) } lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_cont_opa1); - //lv_obj_set_size(content, 204, 44); - //if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) { - // lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10); - //} else { - // lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12); - //} lv_obj_set_size(content, LV_HOR_RES - 40, 50); lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10); lv_cont_set_layout(content, LV_LAYOUT_CENTER); @@ -429,34 +420,58 @@ static void mmi_vc_connected_animation(lv_obj_t * obj) lv_anim_start(&a); } -void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier) +static void mmi_vc_ring_off_obj_hide_anim_end(lv_anim_t * anim) { -/* - if((false == s_video_call_params.ring_off_timeout) - && (1 == isNoCarrier) - && (MMI_VIDEO_CALL_STATE_NONE == s_video_call_params.state)) - { - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - return; - } -*/ + (void)anim; + printf("%s %d\n", __FUNCTION__, __LINE__); + + mmi_vc_call_screen_clean(); +} +void mmi_vc_ring_off_screen(void) +{ VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); // stop playing tone Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); // stop timer - mmi_vc_ring_off_timer_stop(); - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + mmi_vc_all_timer_stop(); + // + voip_signal_check_stop(); + voip_rat_check_stop(); + // create ring off UI - lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_VOIPPHONE); - if(activity_obj) + lv_vc_call_obj_ext_t * ext = mmi_vc_call_get_ext(); + if(NULL != ext) { - mmi_video_call_phone_ring_off_create(); - } + if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) + { + if(ext->phone_status_label) { + lv_label_set_text(ext->phone_status_label, ""); + } + } + mmi_vc_ring_off_content_create(mmi_vc_call_get_obj()); + + if(ext->phone_animation_obj) + { + lv_obj_del(ext->phone_animation_obj); + ext->phone_animation_obj = NULL; + } + + /* set speaker volume to nv when leaving activiry's slider */ + voip_set_volume_when_slider_act(); + + /* phone cleanup when anim end*/ + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_var(&a, mmi_vc_call_get_obj()); + lv_anim_set_ready_cb(&a, (lv_anim_ready_cb_t)mmi_vc_ring_off_obj_hide_anim_end); + lv_anim_set_time(&a, MMI_VC_RING_OFF_ANIM_TIMEOUT); + lv_anim_start(&a); + } if(MMI_MODEM_CALL_STATE_NULL != phone_get_call_state()) { @@ -464,10 +479,9 @@ void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier) Hal_Set_Voice_Call_Status(VOICE_CALL_END); Hal_Disconnect_BT_Audio_Path(); } - Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); watch_wakeup_time_reset(); - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); } static bool mmi_vc_check_mo_permission(void) @@ -734,7 +748,7 @@ void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list) } -bool mmi_video_call_is_in_call(void) +bool mmi_vc_is_in_call(void) { if(MMI_VIDEO_CALL_STATE_NONE == s_video_call_params.state || MMI_VIDEO_CALL_STATE_INVALID == s_video_call_params.state) return false; @@ -778,29 +792,21 @@ void mmi_vc_connecting_timer_stop(void) } } +void mmi_vc_all_timer_stop(void) +{ + mmi_vc_dialing_timer_stop(); + mmi_vc_connecting_timer_stop(); + mmi_vc_ring_off_timer_stop(); +} + static void mmi_vc_ui_prepare_destory(lv_obj_t * activity_obj) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_watch_png_cache_all_free(); - // stop playing tone - Hal_Tone_Play_End(); - // ring off mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); - - // stop ring off timer - mmi_vc_ring_off_timer_stop(); - - // stop callreq timer - mmi_vc_dialing_timer_stop(); - - //stop - mmi_vc_connecting_timer_stop(); - - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); - s_video_call_params.state = MMI_VIDEO_CALL_STATE_NONE; } static void mmi_vc_hook_action(lv_obj_t * btn, lv_event_t e) @@ -812,11 +818,12 @@ static void mmi_vc_hook_action(lv_obj_t * btn, lv_event_t e) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - //if(btn) { - // lv_obj_set_click(btn, false); - //} - + // Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); + + // stop timer + mmi_vc_all_timer_stop(); mmi_vc_call_action_connecting(); @@ -824,66 +831,8 @@ static void mmi_vc_hook_action(lv_obj_t * btn, lv_event_t e) int8_t ret = mmi_video_call_answer_req(s_video_call_ticket); if(ret < 0) { - mmi_vc_ring_off_no_carrier(0); - } -} - - -lv_res_t mmi_video_call_phone_ring_off_create() -{ - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - lv_vc_call_obj_ext_t * ext = mmi_vc_call_get_ext(); - if(ext == NULL) - { - return(LV_RES_INV); - } - - // stop callreq timer - mmi_vc_dialing_timer_stop(); - - if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) - { - if(ext->phone_status_label) { - lv_label_set_text(ext->phone_status_label, ""); - } - - mmi_vc_ring_off_content_create(mmi_vc_call_get_obj()); - } - else if(ext->vc_ui == MMI_VC_UI_CONNECTED) - { - mmi_vc_ring_off_content_create(mmi_vc_call_get_obj()); - } - - if(ext->phone_animation_obj) { - lv_obj_del(ext->phone_animation_obj); - ext->phone_animation_obj = NULL; + mmi_vc_ring_off_screen(); } - - /* set speaker volume to nv when leaving activiry's slider */ - voip_set_volume_when_slider_act(); - - /* phone cleanup when anim end*/ - lv_anim_t a; - lv_anim_init(&a); - lv_anim_set_var(&a, mmi_vc_call_get_obj()); - lv_anim_set_ready_cb(&a, (lv_anim_ready_cb_t)voip_phone_obj_hide_anim_end); - lv_anim_set_time(&a, VOIP_PHONE_RING_OFF_CONTINUE_TIME); - lv_anim_start(&a); - - voip_signal_check_stop(); - voip_rat_check_stop(); - - return(LV_RES_OK); -} - -static void mmi_vc_ring_off_timeout_cb(void * para) -{ - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - s_video_call_params.ring_off_timer_id = NULL; - s_video_call_params.ring_off_timeout = true; - mmi_vc_ring_off_no_carrier(0); } void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) @@ -895,20 +844,16 @@ void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, s_video_call_params.state); - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + // stop playing tone + Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); -/* - if(false == s_video_call_params.ring_off) - { - s_video_call_params.ring_off = true; - - if(NULL == s_video_call_params.ring_off_timer_id) - { - s_video_call_params.ring_off_timer_id = Hal_Timer_Start(VOIP_RING_OFF_TIMER_LEN, mmi_vc_ring_off_timeout_cb, NULL, 0); - } - } -*/ + // + voip_signal_check_stop(); + voip_rat_check_stop(); + + // stop timer + mmi_vc_all_timer_stop(); switch(s_video_call_params.state) { @@ -918,7 +863,6 @@ void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) break; case MMI_VIDEO_CALL_STATE_INCOMING: - Hal_Tone_Play_End(); mmi_video_call_reject_req(TRUE); break; @@ -926,9 +870,6 @@ void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) mmi_video_call_hangup_req(TRUE); break; } - - voip_signal_check_stop(); - voip_rat_check_stop(); } void mmi_ui_msg_update_vc_call_stop(void) @@ -938,7 +879,7 @@ void mmi_ui_msg_update_vc_call_stop(void) void mmi_vc_call_action_call_stop(void) { - if(true != mmi_video_call_is_in_call()) + if(true != mmi_vc_is_in_call()) { return; } @@ -1452,27 +1393,13 @@ void mmi_ui_msg_update_vc_call_incoming(void) void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type, char * t_ticket, char * t_tokens) { -/* - if(true == mmi_active_screen_is_prohibit_interrupted() - || true == is_rat_gsm() - #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ - || true == mmi_watch_is_in_do_not_disturb_time() - #endif - //|| true == mmi_video_call_is_in_call() - ) - { - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - mmi_video_call_reject_req(TRUE); - return; - } -*/ + VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(AUDIO_CTRL_PRIORITY_2 == Hal_Audio_Manage_Start_Req(AUDIO_CTRL_PRIORITY_2, mmi_vc_audio_ctrl_callback)) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); s_video_call_params.call_type = type; s_video_call_params.state = MMI_VIDEO_CALL_STATE_INCOMING; strncpy(s_video_call_params.number, number, NV_WATCH_VC_CONTACT_NUMBER_LEN - 1); @@ -1510,27 +1437,6 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type, char // ui mmi_ui_msg_action_vc_call_incoming(); } - else - { - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s,%d\n", __FUNCTION__, __LINE__); - - // auto reject - mmi_video_call_reject_req(FALSE); - voip_signal_check_stop(); - voip_rat_check_stop(); - - // stop ring off timer - mmi_vc_ring_off_timer_stop(); - - // stop callreq timer - mmi_vc_dialing_timer_stop(); - - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); - voip_set_volume_when_slider_act(); - mmi_vc_call_screen_clean(); - lv_watch_png_cache_all_free(); - Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); - } } bool mmi_vc_call_action_incoming_no_permission(void) @@ -1540,7 +1446,7 @@ bool mmi_vc_call_action_incoming_no_permission(void) #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ || true == mmi_watch_is_in_do_not_disturb_time() #endif - || true == mmi_video_call_is_in_call() + || true == mmi_vc_is_in_call() ) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -1555,9 +1461,7 @@ static void mmi_vc_call_connecting_timeout_cb(void * para) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_vc_connecting_timer_stop(); - mmi_video_call_hangup_req(TRUE); - //mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); + mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); } void mmi_vc_call_action_connecting(void) @@ -1574,13 +1478,11 @@ void mmi_vc_call_action_connecting(void) s_video_call_params.state = MMI_VIDEO_CALL_STATE_CONNECTING; // stop timer - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + mmi_vc_all_timer_stop(); // stop playing tone Hal_Tone_Play_End(); - - //Hal_Set_Voice_Call_Status(VOICE_CALL_START); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); if(NULL == s_video_call_params.connecting_timer_id) { @@ -1603,11 +1505,11 @@ void mmi_vc_call_action_connected(void) s_video_call_params.state = MMI_VIDEO_CALL_STATE_CALLING; // stop timer - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + mmi_vc_all_timer_stop(); // stop playing tone Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); Hal_Set_Voice_Call_Status(VOICE_CALL_START); @@ -1619,8 +1521,7 @@ static void mmi_vc_call_dialing_timeout_cb(void * para) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_vc_dialing_timer_stop(); - mmi_video_call_hangup_req(TRUE); + mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); } void mmi_vc_call_action_dialing_ext(char * t_tokens, char * t_ticket) @@ -1657,10 +1558,9 @@ void mmi_vc_call_action_dialing(char * number, MODEM_VIDEO_CALL_TYPE type) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s,%d\n", __FUNCTION__, __LINE__, number, type); // stop timer - mmi_vc_ring_off_timer_stop(); - mmi_vc_dialing_timer_stop(); + mmi_vc_all_timer_stop(); - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); s_video_call_params.state = MMI_VIDEO_CALL_STATE_DIALING; s_video_call_params.call_type = type; strcpy(s_video_call_params.number, number); @@ -1734,7 +1634,7 @@ static void mmi_vc_voice_btn_action(lv_obj_t * btn, lv_event_t e) return; } - if(true == mmi_video_call_is_in_call()) + if(true == mmi_vc_is_in_call()) { return; } @@ -1763,7 +1663,7 @@ static void mmi_vc_video_btn_action(lv_obj_t * btn, lv_event_t e) return; } - if(true == mmi_video_call_is_in_call()) + if(true == mmi_vc_is_in_call()) { return; } @@ -1849,6 +1749,11 @@ static void mmi_vc_contact_event_cb(lv_obj_t * btn, lv_event_t e) return; } + if(true == mmi_vc_is_in_call()) + { + return; + } + s_vc_contact_selected_index = lv_watch_get_free_num(btn); mmi_vc_dial_btn_screen_create(NULL); } @@ -2038,7 +1943,7 @@ static lv_obj_t * mmi_vc_main_create(lv_obj_t * activity_obj) return obj; } -void video_call_create_event_cb(lv_obj_t * btn, lv_event_t e) +void mmi_video_call_create_event_cb(lv_obj_t * btn, lv_event_t e) { #ifdef __VIDEO_CALL_TEST__ nv_watch_vc_contact_t t_test_contact = @@ -2103,6 +2008,17 @@ void mmi_vc_activity_destroy_req(void) return; } + // stop playing tone + Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); + + // stop timer + mmi_vc_all_timer_stop(); + + // + voip_signal_check_stop(); + voip_rat_check_stop(); + switch(s_video_call_params.state) { case MMI_VIDEO_CALL_STATE_NONE: @@ -2111,7 +2027,6 @@ void mmi_vc_activity_destroy_req(void) break; case MMI_VIDEO_CALL_STATE_INCOMING: - Hal_Tone_Play_End(); mmi_video_call_reject_req(FALSE); break; @@ -2120,15 +2035,7 @@ void mmi_vc_activity_destroy_req(void) break; } - voip_signal_check_stop(); - voip_rat_check_stop(); - - // stop timer - mmi_vc_ring_off_timer_stop(); - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); - - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); voip_set_volume_when_slider_act(); mmi_vc_call_screen_clean(); lv_watch_png_cache_all_free(); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h index def4094d..6663edb0 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h @@ -38,7 +38,6 @@ void mmi_video_call_contact_nv_read(void); void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list); void * mmi_video_call_phone_get_video_buffer(void); -void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier); void mmi_vc_call_action_dialing(char * number, MODEM_VIDEO_CALL_TYPE type); void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type, char * t_ticket, char * t_tokens); void mmi_vc_call_action_connecting(void); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c index 08eb868b..81422910 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c @@ -473,7 +473,7 @@ void mmi_vc_ring_off_screen(void) lv_anim_init(&a); lv_anim_set_var(&a, mmi_vc_call_get_obj()); lv_anim_set_ready_cb(&a, (lv_anim_ready_cb_t)mmi_vc_ring_off_obj_hide_anim_end); - lv_anim_set_time(&a, VOIP_PHONE_RING_OFF_CONTINUE_TIME); + lv_anim_set_time(&a, MMI_VC_RING_OFF_ANIM_TIMEOUT); lv_anim_start(&a); } @@ -752,7 +752,7 @@ void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list) } -bool mmi_video_call_is_in_call(void) +bool mmi_vc_is_in_call(void) { if(MMI_VIDEO_CALL_STATE_NONE == s_video_call_params.state || MMI_VIDEO_CALL_STATE_INVALID == s_video_call_params.state) return false; @@ -883,7 +883,7 @@ void mmi_ui_msg_update_vc_call_stop(void) void mmi_vc_call_action_call_stop(void) { - if(true != mmi_video_call_is_in_call()) + if(true != mmi_vc_is_in_call()) { return; } @@ -1461,7 +1461,7 @@ bool mmi_vc_call_action_incoming_no_permission(void) #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ || true == mmi_watch_is_in_do_not_disturb_time() #endif - || true == mmi_video_call_is_in_call() + || true == mmi_vc_is_in_call() ) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -1658,7 +1658,7 @@ static void mmi_vc_voice_btn_action(lv_obj_t * btn, lv_event_t e) return; } - if(true == mmi_video_call_is_in_call()) + if(true == mmi_vc_is_in_call()) { return; } @@ -1687,7 +1687,7 @@ static void mmi_vc_video_btn_action(lv_obj_t * btn, lv_event_t e) return; } - if(true == mmi_video_call_is_in_call()) + if(true == mmi_vc_is_in_call()) { return; } @@ -1773,6 +1773,11 @@ static void mmi_vc_contact_event_cb(lv_obj_t * btn, lv_event_t e) return; } + if(true == mmi_vc_is_in_call()) + { + return; + } + s_vc_contact_selected_index = lv_watch_get_free_num(btn); mmi_vc_dial_btn_screen_create(NULL); } @@ -1962,7 +1967,7 @@ static lv_obj_t * mmi_vc_main_create(lv_obj_t * activity_obj) return obj; } -void video_call_create_event_cb(lv_obj_t * btn, lv_event_t e) +void mmi_video_call_create_event_cb(lv_obj_t * btn, lv_event_t e) { #ifdef __VIDEO_CALL_TEST__ nv_watch_vc_contact_t t_test_contact = diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h index 6f9cf79b..c5bddb29 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h @@ -38,7 +38,6 @@ void mmi_video_call_contact_nv_read(void); void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list); void * mmi_video_call_phone_get_video_buffer(void); -void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier); void mmi_vc_call_action_dialing(char * number, MODEM_VIDEO_CALL_TYPE type); void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type, char * t_ticket, char * t_appkey, char * t_secret, diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c index 006b5772..2dcd5f33 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c @@ -13,7 +13,7 @@ static lv_task_t * signal_check_task = NULL; #endif static lv_task_t * rat_check_task = NULL; -static MMI_VIDEO_CALL_PARAMS_T s_video_call_params; +static MMI_VIDEO_CALL_PARAMS_T s_video_call_params = {0}; lv_color_t g_cbuf[canvas_width * canvas_heigh + 8] __attribute__((aligned(8))); static uint8_t s_vc_contact_selected_index = 0; @@ -97,6 +97,11 @@ lv_vc_call_obj_ext_t * mmi_vc_call_get_ext(void) return(ext); } +static void mmi_vc_call_params_clean(void) +{ + _lv_memset_00(&s_video_call_params, sizeof(MMI_VIDEO_CALL_PARAMS_T)); +} + static void mmi_vc_call_screen_clean(void) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -161,14 +166,6 @@ static void voip_volume_btn_action(lv_obj_t * obj, lv_event_t e) slider_create(NULL, SETTING_VOIP_SPEAKER, 40, voip_slider_action); } -static void voip_phone_obj_hide_anim_end(lv_anim_t * anim) -{ - (void)anim; - printf("%s %d\n", __FUNCTION__, __LINE__); - - mmi_vc_call_screen_clean(); -} - static void mmi_vc_get_time_elaps(uint32_t last_time, char * str, int8_t size) { hal_rtc_t rtc_curr; // current rtc time @@ -217,12 +214,6 @@ static lv_obj_t * mmi_vc_ring_off_content_create(lv_obj_t * par) } lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_cont_opa1); - //lv_obj_set_size(content, 204, 44); - //if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) { - // lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10); - //} else { - // lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12); - //} lv_obj_set_size(content, LV_HOR_RES - 40, 50); lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10); lv_cont_set_layout(content, LV_LAYOUT_CENTER); @@ -426,34 +417,58 @@ static void mmi_vc_connected_animation(lv_obj_t * obj) lv_anim_start(&a); } -void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier) +static void mmi_vc_ring_off_obj_hide_anim_end(lv_anim_t * anim) { -/* - if((false == s_video_call_params.ring_off_timeout) - && (1 == isNoCarrier) - && (MMI_VIDEO_CALL_STATE_NONE == s_video_call_params.state)) - { - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - return; - } -*/ + (void)anim; + printf("%s %d\n", __FUNCTION__, __LINE__); + mmi_vc_call_screen_clean(); +} + +void mmi_vc_ring_off_screen(void) +{ VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); // stop playing tone Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); // stop timer - mmi_vc_ring_off_timer_stop(); - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + mmi_vc_all_timer_stop(); + // + voip_signal_check_stop(); + voip_rat_check_stop(); + // create ring off UI - lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_VOIPPHONE); - if(activity_obj) + lv_vc_call_obj_ext_t * ext = mmi_vc_call_get_ext(); + if(NULL != ext) { - mmi_video_call_phone_ring_off_create(); - } + if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) + { + if(ext->phone_status_label) { + lv_label_set_text(ext->phone_status_label, ""); + } + } + mmi_vc_ring_off_content_create(mmi_vc_call_get_obj()); + + if(ext->phone_animation_obj) + { + lv_obj_del(ext->phone_animation_obj); + ext->phone_animation_obj = NULL; + } + + /* set speaker volume to nv when leaving activiry's slider */ + voip_set_volume_when_slider_act(); + + /* phone cleanup when anim end*/ + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_var(&a, mmi_vc_call_get_obj()); + lv_anim_set_ready_cb(&a, (lv_anim_ready_cb_t)mmi_vc_ring_off_obj_hide_anim_end); + lv_anim_set_time(&a, MMI_VC_RING_OFF_ANIM_TIMEOUT); + lv_anim_start(&a); + } if(MMI_MODEM_CALL_STATE_NULL != phone_get_call_state()) { @@ -461,10 +476,9 @@ void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier) Hal_Set_Voice_Call_Status(VOICE_CALL_END); Hal_Disconnect_BT_Audio_Path(); } - Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); watch_wakeup_time_reset(); - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); } static bool mmi_vc_check_mo_permission(void) @@ -731,7 +745,7 @@ void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list) } -bool mmi_video_call_is_in_call(void) +bool mmi_vc_is_in_call(void) { if(MMI_VIDEO_CALL_STATE_NONE == s_video_call_params.state || MMI_VIDEO_CALL_STATE_INVALID == s_video_call_params.state) return false; @@ -777,29 +791,21 @@ void mmi_vc_connecting_timer_stop(void) } } +void mmi_vc_all_timer_stop(void) +{ + mmi_vc_dialing_timer_stop(); + mmi_vc_connecting_timer_stop(); + mmi_vc_ring_off_timer_stop(); +} + static void mmi_vc_ui_prepare_destory(lv_obj_t * activity_obj) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); lv_watch_png_cache_all_free(); - // stop playing tone - Hal_Tone_Play_End(); - // ring off mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); - - // stop ring off timer - mmi_vc_ring_off_timer_stop(); - - // stop callreq timer - mmi_vc_dialing_timer_stop(); - - //stop - mmi_vc_connecting_timer_stop(); - - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); - s_video_call_params.state = MMI_VIDEO_CALL_STATE_NONE; } static void mmi_vc_hook_action(lv_obj_t * btn, lv_event_t e) @@ -811,79 +817,22 @@ static void mmi_vc_hook_action(lv_obj_t * btn, lv_event_t e) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - //if(btn) { - // lv_obj_set_click(btn, false); - //} - + // Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); + + // stop timer + mmi_vc_all_timer_stop(); mmi_vc_call_action_connecting(); int8_t ret = mmi_video_call_answer_req(); if(ret < 0) { - mmi_vc_ring_off_no_carrier(0); + mmi_vc_ring_off_screen(); } } - -lv_res_t mmi_video_call_phone_ring_off_create() -{ - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - lv_vc_call_obj_ext_t * ext = mmi_vc_call_get_ext(); - if(ext == NULL) - { - return(LV_RES_INV); - } - - // stop callreq timer - mmi_vc_dialing_timer_stop(); - - if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) - { - if(ext->phone_status_label) { - lv_label_set_text(ext->phone_status_label, ""); - } - - mmi_vc_ring_off_content_create(mmi_vc_call_get_obj()); - } - else if(ext->vc_ui == MMI_VC_UI_CONNECTED) - { - mmi_vc_ring_off_content_create(mmi_vc_call_get_obj()); - } - - if(ext->phone_animation_obj) { - lv_obj_del(ext->phone_animation_obj); - ext->phone_animation_obj = NULL; - } - - /* set speaker volume to nv when leaving activiry's slider */ - voip_set_volume_when_slider_act(); - - /* phone cleanup when anim end*/ - lv_anim_t a; - lv_anim_init(&a); - lv_anim_set_var(&a, mmi_vc_call_get_obj()); - lv_anim_set_ready_cb(&a, (lv_anim_ready_cb_t)voip_phone_obj_hide_anim_end); - lv_anim_set_time(&a, VOIP_PHONE_RING_OFF_CONTINUE_TIME); - lv_anim_start(&a); - - voip_signal_check_stop(); - voip_rat_check_stop(); - - return(LV_RES_OK); -} - -static void mmi_vc_ring_off_timeout_cb(void * para) -{ - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - s_video_call_params.ring_off_timer_id = NULL; - s_video_call_params.ring_off_timeout = true; - mmi_vc_ring_off_no_carrier(0); -} - void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) { if(LV_EVENT_CLICKED != e) @@ -893,20 +842,16 @@ void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, s_video_call_params.state); - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + // stop playing tone + Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); -/* - if(false == s_video_call_params.ring_off) - { - s_video_call_params.ring_off = true; - - if(NULL == s_video_call_params.ring_off_timer_id) - { - s_video_call_params.ring_off_timer_id = Hal_Timer_Start(VOIP_RING_OFF_TIMER_LEN, mmi_vc_ring_off_timeout_cb, NULL, 0); - } - } -*/ + // + voip_signal_check_stop(); + voip_rat_check_stop(); + + // stop timer + mmi_vc_all_timer_stop(); switch(s_video_call_params.state) { @@ -916,7 +861,6 @@ void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) break; case MMI_VIDEO_CALL_STATE_INCOMING: - Hal_Tone_Play_End(); mmi_video_call_reject_req(TRUE); break; @@ -924,9 +868,6 @@ void mmi_vc_ring_off_action(lv_obj_t * btn, lv_event_t e) mmi_video_call_hangup_req(TRUE); break; } - - voip_signal_check_stop(); - voip_rat_check_stop(); } void mmi_ui_msg_update_vc_call_stop(void) @@ -936,7 +877,7 @@ void mmi_ui_msg_update_vc_call_stop(void) void mmi_vc_call_action_call_stop(void) { - if(true != mmi_video_call_is_in_call()) + if(true != mmi_vc_is_in_call()) { return; } @@ -1438,25 +1379,25 @@ static lv_obj_t * mmi_vc_ui_create(lv_obj_t * activity_obj) void mmi_ui_msg_update_vc_call_incoming(void) { + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_VC_DIAL_BTN); + if(NULL != activity_obj) + { + lv_obj_del(activity_obj); + } + s_vc_call_ui = MMI_VC_UI_INCOMING; mmi_vc_ui_create(NULL); } void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type) { - if(true == mmi_vc_call_action_incoming_no_permission()) - { - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - - mmi_video_call_reject_req(TRUE); - return; - } + VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); if(AUDIO_CTRL_PRIORITY_2 == Hal_Audio_Manage_Start_Req(AUDIO_CTRL_PRIORITY_2, mmi_vc_audio_ctrl_callback)) { - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s,%d\n", __FUNCTION__, __LINE__); + VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); s_video_call_params.call_type = type; s_video_call_params.state = MMI_VIDEO_CALL_STATE_INCOMING; strncpy(s_video_call_params.number, number, NV_WATCH_VC_CONTACT_NUMBER_LEN - 1); @@ -1484,27 +1425,6 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type) // ui mmi_ui_msg_action_vc_call_incoming(); } - else - { - VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s,%d\n", __FUNCTION__, __LINE__); - - // auto reject - mmi_video_call_reject_req(FALSE); - voip_signal_check_stop(); - voip_rat_check_stop(); - - // stop ring off timer - mmi_vc_ring_off_timer_stop(); - - // stop callreq timer - mmi_vc_dialing_timer_stop(); - - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); - voip_set_volume_when_slider_act(); - mmi_vc_call_screen_clean(); - lv_watch_png_cache_all_free(); - Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); - } } bool mmi_vc_call_action_incoming_no_permission(void) @@ -1514,7 +1434,7 @@ bool mmi_vc_call_action_incoming_no_permission(void) #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ || true == mmi_watch_is_in_do_not_disturb_time() #endif - || true == mmi_video_call_is_in_call() + || true == mmi_vc_is_in_call() ) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); @@ -1529,9 +1449,7 @@ static void mmi_vc_call_connecting_timeout_cb(void * para) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_vc_connecting_timer_stop(); - mmi_video_call_hangup_req(TRUE); - //mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); + mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); } void mmi_vc_call_action_connecting(void) @@ -1548,13 +1466,11 @@ void mmi_vc_call_action_connecting(void) s_video_call_params.state = MMI_VIDEO_CALL_STATE_CONNECTING; // stop timer - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + mmi_vc_all_timer_stop(); // stop playing tone Hal_Tone_Play_End(); - - //Hal_Set_Voice_Call_Status(VOICE_CALL_START); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); if(NULL == s_video_call_params.connecting_timer_id) { @@ -1577,11 +1493,11 @@ void mmi_vc_call_action_connected(void) s_video_call_params.state = MMI_VIDEO_CALL_STATE_CALLING; // stop timer - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); + mmi_vc_all_timer_stop(); // stop playing tone Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); Hal_Set_Voice_Call_Status(VOICE_CALL_START); @@ -1593,8 +1509,7 @@ static void mmi_vc_call_dialing_timeout_cb(void * para) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); - mmi_vc_dialing_timer_stop(); - mmi_video_call_hangup_req(TRUE); + mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED); } void mmi_vc_call_action_dialing(char * number, MODEM_VIDEO_CALL_TYPE type) @@ -1609,10 +1524,9 @@ void mmi_vc_call_action_dialing(char * number, MODEM_VIDEO_CALL_TYPE type) VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s,%d\n", __FUNCTION__, __LINE__, number, type); // stop timer - mmi_vc_ring_off_timer_stop(); - mmi_vc_dialing_timer_stop(); + mmi_vc_all_timer_stop(); - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); s_video_call_params.state = MMI_VIDEO_CALL_STATE_DIALING; s_video_call_params.call_type = type; strcpy(s_video_call_params.number, number); @@ -1691,7 +1605,7 @@ static void mmi_vc_voice_btn_action(lv_obj_t * btn, lv_event_t e) return; } - if(true == mmi_video_call_is_in_call()) + if(true == mmi_vc_is_in_call()) { return; } @@ -1720,7 +1634,7 @@ static void mmi_vc_video_btn_action(lv_obj_t * btn, lv_event_t e) return; } - if(true == mmi_video_call_is_in_call()) + if(true == mmi_vc_is_in_call()) { return; } @@ -1806,6 +1720,11 @@ static void mmi_vc_contact_event_cb(lv_obj_t * btn, lv_event_t e) return; } + if(true == mmi_vc_is_in_call()) + { + return; + } + s_vc_contact_selected_index = lv_watch_get_free_num(btn); mmi_vc_dial_btn_screen_create(NULL); } @@ -1995,7 +1914,7 @@ static lv_obj_t * mmi_vc_main_create(lv_obj_t * activity_obj) return obj; } -void video_call_create_event_cb(lv_obj_t * btn, lv_event_t e) +void mmi_video_call_create_event_cb(lv_obj_t * btn, lv_event_t e) { #ifdef __VIDEO_CALL_TEST__ nv_watch_vc_contact_t t_test_contact = @@ -2060,6 +1979,17 @@ void mmi_vc_activity_destroy_req(void) return; } + // stop playing tone + Hal_Tone_Play_End(); + Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2); + + // stop timer + mmi_vc_all_timer_stop(); + + // + voip_signal_check_stop(); + voip_rat_check_stop(); + switch(s_video_call_params.state) { case MMI_VIDEO_CALL_STATE_NONE: @@ -2068,7 +1998,6 @@ void mmi_vc_activity_destroy_req(void) break; case MMI_VIDEO_CALL_STATE_INCOMING: - Hal_Tone_Play_End(); mmi_video_call_reject_req(FALSE); break; @@ -2077,15 +2006,7 @@ void mmi_vc_activity_destroy_req(void) break; } - voip_signal_check_stop(); - voip_rat_check_stop(); - - // stop timer - mmi_vc_ring_off_timer_stop(); - mmi_vc_dialing_timer_stop(); - mmi_vc_connecting_timer_stop(); - - Hal_Mem_Set(&s_video_call_params, 0x0, sizeof(MMI_VIDEO_CALL_PARAMS_T)); + mmi_vc_call_params_clean(); voip_set_volume_when_slider_act(); mmi_vc_call_screen_clean(); lv_watch_png_cache_all_free(); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.h index b32a163d..a64fa200 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.h @@ -38,7 +38,6 @@ void mmi_video_call_contact_nv_read(void); void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list); void * mmi_video_call_phone_get_video_buffer(void); -void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier); void mmi_vc_call_action_dialing(char * number, MODEM_VIDEO_CALL_TYPE type); void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type); void mmi_vc_call_action_connecting(void); 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 f02f1077..4303700b 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 @@ -42,7 +42,7 @@ static watch_app_info_t s_main_menu_four_grid[] = { ICON_ALIPAY, WATCH_TEXT_ID_ALIPAY, upay_create_event_cb }, #endif #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ - { ICON_VIDEOCALL, WATCH_TEXT_ID_VIDEOCALL, video_call_create_event_cb }, + { ICON_VIDEOCALL, WATCH_TEXT_ID_VIDEOCALL, mmi_video_call_create_event_cb }, #endif #ifdef __MMI_WEATHER_MENU_SUPPORT__ @@ -96,7 +96,7 @@ static watch_app_info_t s_main_menu_one_page[] = { ICON_ALIPAY_ONE_PAGE, WATCH_TEXT_ID_ALIPAY, upay_create_event_cb }, #endif #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ - { ICON_VIDEOCALL_ONE_PAGE, WATCH_TEXT_ID_VIDEOCALL, video_call_create_event_cb }, + { ICON_VIDEOCALL_ONE_PAGE, WATCH_TEXT_ID_VIDEOCALL, mmi_video_call_create_event_cb }, #endif #ifdef __MMI_TOOL_MENU_SUPPORT__ @@ -142,7 +142,7 @@ static watch_app_info_t s_main_menu_list[] = { ICON_ALIPAY_LIST, WATCH_TEXT_ID_ALIPAY, upay_create_event_cb }, #endif #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ - { ICON_VIDEOCALL_LIST, WATCH_TEXT_ID_VIDEOCALL, video_call_create_event_cb }, + { ICON_VIDEOCALL_LIST, WATCH_TEXT_ID_VIDEOCALL, mmi_video_call_create_event_cb }, #endif #ifdef __MMI_WEATHER_MENU_SUPPORT__