lxmou666/JianGongYun
lxmou666
/
JianGongYun
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

默认分享桌面1

This commit is contained in:
lxmou666 2021-03-26 11:28:02 +08:00
parent 882be47988
commit 116eccf2b8
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
JianGongYun/TRTC/Windows/LiveWindow.xaml
View File

@ -232,7 +232,8 @@
<Grid Margin="5" Background="#2f3035" Grid.Row="1" Grid.Column="1"> <Grid Margin="5" Background="#2f3035" Grid.Row="1" Grid.Column="1">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<Path Margin="0 0 0 15" Width="30" Height="45" Fill="#cccccc" Shape.Stretch="Fill" Data="{StaticResource Icon_Mic}" /> <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> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>

25
JianGongYun/TRTC/Windows/LiveWindow.xaml.cs
View File

@ -235,6 +235,14 @@ namespace JianGongYun.TRTC.Windows
LiveClassroom.EnableAudio(); 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); }, SettingWindowViewModel.ScreenRecordingCountdown);
} }
else else
@ -346,7 +354,7 @@ namespace JianGongYun.TRTC.Windows
LiveWindowViewModel.ShowShareScreenList = false; LiveWindowViewModel.ShowShareScreenList = false;
} }
private void ShareList_Selected(object sender, RoutedEventArgs e) private void ShareList_Selected(object sender, MouseButtonEventArgs e)
{ {
CloseShareList_Click(sender, e); CloseShareList_Click(sender, e);
if (LiveWindowViewModel.ScreenRunning) if (LiveWindowViewModel.ScreenRunning)
@ -419,12 +427,17 @@ namespace JianGongYun.TRTC.Windows
} }
else else
{ {
if (LiveWindowViewModel.CurrentShareScreen == null)//没选择过窗口需要选一次 //if (LiveWindowViewModel.CurrentShareScreen == null)//没选择过窗口需要选一次
{ //{
LiveWindowViewModel.ShowShareScreenList = true; // LiveWindowViewModel.ShowShareScreenList = true;
this.Dispatcher.Invoke(new Action(() => LiveWindowViewModel.LoadAllScreen())); // 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); LiveClassroom.StartVideoSub(AfterLiveSubViewWrap);
PackUp_Click(sender, e);
} }
NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel() NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel()
{ {