From f987e568c8e26a66284250adbcc3a954c14aa9ca Mon Sep 17 00:00:00 2001
From: lxmou666 <772765102@qq.com>
Date: Tue, 16 Feb 2021 12:54:24 +0800
Subject: [PATCH] 123

---
 JianGongYun/TRTC/Windows/LiveWindow.xaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/JianGongYun/TRTC/Windows/LiveWindow.xaml b/JianGongYun/TRTC/Windows/LiveWindow.xaml
index 707a10b..6aaa5a9 100644
--- a/JianGongYun/TRTC/Windows/LiveWindow.xaml
+++ b/JianGongYun/TRTC/Windows/LiveWindow.xaml
@@ -113,13 +113,13 @@
                         <Grid x:Name="BeforeLiveSubViewWrap" Width="{Binding ElementName=BeforeLivePanel,Path=ActualWidth}" Height="{Binding ElementName=BeforeLivePanel,Path=ActualHeight}" Canvas.Top="0" Canvas.Left="0"></Grid>
                         <!--标题和直播类型选项-->
                         <Grid Width="{Binding ElementName=BeforeLivePanel,Path=ActualWidth}" Height="{Binding ElementName=BeforeLivePanel,Path=ActualHeight}" Canvas.Top="0" Canvas.Left="0">
-                            <StackPanel Width="700" VerticalAlignment="Center">
+                            <StackPanel Width="500" VerticalAlignment="Center">
                                 <TextBlock FontSize="30" Foreground="#999999" HorizontalAlignment="Center">请选择授课方式</TextBlock>
                                 <TextBlock HorizontalAlignment="Center" FontSize="16" Margin="0 10 0 0" Foreground="#999999">您可在上课期间随时调整授课方式</TextBlock>
                                 <Grid Margin="0 30 0 0" Height="300">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition></ColumnDefinition>
-                                        <ColumnDefinition></ColumnDefinition>
+                                        <!--<ColumnDefinition></ColumnDefinition>
+                                        <ColumnDefinition></ColumnDefinition>-->
                                         <ColumnDefinition></ColumnDefinition>
                                         <ColumnDefinition></ColumnDefinition>
                                     </Grid.ColumnDefinitions>
@@ -127,7 +127,8 @@
                                         <RowDefinition></RowDefinition>
                                         <RowDefinition></RowDefinition>
                                     </Grid.RowDefinitions>
-                                    <Grid Margin="5" Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" Background="#2f3035">
+                                    <!--Grid.RowSpan="2" Grid.ColumnSpan="2"-->
+                                    <Grid Margin="5" Grid.Row="0" Grid.Column="0" Background="#2f3035">
                                         <Canvas x:Name="CameraPrew">
                                             <Grid Width="{Binding ElementName=CameraPrew,Path=ActualWidth}" Height="{Binding ElementName=CameraPrew,Path=ActualHeight}" Canvas.Top="0" Canvas.Left="0">
                                                 <Path Margin="0 0 0 30" Width="111" Height="111" Fill="#cccccc" Shape.Stretch="Fill" Data="{StaticResource Icon_User}" />
@@ -147,19 +148,19 @@
                                             <Metro:AduRadioButton x:Name="Rad1" Click="Tpye_Click" GroupName="LiveType" Foreground="#cccccc" Content="摄像头+屏幕分享" FontSize="14" IconWidth="16" IsChecked="{Binding LiveType,Converter={StaticResource LiveTypeConverter},ConverterParameter=CameraAndScreen}" />
                                         </StackPanel>
                                     </Grid>-->
-                                    <Grid Margin="5" Background="#2f3035" Grid.Row="0" Grid.Column="2">
+                                    <Grid Margin="5" Background="#2f3035" Grid.Row="1" Grid.Column="0">
                                         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                             <Path Margin="0 0 0 30" Width="30" Height="30" Fill="#cccccc" Shape.Stretch="Fill" Data="{StaticResource Icon_Screen}" />
                                             <Metro:AduRadioButton x:Name="Rad2" Click="Tpye_Click" GroupName="LiveType" Foreground="#cccccc" Content="屏幕分享" FontSize="14" IconWidth="16" IsChecked="{Binding LiveType,Converter={StaticResource LiveTypeConverter},ConverterParameter=OnlyScreen}" />
                                         </StackPanel>
                                     </Grid>
-                                    <Grid Margin="5" Background="#2f3035" Grid.Row="0" Grid.Column="3">
+                                    <Grid Margin="5" Background="#2f3035" Grid.Row="0" Grid.Column="1">
                                         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                             <Path Margin="0 0 0 25" Width="30" Height="35" Fill="#cccccc" Shape.Stretch="Fill" Data="{StaticResource Icon_Camera}" />
                                             <Metro:AduRadioButton  x:Name="Rad3" Click="Tpye_Click" GroupName="LiveType" Foreground="#cccccc" Content="摄像头" FontSize="14" IconWidth="16" IsChecked="{Binding LiveType,Converter={StaticResource LiveTypeConverter},ConverterParameter=OnlyCamera}" />
                                         </StackPanel>
                                     </Grid>
-                                    <Grid Margin="5" Background="#2f3035" Grid.Row="1" Grid.Column="2">
+                                    <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}" />