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 9103dfc..2a08bb7 100644 (file)
--- 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
@@ -225,7 +225,7 @@ void mmi_video_call_hangup_req(BOOL bye)
 {
        VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, bye);
 
-       mmi_vc_call_operate_send_to_server(1);
+       mmi_vc_call_operate_send_to_server();
        
     if (NULL != s_video_call_jrtc.jrtc_ptr) 
        {
@@ -248,8 +248,6 @@ void mmi_video_call_hangup_req(BOOL bye)
 int8_t mmi_video_call_answer_req(char * t_ticket)
 {
     int8_t ret = -1;
-
-       //mmi_vc_call_operate_send_to_server(1);
        
     if (NULL == s_video_call_jrtc.jrtc_ptr)
        {
@@ -264,7 +262,7 @@ void mmi_video_call_reject_req(BOOL bye)
 {
        VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, bye);
 
-       mmi_vc_call_operate_send_to_server(0);
+       mmi_vc_call_operate_send_to_server();
 
     if (NULL != s_video_call_jrtc.jrtc_ptr) 
        {

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 c6a16e9..4804a6a 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
@@ -761,13 +761,10 @@ bool mmi_vc_is_in_call(void)
        return true;
 }
 
-// state: 0-reject; 1-hang up
-void mmi_vc_call_operate_send_to_server(uint_8 flag)
+//
+void mmi_vc_call_operate_send_to_server(void)
 {
-       if(0 == flag)
-               mmi_protocol_fzd_action_VC_CALL_RESPONSE(s_video_call_params.number, s_video_call_ticket, s_video_call_params.call_type);
-       else if(1 == flag)
-               mmi_protocol_fzd_action_VC_CALL_RESPONSE(NULL, NULL, 0);
+       mmi_protocol_fzd_action_VC_CALL_RESPONSE(s_video_call_params.number, s_video_call_ticket, s_video_call_params.call_type);
 }
 
 void mmi_vc_ring_off_timer_stop(void)

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 e9942fd..2d63d57 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
@@ -2487,20 +2487,14 @@ bool mmi_protocol_fzd_action_VC_CALL_RESPONSE(char * number, char * ticket, MODE
        bool result = false;
        MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_WATCH_VC_CALL_RESPONSE;
 
-       if(NULL == number) // hang up
-       {
-               result = mmi_protocol_fzd_send_without_data(action);
-       }
-       else // reject
-       {
-               unsigned char content_buff[NV_WATCH_VC_CONTACT_NUMBER_LEN + 64 + 8] = {0};
-               unsigned int content_lenth = 0;
+       unsigned char content_buff[NV_WATCH_VC_CONTACT_NUMBER_LEN + 64 + 8] = {0};
+       unsigned int content_lenth = 0;
 
-               sprintf(content_buff, ",%s,%s,%d", number, ticket, type);
-               content_lenth = strlen(content_buff);
+       sprintf(content_buff, ",%s,%s,%d", number, ticket, type);
+       content_lenth = strlen(content_buff);
+
+       result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
 
-               result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
-       }
        return result;
 }
 #endif