From 1ad6d6b03368f5adc0cc573cd25a33eaa58bced6 Mon Sep 17 00:00:00 2001
From: lxmou666 <772765102@qq.com>
Date: Sat, 13 Feb 2021 15:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
JianGongYun/TRTC/LiveClassroom.cs | 39 ++++++++++++++-----
.../TRTC/ViewModels/SettingWindowViewModel.cs | 8 ++--
JianGongYun/TRTC/Windows/LiveWindow.xaml | 6 +--
JianGongYun/TRTC/Windows/LiveWindow.xaml.cs | 3 +-
JianGongYun/TRTC/Windows/SettingWindow.xaml | 3 +-
5 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/JianGongYun/TRTC/LiveClassroom.cs b/JianGongYun/TRTC/LiveClassroom.cs
index 9d64b45..fd7f8b9 100644
--- a/JianGongYun/TRTC/LiveClassroom.cs
+++ b/JianGongYun/TRTC/LiveClassroom.cs
@@ -114,14 +114,7 @@ namespace JianGongYun.TRTC
}
lTXDeviceManager.setCurrentDeviceVolume(TRTCDeviceType.TXMediaDeviceTypeMic, settingWindowViewModel.MicVolume);//麦克风采集音量
lTRTCCloud.setSystemAudioLoopbackVolume(settingWindowViewModel.SytemGatherVolume);//系统声音采集音量
- if (settingWindowViewModel.AudioSource == "2")
- {
- lTRTCCloud.startSystemAudioLoopback(null);
- }
- else
- {
- lTRTCCloud.stopSystemAudioLoopback();
- }
+
//设备完结
//liveWinMode.LoadAllScreen();
@@ -367,6 +360,24 @@ namespace JianGongYun.TRTC
lTRTCCloud.stopAudioRecording();
}
}
+ public static void EnableAudio()
+ {
+ if (settingWindowViewModel.AudioSource == "1")
+ {
+ lTRTCCloud.muteLocalAudio(false);
+ lTRTCCloud.stopSystemAudioLoopback();
+ }
+ else if (settingWindowViewModel.AudioSource == "2")
+ {
+ lTRTCCloud.muteLocalAudio(true);
+ lTRTCCloud.startSystemAudioLoopback(null);
+ }
+ else if (settingWindowViewModel.AudioSource == "3")
+ {
+ lTRTCCloud.muteLocalAudio(false);
+ lTRTCCloud.startSystemAudioLoopback(null);
+ }
+ }
///
/// 关闭麦克风
///
@@ -390,7 +401,17 @@ namespace JianGongYun.TRTC
if (liveWinMode.MicRunning)
{
liveWinMode.MicMute = mute.HasValue ? mute.Value : !liveWinMode.MicMute;
- lTRTCCloud.muteLocalAudio(liveWinMode.MicMute);
+ if (liveWinMode.MicMute)
+ {
+ lTRTCCloud.muteLocalAudio(true);
+ lTRTCCloud.stopSystemAudioLoopback();
+
+ }
+ else
+ {
+ EnableAudio();
+ }
+ //lTRTCCloud.muteLocalAudio(liveWinMode.MicMute);
}
}
diff --git a/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs b/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs
index b1da095..914b988 100644
--- a/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs
+++ b/JianGongYun/TRTC/ViewModels/SettingWindowViewModel.cs
@@ -173,12 +173,12 @@ namespace JianGongYun.TRTC.ViewModels
if (_AudioSource == "1")//只采集麦克风，关闭系统音采集
{
ShowSytemGatherSlider = Visibility.Collapsed;
- LiveClassroom.lTRTCCloud.stopSystemAudioLoopback();
+ //LiveClassroom.lTRTCCloud.stopSystemAudioLoopback();
}
- else if (_AudioSource == "2")//麦和系统音，开启采集系统音
+ else if (_AudioSource == "2" || _AudioSource == "3")//麦和系统音，开启采集系统音
{
ShowSytemGatherSlider = Visibility.Visible;
- LiveClassroom.lTRTCCloud.startSystemAudioLoopback(null);
+ //LiveClassroom.lTRTCCloud.startSystemAudioLoopback(null);
}
if (PropertyChanged != null)
{
@@ -195,7 +195,7 @@ namespace JianGongYun.TRTC.ViewModels
{
get
{
- if (AudioSource == "2")
+ if (AudioSource == "2"||AudioSource=="3")
{
_ShowSytemGatherSlider = Visibility.Visible;
}
diff --git a/JianGongYun/TRTC/Windows/LiveWindow.xaml b/JianGongYun/TRTC/Windows/LiveWindow.xaml
index aa31eb4..707a10b 100644
--- a/JianGongYun/TRTC/Windows/LiveWindow.xaml
+++ b/JianGongYun/TRTC/Windows/LiveWindow.xaml
@@ -88,8 +88,8 @@