From 20b7f8cd593af8c1419d72badde17763c069d3f8 Mon Sep 17 00:00:00 2001
From: ywmoyue <ywmoyue@163.com>
Date: Sat, 21 Sep 2024 21:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=8E=A7=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AB=A0=E8=8A=82=E7=9C=8B=E7=82=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Icon/icon_view_point.png           | Bin 0 -> 2413 bytes
 src/BiliLite.UWP/BiliLite.UWP.csproj          |   1 +
 src/BiliLite.UWP/Controls/PlayerControl.xaml  |  61 +++++++++++++++---
 .../Controls/PlayerControl.xaml.cs            |  24 ++++++-
 src/BiliLite.UWP/Modules/Player/PlayerVM.cs   |  22 +++++++
 .../ViewModels/PlayControlViewModel.cs        |   7 ++
 6 files changed, 106 insertions(+), 9 deletions(-)
 create mode 100644 src/BiliLite.UWP/Assets/Icon/icon_view_point.png

diff --git a/src/BiliLite.UWP/Assets/Icon/icon_view_point.png b/src/BiliLite.UWP/Assets/Icon/icon_view_point.png
new file mode 100644
index 0000000000000000000000000000000000000000..29d825be8b77b4adaf4865d94e1110fe5e2b2531
GIT binary patch
literal 2413
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

literal 0
HcmV?d00001

diff --git a/src/BiliLite.UWP/BiliLite.UWP.csproj b/src/BiliLite.UWP/BiliLite.UWP.csproj
index e572155df..240e55ff3 100644
--- a/src/BiliLite.UWP/BiliLite.UWP.csproj
+++ b/src/BiliLite.UWP/BiliLite.UWP.csproj
@@ -941,6 +941,7 @@
   <ItemGroup>
     <Content Include="Assets\GeeTest\bili_gt.html" />
     <Content Include="Assets\GeeTest\gt.js" />
+    <Content Include="Assets\Icon\icon_view_point.png" />
     <Content Include="Assets\Icon\ic_play.png" />
     <Content Include="Assets\Icon\icon_share.png" />
     <Content Include="Assets\Icon\ic_live_center_gold_recharge.png" />
diff --git a/src/BiliLite.UWP/Controls/PlayerControl.xaml b/src/BiliLite.UWP/Controls/PlayerControl.xaml
index 30bc4d2be..cd047621e 100644
--- a/src/BiliLite.UWP/Controls/PlayerControl.xaml
+++ b/src/BiliLite.UWP/Controls/PlayerControl.xaml
@@ -13,6 +13,7 @@
     xmlns:fa="using:FontAwesome5" xmlns:player="using:BiliLite.Modules.Player"
     xmlns:common="using:BiliLite.Models.Common"
     xmlns:player1="using:BiliLite.Models.Common.Player"
+    xmlns:modules="using:BiliLite.Modules"
     d:DesignHeight="800"
     d:DesignWidth="1000">
     <UserControl.Resources>
@@ -410,7 +411,7 @@
                                     <TextBlock Margin="0 4 0 0">弹幕同屏密度(0为不限制) <Run Text="{x:Bind Path=DanmuSettingMaxNum.Value,Mode=OneWay,Converter={StaticResource numberToStringConvert}}"/></TextBlock>
                                     <Slider  x:Name="DanmuSettingMaxNum" Value="0" Minimum="0" Maximum="50" StepFrequency="1"></Slider>
                                     <TextBlock Margin="0 4 0 0">
-                                        弹幕字体 
+                                        弹幕字体
                                     </TextBlock>
                                     <AutoSuggestBox QueryIcon="Accept" x:Name="DanmuSettingFont"></AutoSuggestBox>
 
@@ -446,7 +447,7 @@
                                                 <TextBlock  Foreground="White" >合并重复弹幕</TextBlock>
                                             </ToggleSwitch.Header>
                                         </ToggleSwitch>
-                                        
+
                                     </Grid>
                                     <TextBlock Margin="0 8">屏蔽等级(0为不屏蔽) <Run Text="{x:Bind Path=DanmuSettingShieldLevel.Value,Mode=OneWay,Converter={StaticResource numberToStringConvert}}"/>级</TextBlock>
                                     <Slider x:Name="DanmuSettingShieldLevel"  Minimum="0" Maximum="10" StepFrequency="1"></Slider>
@@ -605,10 +606,10 @@
                    DoubleTapped="Grid_DoubleTapped">
                 <!--播放器-->
                 <local:Player x:Name="Player"  PlayStateChanged="Player_PlayStateChanged" PlayMediaEnded="Player_PlayMediaEnded" PlayMediaError="Player_PlayMediaError" ChangeEngine="Player_ChangeEngine" PlayMediaOpened="Player_PlayMediaOpened"/>
