gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
index 13226c6..1625e83 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
@@ -409,6 +409,12 @@ void watch_ui_message_handle(uint16_t msgid, void * msg)
                case MMI_MSG_VC_CALL_STOP:
                        mmi_ui_msg_update_vc_call_stop();
                        break;
+
+       #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_HZCH__
+               case MMI_MSG_VC_CALL_ILLEGAL:
+                       mmi_ui_msg_update_vc_call_illegal();
+                       break;
+       #endif
        #endif
 
                case MMI_MSG_CENTER_NUMBER_DIALING:

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h
index a7cd754..369b33b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h
@@ -110,6 +110,9 @@ enum
 #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
        MMI_MSG_VC_CALL_INCOMING,
        MMI_MSG_VC_CALL_STOP,
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_HZCH__
+       MMI_MSG_VC_CALL_ILLEGAL,
+#endif
 #endif
        MMI_MSG_CENTER_NUMBER_DIALING,
 #ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__

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 0653c4d..fa06aa9 100644 (file)
--- 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
@@ -489,7 +489,8 @@ void mmi_vc_ring_off_screen(void)
 static bool mmi_vc_check_mo_permission(void)
 {
     if((!watch_modem_sim_present_check_req())
-               || (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req())
+//             || (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req())
+               || (MMI_MODEM_SIGNAL_BAR_3 > watch_modem_get_signal_bar_req())
 //       || (MODEM_VIDEO_CALL_REG_OK != watch_modem_video_call_get_reg_stat_req())
                || (is_rat_gsm())
                ) 
@@ -851,6 +852,34 @@ void mmi_vc_call_action_call_stop(void)
        mmi_ui_msg_action_vc_call_stop();
 }
 
+void mmi_ui_msg_update_vc_call_illegal(void)
+{
+       mmi_vc_ring_off_action(NULL, LV_EVENT_CLICKED);
+
+       lv_hzch_vc_call_obj_ext_t * ext = (lv_hzch_vc_call_obj_ext_t *)mmi_vc_main_ext_get();
+       if(NULL == ext)
+               return ;
+
+       VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+       
+       lv_obj_set_hidden(ext->img_call_cancel, true);
+       lv_obj_set_hidden(ext->button_call, true);
+       lv_obj_set_hidden(ext->button_cancel, true);
+       lv_obj_set_hidden(ext->img_no_signal, true);
+       lv_obj_set_hidden(ext->img_illegal, false);
+}
+
+void mmi_vc_call_action_call_illegal(void)
+{
+       if(true != mmi_vc_is_in_call())
+       {
+               return;
+       }
+       
+       mmi_watch_wake_up();
+       mmi_ui_msg_action_vc_call_illegal();
+}
+
 static void mmi_vc_ui_dialing(lv_obj_t * content)
 {
        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.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_hzch.h
index 2a1f8e9..8cb24e2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_hzch.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_hzch.h
@@ -56,6 +56,8 @@ void mmi_ui_msg_update_vc_call_stop(void);
 void mmi_vc_call_action_call_stop(void);
 void mmi_ui_msg_update_vc_call_incoming(void);
 bool mmi_vc_call_action_incoming_no_permission(void);
+void mmi_ui_msg_update_vc_call_illegal(void);
+void mmi_vc_call_action_call_illegal(void);
 
 uint8_t mmi_vc_call_referral_flag_get(void);
 void mmi_vc_call_referral_flag_set(uint8_t flag);

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 a4bdf1e..e077378 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
@@ -2973,7 +2973,9 @@ bool mmi_protocol_fzd_parse_WATCH_VC_CALL_REQUEST(unsigned char * next_buff, uns
        else
        {
                // stop
-               mmi_vc_call_action_call_stop();
+               //mmi_vc_call_action_call_stop();
+
+               mmi_vc_call_action_call_illegal();
        }
        
        return result;