weizhengliang 3 лет назад
Родитель
Сommit
ceb8c7ec56

+ 2 - 0
callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -341,6 +341,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         SettingConfig.setSipOverTime(this, partSetting.sipOvertime)
         SettingConfig.setSleepTime(this, partSetting.sleepSecondsBed)
 
+        VoiceManagerUtil.setCallVoice(activity, partSetting.dayBedVol)
+
         updateSettings(true)
     }
 

+ 3 - 3
callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/SkyCallFragment.kt

@@ -202,7 +202,7 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
             Log.e("dds", "audio call session state: " + session.state)
             if (session.state == EnumType.CallState.Incoming) {
                 session.joinHome(session.roomId)
-                session.toggleSpeaker(true)
+                session.toggleSpeaker(false)
             } else if (session.state == EnumType.CallState.Idle) {
                 callEnd()
                 return
@@ -233,7 +233,7 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
                 }
 
                 session.joinHome(session.roomId)
-                session.toggleSpeaker(true)
+                session.toggleSpeaker(false)
             } else if (session.state == EnumType.CallState.Idle) {
                 callEnd()
                 return
@@ -284,7 +284,7 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
             } else {
                 Constant.CALL_STATE = Constant.CALL_CALLING
                 session.setSessionCallback(this)
-                session.toggleSpeaker(true)
+                session.toggleSpeaker(false)
 
                 //3s还未连接上则判定为通话失败
                 Handler().postDelayed({

+ 6 - 6
rtc-chat/src/main/java/com/wdkl/skywebrtc/engine/webrtc/WebRTCEngine.java

@@ -137,8 +137,8 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
             mCallback.joinRoomSucc();
         }
 
-        toggleSpeaker(true);
-        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
+        //toggleSpeaker(true);
+        //audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
     }
 
     @Override
@@ -668,18 +668,18 @@ numb.viagenie.ca
     // 配置音频参数
     private MediaConstraints createAudioConstraints() {
         MediaConstraints audioConstraints = new MediaConstraints();
-        /*audioConstraints.mandatory.add(
+        audioConstraints.mandatory.add(
                 new MediaConstraints.KeyValuePair(AUDIO_ECHO_CANCELLATION_CONSTRAINT, "true"));
         audioConstraints.mandatory.add(
                 new MediaConstraints.KeyValuePair(AUDIO_AUTO_GAIN_CONTROL_CONSTRAINT, "false"));
         audioConstraints.mandatory.add(
                 new MediaConstraints.KeyValuePair(AUDIO_HIGH_PASS_FILTER_CONSTRAINT, "false"));
         audioConstraints.mandatory.add(
-                new MediaConstraints.KeyValuePair(AUDIO_NOISE_SUPPRESSION_CONSTRAINT, "true"));*/
+                new MediaConstraints.KeyValuePair(AUDIO_NOISE_SUPPRESSION_CONSTRAINT, "true"));
 
         // 添加所有现有的音频过滤器,以避免回声
         //回声消除
-        audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googEchoCancellation", "true"));
+        /*audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googEchoCancellation", "true"));
         audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googEchoCancellation2", "true"));
         audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googDAEchoCancellation", "true"));
         //自动增益
@@ -691,7 +691,7 @@ numb.viagenie.ca
         audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googTypingNoiseDetection", "true"));
         //高音过滤
         audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googAudioMirroring", "false"));
-        audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googHighpassFilter", "true"));
+        audioConstraints.mandatory.add(new MediaConstraints.KeyValuePair("googHighpassFilter", "true"));*/
         return audioConstraints;
     }