-               
+
                 <!--字幕-->
                 <Border x:Name="BorderSubtitle" Visibility="Collapsed" Opacity="{Binding ElementName=SubtitleSettingOpacity,Path=Value,Mode=OneWay}" Padding="3 4 8 4" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 24">
-                   
+
                 </Border>
                 <!--弹幕-->
                 <Grid>
@@ -666,7 +667,7 @@
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
-                
+
                 <Grid x:Name="VirtualProgressBar"
                       Visibility="{x:Bind m_viewModel.ShowVideoBottomVirtualProgressBar}">
                     <Grid.RowDefinitions>
@@ -702,9 +703,15 @@
                             <TextBlock x:Name="TopTitle" VerticalAlignment="Center" Foreground="White" FontSize="18" Margin="12 0" TextTrimming="CharacterEllipsis">第一集</TextBlock>
                             <StackPanel Grid.Column="1" Orientation="Horizontal">
                                 <TextBlock x:Name="TopOnline" Foreground="White" FontSize="16" VerticalAlignment="Center" Margin="12 0"></TextBlock>
+
+                                <Button x:Name="TopBtnViewPoints"
+                                        Visibility="{x:Bind m_viewModel.ShowViewPointsBtn,Mode=OneWay}"
+                                        Click="TopBtnViewPoints_OnClick" Background="Transparent" Padding="0" Width="48" Height="48">
+                                    <Image Width="28" Height="28" Source="/Assets/Icon/icon_view_point.png" ></Image>
+                                </Button>
+
                                 <Button x:Name="TopBtnSettingDanmaku" Click="TopBtnSettingDanmaku_Click" Background="Transparent" Padding="0" Width="48" Height="48">
                                     <Image Width="28" Height="28" Source="/Assets/Icon/icon_danmaku_setting.png" ></Image>
-
                                 </Button>
                                 <Button x:Name="TopBtnScreenshot" Click="TopBtnScreenshot_Click" Background="Transparent" Padding="0" Width="48" Height="48">
                                     <Button.KeyboardAccelerators>
@@ -887,7 +894,7 @@
                                 </StackPanel>
                             </Grid>
                         </Grid>
-                       
+
                     </Grid>
                     <Grid x:Name="MiniControl" Visibility="Collapsed" VerticalAlignment="Bottom">
                         <Grid.Background>
@@ -915,11 +922,49 @@
                         </StackPanel>
                         <ProgressBar VerticalAlignment="Bottom" Foreground="White" Value="{Binding ElementName=BottomProgress,Path=Value,Mode=OneWay}" Maximum="{Binding ElementName=BottomProgress,Path=Maximum,Mode=OneWay}"></ProgressBar>
                     </Grid>
-                   
+
                 </Grid>
                 <HyperlinkButton x:Name="BottomImageBtnPlay" Visibility="Collapsed"  Margin="24 100" Width="80" Height="80" Click="BottomBtnPlay_Click" VerticalAlignment="Bottom" HorizontalAlignment="Right" >
                     <Image Source="ms-appx:///Assets/Icon/ic_play.png"></Image>
                 </HyperlinkButton>
+
+                <!--看点列表-->
+                <Grid x:Name="ViewPointsGrid"
+                      Visibility="{x:Bind m_viewModel.ShowViewPointsView,Mode=OneWay}"
+                      Tapped="ViewPointsGrid_OnTapped"
+                      Background="Transparent">
+                    <Grid 
+                        Width="320"
+                        HorizontalAlignment="Right"
+                        Background="#C8000000">
+                        <ListView
+                            SelectionMode="Single"
+                            ItemsSource="{x:Bind m_viewModel.ViewPoints,Mode=OneWay}">
+                            <ListView.ItemTemplate>
+                                <DataTemplate x:DataType="modules:PlayerInfoViewPoint">
+                                    <ListViewItem>
+                                        <StackPanel Margin="0 8 0 8" Orientation="Horizontal" Tapped="ViewPoint_OnTapped"
+                                                    Background="Transparent">
+                                            <Image Source="{x:Bind ImgUrl}" Width="120"></Image>
+                                            <StackPanel Orientation="Vertical"
+                                                        Margin="8 0 0 0"
+                                                        Width="172">
+                                                <TextBlock Text="{x:Bind Content}"
+                                                           TextWrapping="Wrap"></TextBlock>
+                                                <TextBlock>
+                                                    <Run Text="{x:Bind From,Converter={StaticResource progress}}"></Run>
+                                                    -
+                                                    <Run Text="{x:Bind To,Converter={StaticResource progress}}"></Run>
+                                                </TextBlock>
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </ListViewItem>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                        </ListView>
+                    </Grid>
+                </Grid>
+
                 <Button x:Name="BtnFoucs" Width="0" Height="0" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-8 -8 0 0" Background="Transparent" BorderThickness="0"></Button>
             </Grid>
         </SplitView>
