gengxin

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 781da5f..c6a16e9 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
@@ -54,6 +54,8 @@ void mmi_vc_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority)
                        return;
        }
         mmi_vc_activity_destroy_req();
+        Hal_Vibrator_Play_End();
+               Hal_Tone_Play_End();
         Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
     }
 }
@@ -822,6 +824,7 @@ 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__);
 
        //
+       Hal_Vibrator_Play_End();
     Hal_Tone_Play_End();
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
 
@@ -848,6 +851,7 @@ 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);
 
     // stop playing tone
+       Hal_Vibrator_Play_End();
     Hal_Tone_Play_End();
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
        
@@ -1406,7 +1410,7 @@ void mmi_ui_msg_update_vc_call_incoming(void)
        #endif
        }
 #endif
-       
+
        lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_VC_DIAL_BTN);
        if(NULL != activity_obj)
        {
@@ -1445,13 +1449,24 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type, char
                memset(s_video_call_tokens, 0x0, MMI_WATCH_VC_TOKENS_LEN);
                strncpy(s_video_call_tokens, t_tokens, MMI_WATCH_VC_TOKENS_LEN - 1);
                
-               HAL_SPEAKER_GAIN volume = query_current_volume();
+               // ring
+               uint8_t volume = 0;
+       #ifdef __MMI_USER_PROFILE_SUPPORT__
+               volume = mmi_user_profile_current_mode_remind_volume_get();
+       #else
+               volume = query_current_volume();
+       #endif
                if(!Hal_Set_BT_Audio_Path(volume))
                {
                        Hal_Call_Speaker(HAL_CALL_SPK_ON, volume);
                }
         Hal_NFFS_File_Play_Repeat(AUDIO_INCOMING_CALL, volume);
 
+        // vibrate
+               if(true == mmi_watch_vibrate_is_permitted())
+               {
+               Hal_Vibrator_Play_Repeat();
+               }
 
                //
                mmi_video_call_jrtc_config_init_01(s_video_call_tokens);

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 5a20b5e..19ef344 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
@@ -57,6 +57,8 @@ void mmi_vc_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority)
                        return;
        }
         mmi_vc_activity_destroy_req();
+        Hal_Vibrator_Play_End();
+               Hal_Tone_Play_End();
         Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
     }
 }
@@ -825,6 +827,7 @@ 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__);
 
        //
+       Hal_Vibrator_Play_End();
     Hal_Tone_Play_End();
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
 
@@ -851,6 +854,7 @@ 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);
 
     // stop playing tone
+       Hal_Vibrator_Play_End();
     Hal_Tone_Play_End();
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
        
@@ -1459,13 +1463,24 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type,
                memset(s_vc_uid, 0x0, MMI_WATCH_VC_UID_LEN);
                strncpy(s_vc_uid, t_uid, MMI_WATCH_VC_UID_LEN - 1);
                
-               HAL_SPEAKER_GAIN volume = query_current_volume();
+               // ring
+               uint8_t volume = 0;
+       #ifdef __MMI_USER_PROFILE_SUPPORT__
+               volume = mmi_user_profile_current_mode_remind_volume_get();
+       #else
+               volume = query_current_volume();
+       #endif
                if(!Hal_Set_BT_Audio_Path(volume))
                {
                        Hal_Call_Speaker(HAL_CALL_SPK_ON, volume);
                }
         Hal_NFFS_File_Play_Repeat(AUDIO_INCOMING_CALL, volume);
 
+        // vibrate
+               if(true == mmi_watch_vibrate_is_permitted())
+               {
+               Hal_Vibrator_Play_Repeat();
+               }
 
                //
                mmi_video_call_jrtc_config_init_01(s_vc_appkey, s_vc_secret, s_vc_tokens, s_vc_uid);

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 f384fe4..66cf800 100644 (file)
--- 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
@@ -51,6 +51,8 @@ void mmi_vc_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority)
                        return;
        }
         mmi_vc_activity_destroy_req();
+        Hal_Vibrator_Play_End();
+               Hal_Tone_Play_End();
         Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
     }
 }
@@ -821,6 +823,7 @@ 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__);
 
        //
+       Hal_Vibrator_Play_End();
     Hal_Tone_Play_End();
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
 
@@ -846,6 +849,7 @@ 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);
 
     // stop playing tone
+       Hal_Vibrator_Play_End();
     Hal_Tone_Play_End();
     Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
        
@@ -1437,13 +1441,25 @@ void mmi_vc_call_action_incoming(char * number, MODEM_VIDEO_CALL_TYPE type)
                        }
                }
                
-               HAL_SPEAKER_GAIN volume = query_current_volume();
+               // ring
+               uint8_t volume = 0;
+       #ifdef __MMI_USER_PROFILE_SUPPORT__
+               volume = mmi_user_profile_current_mode_remind_volume_get();
+       #else
+               volume = query_current_volume();
+       #endif
                if(!Hal_Set_BT_Audio_Path(volume))
                {
                        Hal_Call_Speaker(HAL_CALL_SPK_ON, volume);
                }
         Hal_NFFS_File_Play_Repeat(AUDIO_INCOMING_CALL, volume);
 
+        // vibrate
+               if(true == mmi_watch_vibrate_is_permitted())
+               {
+               Hal_Vibrator_Play_Repeat();
+               }
+
                mmi_watch_wake_up();
                
         voip_rat_check_start();