Merge branch 'dev' of https://github.com/ywmoyue/biliuwp-lite into dev

ywmoyue · Feb 21, 2024 · 5d786b8 · 5d786b8
2 parents 03820c5 + 5cff9f5
commit 5d786b8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/BiliLite.UWP/Pages/LiveDetailPage.xaml b/src/BiliLite.UWP/Pages/LiveDetailPage.xaml
@@ -571,13 +571,13 @@
                                         <TextBlock x:Name="BottomTextPostion" VerticalAlignment="Center" Foreground="White" Margin="8 0" FontSize="18" Text="{x:Bind Path=m_liveRoomViewModel.LiveTime,Mode=OneWay}"></TextBlock>
 
 
-                                        <Button x:Name="TopBtnOpenDanmaku" Click="TopBtnOpenDanmaku_Click" Visibility="{x:Bind Path=DanmuControl.Visibility,Mode=OneWay,Converter={StaticResource display}}" Background="Transparent" Padding="0" Width="48" Height="48">
+                                        <Button x:Name="TopBtnOpenDanmaku" BorderThickness="0" Click="TopBtnOpenDanmaku_Click" Visibility="{x:Bind Path=DanmuControl.Visibility,Mode=OneWay,Converter={StaticResource display}}" Background="Transparent" Padding="0" Width="48" Height="48">
                                             <Image Width="28" Height="28" Source="/Assets/Icon/icon_danmaku_open.png" ></Image>
                                         </Button>
-                                        <Button x:Name="TopBtnCloseDanmaku"  Click="TopBtnCloseDanmaku_Click" Visibility="{x:Bind Path=DanmuControl.Visibility,Mode=OneWay}" Background="Transparent" Padding="0" Width="48" Height="48">
+                                        <Button x:Name="TopBtnCloseDanmaku" BorderThickness="0" Click="TopBtnCloseDanmaku_Click" Visibility="{x:Bind Path=DanmuControl.Visibility,Mode=OneWay}" Background="Transparent" Padding="0" Width="48" Height="48">
                                             <Image Width="28" Height="28" Source="/Assets/Icon/icon_danmaku_close.png" ></Image>
                                         </Button>
-                                        <Button x:Name="TopBtnSettingDanmaku"  Background="Transparent" Padding="0" Width="48" Height="48">
+                                        <Button x:Name="TopBtnSettingDanmaku" BorderThickness="0" Background="Transparent" Padding="0" Width="48" Height="48">
                                             <Image Width="28" Height="28" Source="/Assets/Icon/icon_danmaku_setting.png" ></Image>
                                             <Button.Flyout>
                                                 <Flyout>
@@ -624,7 +624,11 @@
 
 
                                     <StackPanel Orientation="Horizontal" Grid.Column="2">
-                                        <Button x:Name="BottomBtnVolume" Background="Transparent" Foreground="White" Padding="8" Width="48" Height="48">
+                                        <HyperlinkButton x:Name="BottomBtnGiftRow" Margin="0 0 10 0" Click="BottomBtnSwitchGiftBar_Click" ToolTipService.ToolTip="开关礼物栏" Foreground="White" Padding="8" Width="48" Height="48">
+                                            <fa:FontAwesome Icon="Solid_Gift" FontSize="22"></fa:FontAwesome>
+                                        </HyperlinkButton>
+
+                                        <Button x:Name="BottomBtnVolume" BorderThickness="0" Background="Transparent" Foreground="White" Padding="8" Width="48" Height="48">
                                             <fa:FontAwesome x:Name="BottomBtnVolumeIcon" Icon="Solid_VolumeUp"  FontSize="20"></fa:FontAwesome>
                                             <Button.Flyout>
                                                 <Flyout>
@@ -702,7 +706,7 @@
                         </Grid>
                     </Grid>
                 </Grid>
-                <Grid Grid.Row="1">
+                <Grid Grid.Row="1" x:Name="BottomGiftBar" Visibility="{x:Bind m_viewModel.ShowBottomGiftBar, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*"/>

diff --git a/src/BiliLite.UWP/Pages/LiveDetailPage.xaml.cs b/src/BiliLite.UWP/Pages/LiveDetailPage.xaml.cs
@@ -1248,5 +1248,10 @@ private async void PlayUrlSourceComboBox_OnSelectionChanged(object sender, Selec
             LiveRoomViewModelChangedPlayUrl(null, null);
             await LoadPlayer();
         }
+
+        private void BottomBtnSwitchGiftBar_Click(object sender, RoutedEventArgs e)
+        {
+            m_viewModel.ShowBottomGiftBar = !m_viewModel.ShowBottomGiftBar;
+        }
     }
 }
diff --git a/src/BiliLite.UWP/ViewModels/Live/LiveDetailPageViewModel.cs b/src/BiliLite.UWP/ViewModels/Live/LiveDetailPageViewModel.cs
@@ -80,5 +80,7 @@ public string LoadText
         public LivePlayerMode LivePlayerMode { get; set; }
 
         public string LivePlayUrlSource { get; set; }
+
+        public bool ShowBottomGiftBar { get; set; } = true;
     }
 }