diff --git a/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs b/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs
index a0a9e07e3..a034e034e 100644
--- a/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs
+++ b/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs
@@ -1506,8 +1506,13 @@ private async Task GetPlayerInfo()
                 }
             }
 
-            TopOnline.Text = await playerHelper.GetOnline(CurrentPlayItem.avid, CurrentPlayItem.cid);
+            if (player_info.ViewPoints != null && player_info.ViewPoints.Any())
+            {
+                m_viewModel.ViewPoints = player_info.ViewPoints;
+                m_viewModel.ShowViewPointsBtn = true;
+            }
 
+            TopOnline.Text = await playerHelper.GetOnline(CurrentPlayItem.avid, CurrentPlayItem.cid);
         }
 
         public async Task ReportHistory(double progress = double.NaN)
@@ -2914,5 +2919,22 @@ private void Player_SizeChanged(object sender, SizeChangedEventArgs e)
             // 更新画面比例
             Player.SetRatioMode(PlayerSettingRatio.SelectedIndex);
         }
+
+        private void TopBtnViewPoints_OnClick(object sender, RoutedEventArgs e)
+        {
+            m_viewModel.ShowViewPointsView = true;
+        }
+
+        private void ViewPointsGrid_OnTapped(object sender, TappedRoutedEventArgs e)
+        {
+            m_viewModel.ShowViewPointsView = false;
+        }
+
+        private void ViewPoint_OnTapped(object sender, TappedRoutedEventArgs e)
+        {
+            if (!(sender is FrameworkElement element)) return;
+            if (!(element.DataContext is PlayerInfoViewPoint viewPoint)) return;
+            SetPosition(viewPoint.From);
+        }
     }
 }
diff --git a/src/BiliLite.UWP/Modules/Player/PlayerVM.cs b/src/BiliLite.UWP/Modules/Player/PlayerVM.cs
index 9d05b1432..fad2e140f 100644
--- a/src/BiliLite.UWP/Modules/Player/PlayerVM.cs
+++ b/src/BiliLite.UWP/Modules/Player/PlayerVM.cs
@@ -285,7 +285,29 @@ public class PlayerInfo
         /// 互动视频信息
         /// </summary>
         public InteractionModel interaction { get; set; }
+
+        /// <summary>
+        /// 章节看点信息
+        /// </summary>
+        [JsonProperty("view_points")]
+        public List<PlayerInfoViewPoint> ViewPoints { get; set; }
+    }
+
+    public class PlayerInfoViewPoint
+    {
+        public int Type { get; set; }
+
+        public long From { get; set; }
+
+        public long To { get; set; }
+
+        public string Content { get; set; }
+
+        public string ImgUrl { get; set; }
+
+        public string LogoUrl { get; set; }
     }
+
     public class PlayerOnlineInfo
     {
         public string total { get; set; }
diff --git a/src/BiliLite.UWP/ViewModels/PlayControlViewModel.cs b/src/BiliLite.UWP/ViewModels/PlayControlViewModel.cs
index 51c83a869..4fe6299f0 100644
--- a/src/BiliLite.UWP/ViewModels/PlayControlViewModel.cs
+++ b/src/BiliLite.UWP/ViewModels/PlayControlViewModel.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using BiliLite.Models.Common;
 using BiliLite.Services;
+using BiliLite.Modules;
 
 namespace BiliLite.ViewModels
 {
@@ -13,5 +14,11 @@ public class PlayControlViewModel: BaseViewModel
         public bool ShowVideoBottomVirtualProgressBar =>
             SettingService.GetValue(SettingConstants.UI.SHOW_VIDEO_BOTTOM_VIRTUAL_PROGRESS_BAR,
                 SettingConstants.UI.DEFAULT_SHOW_VIDEO_BOTTOM_VIRTUAL_PROGRESS_BAR);
+
+        public bool ShowViewPointsView { get; set; }
+
+        public bool ShowViewPointsBtn { get; set; }
+
+        public List<PlayerInfoViewPoint> ViewPoints { get; set; }
     }
 }