Quellcode durchsuchen

优化音量设置,解决免提音量设置无效问题

weizhengliang vor 3 Jahren
Ursprung
Commit
80fe645bff

+ 4 - 0
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -291,6 +291,8 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         //门口机通话音量 没做白昼区分
         SettingConfig.setDoorPhoneVolume(this, SettingConfiguration.getInstance().dayDoorVol)
 
+        VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostHandsFreePlayVolume(this.activity))
+
         updateTime(true)
     }
 
@@ -668,6 +670,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
                 Log.e(TAG,"手柄放下 ")
                 Constants.hookOn = true
                 VoiceManagerUtil.switchAudioMode(activity, true)
+                VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostHandsFreePlayVolume(activity))
                 if (Constants.CALL_STATE == Constants.CALL_OUTGOING) {
                     //呼出取消
                     Constants.CALL_STATE = Constants.CALL_STANDBY
@@ -694,6 +697,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
                 Log.e(TAG,"手柄拿起 ")
                 Constants.hookOn = false
                 VoiceManagerUtil.switchAudioMode(activity, false)
+                VoiceManagerUtil.setCallVoice(activity, SettingConfig.getHostGamepadPlayVolume(activity))
                 if (Constants.CALL_STATE == Constants.CALL_INCOMING) {
                     //来电接听
                     //通话之前先判断webrtc socket是否连接上,否则不能建立通话

+ 2 - 0
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt

@@ -349,10 +349,12 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
             R.id.host_hands_free_play_volume_seekb -> { //主机免提播放音量
                 host_hands_free_play_volume_tv.text = p1.toString()
                 //todo 这里需要配合语音通话 视屏通话通讯使用
+                VoiceManagerUtil.setCallVoice(this.activity, p1)
             }
             R.id.host_gamepad_play_volume_seekb -> { //主机手柄播放音量
                 host_gamepad_play_volume_tv.text = p1.toString()
                 //todo 这里需要配合语音通话 视屏通话通讯使用
+                VoiceManagerUtil.setCallVoice(this.activity, p1)
             }
             R.id.extension_daytime_brightness_seekb -> { //分机白天亮度设置
                 extension_daytime_brightness_tv.text = p1.toString()

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

@@ -66,6 +66,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
     // 服务器实例列表
     private String serverIP = "8.129.220.143";
     //private String serverIP = "172.28.100.100";
+    //private String serverIP = "172.168.0.254";
     private String turnUser = "wdklrtc";
     private String turnUserPwd = "Wdkl2021Rtc";
 
@@ -376,7 +377,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
                 //免提
                 audioManager.setMode(AudioManager.MODE_NORMAL);
                 audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
-                        audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL),
+                        audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL),
                         AudioManager.FX_KEY_CLICK);
                 audioManager.setSpeakerphoneOn(true);
             } else {