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 @@ - + + 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() {