From 7741bdb1c01eb36e827520209b807b74509723d5 Mon Sep 17 00:00:00 2001
From: lxmou666 <772765102@qq.com>
Date: Tue, 16 Feb 2021 14:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JianGongYun/TRTC/LiveClassroom.cs           | 22 ++++++++++++---------
 JianGongYun/TRTC/Windows/LiveWindow.xaml.cs |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/JianGongYun/TRTC/LiveClassroom.cs b/JianGongYun/TRTC/LiveClassroom.cs
index fd7f8b9..949b0fa 100644
--- a/JianGongYun/TRTC/LiveClassroom.cs
+++ b/JianGongYun/TRTC/LiveClassroom.cs
@@ -114,7 +114,7 @@ namespace JianGongYun.TRTC
             }
             lTXDeviceManager.setCurrentDeviceVolume(TRTCDeviceType.TXMediaDeviceTypeMic, settingWindowViewModel.MicVolume);//麦克风采集音量
             lTRTCCloud.setSystemAudioLoopbackVolume(settingWindowViewModel.SytemGatherVolume);//系统声音采集音量
-            
+
             //设备完结
 
             //liveWinMode.LoadAllScreen();
@@ -362,19 +362,22 @@ namespace JianGongYun.TRTC
         }
         public static void EnableAudio()
         {
-             if (settingWindowViewModel.AudioSource == "1")
+            if (settingWindowViewModel.AudioSource == "1")
             {
-                lTRTCCloud.muteLocalAudio(false);
+                //lTRTCCloud.muteLocalAudio(false);
+                lTXDeviceManager.setCurrentDeviceVolume(ManageLiteAV.TRTCDeviceType.TXMediaDeviceTypeMic, settingWindowViewModel.MicVolume);
                 lTRTCCloud.stopSystemAudioLoopback();
             }
             else if (settingWindowViewModel.AudioSource == "2")
             {
-                lTRTCCloud.muteLocalAudio(true);
+                //lTRTCCloud.muteLocalAudio(true);
+                lTXDeviceManager.setCurrentDeviceVolume(ManageLiteAV.TRTCDeviceType.TXMediaDeviceTypeMic, 0);
                 lTRTCCloud.startSystemAudioLoopback(null);
             }
             else if (settingWindowViewModel.AudioSource == "3")
             {
-                lTRTCCloud.muteLocalAudio(false);
+                //lTRTCCloud.muteLocalAudio(false);
+                lTXDeviceManager.setCurrentDeviceVolume(ManageLiteAV.TRTCDeviceType.TXMediaDeviceTypeMic, settingWindowViewModel.MicVolume);
                 lTRTCCloud.startSystemAudioLoopback(null);
             }
         }
@@ -403,7 +406,8 @@ namespace JianGongYun.TRTC
                 liveWinMode.MicMute = mute.HasValue ? mute.Value : !liveWinMode.MicMute;
                 if (liveWinMode.MicMute)
                 {
-                    lTRTCCloud.muteLocalAudio(true);
+                    //lTRTCCloud.muteLocalAudio(true);
+                    lTXDeviceManager.setCurrentDeviceVolume(ManageLiteAV.TRTCDeviceType.TXMediaDeviceTypeMic, 0);
                     lTRTCCloud.stopSystemAudioLoopback();
 
                 }
@@ -520,7 +524,7 @@ namespace JianGongYun.TRTC
                         }
                     }
 
-                Skip1:
+                    Skip1:
 
                     if (liveWinMode.CameraRunning)//摄像头分享中
                     {
@@ -548,7 +552,7 @@ namespace JianGongYun.TRTC
                         }
                     }
 
-                Skip2:
+                    Skip2:
 
                     mats.Enqueue(BackgroundFrame.CvtColor(ColorConversionCodes.BGRA2BGR));
                     Interlocked.Increment(ref runFps);
@@ -756,7 +760,7 @@ namespace JianGongYun.TRTC
             //}
             //CallerWindow.Close();//直接关闭
             Environment.Exit(0);
-            
+
         }
 
 
diff --git a/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs b/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
index feba1c3..c645166 100644
--- a/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
+++ b/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
@@ -33,7 +33,7 @@ namespace JianGongYun.TRTC.Windows
         {
             InitializeComponent();
             NoticeManager.Initialize();
-            AttachConsole(-1);//把进程挂在控制台，通过命令行启动程序可以看到控制台输出
+            //AttachConsole(-1);//把进程挂在控制台，通过命令行启动程序可以看到控制台输出
             LiveWindowViewModel = new ViewModels.LiveWindowViewModel();
             SettingWindowViewModel = ViewModels.SettingWindowViewModel.GetInstance();
             this.DataContext = LiveWindowViewModel;