From: @CHENG <2393524978@qq.com> Date: Mon, 24 Jun 2024 07:15:58 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=167d42002586743939a31c28979b303335ffd073;p=mirrors%2FASR3603_Z5_DS.git gengxin --- 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 1cf7dad3..7f1e744f 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 @@ -223,8 +223,6 @@ bool mmi_vc_is_in_call(void); void mmi_video_call_create_event_cb(lv_obj_t *btn, lv_event_t e); - -bool mmi_vc_connect_check_req(void); bool mmi_vc_watch_suspend_check(void); void mmi_vc_activity_destroy_req(void); uint8_t mmi_vc_get_call_volume(void); 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 225cc854..c2384256 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 @@ -2030,16 +2030,6 @@ bool mmi_vc_watch_suspend_check(void) return true; } -bool mmi_vc_connect_check_req(void) -{ - if(mmi_vc_call_get_activity_obj()) - { - return true; - } - - return false; -} - void mmi_vc_activity_destroy_req(void) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_hzch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_hzch.c index d044ba63..ba46721e 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_hzch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_hzch.c @@ -1555,16 +1555,6 @@ bool mmi_vc_watch_suspend_check(void) return true; } -bool mmi_vc_connect_check_req(void) -{ - if(mmi_vc_call_get_activity_obj()) - { - return true; - } - - return false; -} - void mmi_vc_activity_destroy_req(void) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); 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 19ef344d..4a3d94d9 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 @@ -2052,16 +2052,6 @@ bool mmi_vc_watch_suspend_check(void) return true; } -bool mmi_vc_connect_check_req(void) -{ - if(mmi_vc_call_get_activity_obj()) - { - return true; - } - - return false; -} - void mmi_vc_activity_destroy_req(void) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); 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 66cf8009..3eb8e29e 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 @@ -2001,16 +2001,6 @@ bool mmi_vc_watch_suspend_check(void) return true; } -bool mmi_vc_connect_check_req(void) -{ - if(mmi_vc_call_get_activity_obj()) - { - return true; - } - - return false; -} - void mmi_vc_activity_destroy_req(void) { VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c index ba500b86..ff2ab9a6 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c @@ -990,7 +990,7 @@ bool watch_voip_suspend_check(void) bool voip_connect_check_req(void) { #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ - return (mmi_vc_connect_check_req()); + return (mmi_vc_is_in_call()); #endif return false;