gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
index e782f49..4ff85d2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.c
@@ -740,7 +740,7 @@ void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list)
 
 }
 
-static bool mmi_video_call_is_in_call(void)
+bool mmi_video_call_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;

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 69ba3ee..45c437e 100644 (file)
--- 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
@@ -228,6 +228,7 @@ int8_t mmi_video_call_answer_req(void);
 void mmi_video_call_reject_req(BOOL bye);
 void voip_fps_check(int8_t fps);
 
+bool mmi_video_call_is_in_call(void);
 
 void video_call_create_event_cb(lv_obj_t *btn, lv_event_t e);
 

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 e5e8fd1..7cd8e2d 100644 (file)
--- 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
@@ -744,7 +744,7 @@ void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list)
 
 }
 
-static bool mmi_video_call_is_in_call(void)
+bool mmi_video_call_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;
@@ -1463,7 +1463,7 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type, char
                #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_video_call_is_in_call()
                )
        {
                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_fzd.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.h
index bf4d953..deda382 100644 (file)
--- 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
@@ -233,6 +233,7 @@ int8_t mmi_video_call_answer_req(char * t_ticket);
 void mmi_video_call_reject_req(BOOL bye);
 void voip_fps_check(int8_t fps);
 
+bool mmi_video_call_is_in_call(void);
 
 void video_call_create_event_cb(lv_obj_t *btn, lv_event_t e);
 

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 b71bd6a..a0790dd 100644 (file)
--- 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
@@ -748,7 +748,7 @@ void mmi_vc_contact_set(nv_watch_vc_contact_t * contact_list)
 
 }
 
-static bool mmi_video_call_is_in_call(void)
+bool mmi_video_call_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;
@@ -1469,7 +1469,7 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type,
                #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_video_call_is_in_call()
                )
        {
                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.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.h
index 0b764ea..2e787fb 100644 (file)
--- 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
@@ -238,6 +238,7 @@ int8_t mmi_video_call_answer_req(char * t_ticket);
 void mmi_video_call_reject_req(BOOL bye);
 void voip_fps_check(int8_t fps);
 
+bool mmi_video_call_is_in_call(void);
 
 void video_call_create_event_cb(lv_obj_t *btn, lv_event_t e);
 

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
index 9cfd0d0..cfb58ab 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
@@ -2524,6 +2524,13 @@ bool mmi_protocol_fzd_parse_SERVER_VC_CALL_REQUEST(unsigned char * next_buff, un
                return false;
        }
 
+       if(true == mmi_video_call_is_in_call())
+       {
+               PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+               mmi_protocol_fzd_action_SERVER_VC_CALL_REQUEST(-1);
+               return false;
+       }
+       
        result = true;
        mmi_protocol_fzd_action_SERVER_VC_CALL_REQUEST(0);
 
@@ -2761,6 +2768,13 @@ bool mmi_protocol_fzd_parse_SERVER_VC_CALL_REQUEST(unsigned char * next_buff, un
                return false;
        }
 
+       if(true == mmi_video_call_is_in_call())
+       {
+               PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+               mmi_protocol_fzd_action_SERVER_VC_CALL_REQUEST(-1);
+               return false;
+       }
+               
        result = true;
        mmi_protocol_fzd_action_SERVER_VC_CALL_REQUEST(0);