From 116eccf2b8b844c411622cf24d7bb7f3f72d04d4 Mon Sep 17 00:00:00 2001
From: lxmou666 <772765102@qq.com>
Date: Fri, 26 Mar 2021 11:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=86=E4=BA=AB=E6=A1=8C?=
 =?UTF-8?q?=E9=9D=A21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JianGongYun/TRTC/Windows/LiveWindow.xaml    |  3 ++-
 JianGongYun/TRTC/Windows/LiveWindow.xaml.cs | 25 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/JianGongYun/TRTC/Windows/LiveWindow.xaml b/JianGongYun/TRTC/Windows/LiveWindow.xaml
index 5173eb4..7e0bfe4 100644
--- a/JianGongYun/TRTC/Windows/LiveWindow.xaml
+++ b/JianGongYun/TRTC/Windows/LiveWindow.xaml
@@ -232,7 +232,8 @@
                                     <Grid Margin="5" Background="#2f3035" Grid.Row="1" Grid.Column="1">
                                         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                             <Path Margin="0 0 0 15" Width="30" Height="45" Fill="#cccccc" Shape.Stretch="Fill" Data="{StaticResource Icon_Mic}" />
-                                            <Metro:AduRadioButton  x:Name="Rad4" Click="Tpye_Click" GroupName="LiveType" Foreground="#cccccc" Content="仅声音" FontSize="14" IconWidth="16" IsChecked="{Binding LiveType,Converter={StaticResource LiveTypeConverter},ConverterParameter=OnlyAudio}" />
+                                            <!--仅声音-->
+                                            <Metro:AduRadioButton  x:Name="Rad4" Click="Tpye_Click" GroupName="LiveType" Foreground="#cccccc" Content="分享桌面开始直播" FontSize="14" IconWidth="16" IsChecked="{Binding LiveType,Converter={StaticResource LiveTypeConverter},ConverterParameter=OnlyAudio}" />
                                         </StackPanel>
                                     </Grid>
                                 </Grid>
diff --git a/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs b/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
index 4d5f20d..433094b 100644
--- a/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
+++ b/JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
@@ -235,6 +235,14 @@ namespace JianGongYun.TRTC.Windows
 
                     LiveClassroom.EnableAudio();
 
+                    if (LiveWindowViewModel.LiveType == Models.LiveTypeEnum.OnlyAudio)//仅声音改为默认分享第一个桌面，并且收起窗口
+                    {
+                        this.Dispatcher.Invoke(new Action(() => LiveWindowViewModel.LoadAllScreen()));
+                        LiveWindowViewModel.CurrentShareScreen = LiveWindowViewModel.LiveScreens?[0].Info;
+                        LiveClassroom.StartVideoSub(AfterLiveSubViewWrap);
+                        PackUp_Click(sender, e);
+                    }
+
                 }, SettingWindowViewModel.ScreenRecordingCountdown);
             }
             else
@@ -346,7 +354,7 @@ namespace JianGongYun.TRTC.Windows
             LiveWindowViewModel.ShowShareScreenList = false;
         }
 
-        private void ShareList_Selected(object sender, RoutedEventArgs e)
+        private void ShareList_Selected(object sender, MouseButtonEventArgs e)
         {
             CloseShareList_Click(sender, e);
             if (LiveWindowViewModel.ScreenRunning)
@@ -419,12 +427,17 @@ namespace JianGongYun.TRTC.Windows
             }
             else
             {
-                if (LiveWindowViewModel.CurrentShareScreen == null)//没选择过窗口需要选一次
-                {
-                    LiveWindowViewModel.ShowShareScreenList = true;
-                    this.Dispatcher.Invoke(new Action(() => LiveWindowViewModel.LoadAllScreen()));
-                }
+                //if (LiveWindowViewModel.CurrentShareScreen == null)//没选择过窗口需要选一次
+                //{
+                //    LiveWindowViewModel.ShowShareScreenList = true;
+                //    this.Dispatcher.Invoke(new Action(() => LiveWindowViewModel.LoadAllScreen()));
+                //}
+                //LiveClassroom.StartVideoSub(AfterLiveSubViewWrap);
+                //直接分享桌面1并收起
+                this.Dispatcher.Invoke(new Action(() => LiveWindowViewModel.LoadAllScreen()));
+                LiveWindowViewModel.CurrentShareScreen = LiveWindowViewModel.LiveScreens?[0].Info;
                 LiveClassroom.StartVideoSub(AfterLiveSubViewWrap);
+                PackUp_Click(sender, e);
             }
             NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
             {