更新

WangyuHello · Apr 11, 2023 · 4454ed2 · 4454ed2
1 parent 7ae1a00
commit 4454ed2
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 12 deletions.
diff --git a/HotPotPlayer.Common/Models/BiliBili/SearchRequest.cs b/HotPotPlayer.Common/Models/BiliBili/SearchRequest.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HotPotPlayer.Models.BiliBili
+{
+    public class SearchRequest
+    {
+        public string Keyword { get; set; }
+        public bool DoSearch { get; set; }
+    }
+}
diff --git a/HotPotPlayer/Controls/BilibiliSub/Header.xaml.cs b/HotPotPlayer/Controls/BilibiliSub/Header.xaml.cs
@@ -19,6 +19,7 @@
 using HotPotPlayer.Bilibili.Models.Dynamic;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System.ComponentModel.Design;
+using HotPotPlayer.Models.BiliBili;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -167,7 +168,11 @@ public Visibility GetDynamicEntranceVisible(EntranceData d)
 
         private void Search_Tapped(object sender, TappedRoutedEventArgs e)
         {
-            NavigateTo("BilibiliSub.Search", SearchDefault);
+            NavigateTo("BilibiliSub.Search", new SearchRequest
+            {
+                Keyword = SearchDefault,
+                DoSearch = false
+            });
         }
     }
 }
diff --git a/HotPotPlayer/MainWindow.Navigation.cs b/HotPotPlayer/MainWindow.Navigation.cs
@@ -52,14 +52,19 @@ public void NavigateInit()
             SelectedPageName = InitPageName;
         }
 
-        public void NavigateTo(string name, object parameter = null, NavigationTransitionInfo trans = null)
+        public async void NavigateTo(string name, object parameter = null, NavigationTransitionInfo trans = null)
         {
+            if (MainFrame.CurrentSourcePageType.Name == "BiliVideoPlay")
+            {
+                var biliPlay = MainFrame.Content as BiliVideoPlay;
+                await biliPlay.RequestNavigateFrom();
+            }
             trans ??= new DrillInNavigationTransitionInfo();
             MainFrame.Navigate(Type.GetType("HotPotPlayer.Pages." + name), parameter, trans);
             SelectedPageName = name;
         }
 
-        public void NavigateBack(bool force = false)
+        public async void NavigateBack(bool force = false)
         {
             if (!MainFrame.CanGoBack)
             {
@@ -76,7 +81,8 @@ public void NavigateBack(bool force = false)
                 if (MainFrame.CurrentSourcePageType.Name == "BiliVideoPlay")
                 {
                     var biliPlay = MainFrame.Content as BiliVideoPlay;
-                    biliPlay.RequestNavigateBack();
+                    await biliPlay.RequestNavigateFrom();
+                    NavigateBack(true);
                 }
                 else
                 {

diff --git a/HotPotPlayer/Pages/BilibiliSub/BiliVideoPlay.xaml b/HotPotPlayer/Pages/BilibiliSub/BiliVideoPlay.xaml
@@ -135,9 +135,9 @@
                 <FontIcon Grid.Column="9" FontFamily="{ThemeResource SegoeIcons}" Margin="12,0,0,0" Glyph="&#xE18B;" Foreground="Gray" FontSize="16"/>
                 <TextBlock Grid.Column="10" VerticalAlignment="Center" Margin="6,0" Text="{x:Bind OnLineCount}" Foreground="Gray" FontFamily="{ThemeResource MiSansRegular}" />
 
-                <ListView Grid.Column="11" ItemsSource="{x:Bind Tags}" Height="28" Margin="12,0,0,0" Style="{StaticResource HorizontalListViewStyle}" ItemTemplate="{StaticResource TagTemplate}" ItemContainerStyle="{StaticResource TransparentListContainerCompactHPaddingStyle}"/>
+                <ListView Grid.Column="11" ItemsSource="{x:Bind Tags}" Height="28" Margin="12,0,0,0" Style="{StaticResource HorizontalListViewStyle}" ItemTemplate="{StaticResource TagTemplate}" ItemContainerStyle="{StaticResource TransparentListContainerCompactHPaddingStyle}" ItemClick="TagClick"/>
             </Grid>
-            <ScrollViewer Grid.Row="3" MaxHeight="58">
+            <ScrollViewer Grid.Row="3" MaxHeight="58" MinHeight="26">
                 <TextBlock Text="{x:Bind Video.VideoDEsc}" IsTextSelectionEnabled="True" FontFamily="{ThemeResource MiSansRegular}" TextWrapping="Wrap" />
             </ScrollViewer>
             <ListView x:Name="RelatedList" Grid.Row="4" Margin="-36,2,-28,0" Padding="36,0,28,0" Height="220" ItemsSource="{x:Bind RelatedVideos}" Style="{StaticResource HorizontalListViewStyle}" ItemContainerStyle="{StaticResource GeneralListContainerCompactPaddingStyle}" ItemTemplate="{StaticResource BiliVideoCardViewTemplate2}" ItemClick="RelateVideoClick">

diff --git a/HotPotPlayer/Pages/BilibiliSub/BiliVideoPlay.xaml.cs b/HotPotPlayer/Pages/BilibiliSub/BiliVideoPlay.xaml.cs
@@ -187,7 +187,7 @@ public async void StartPlay(object para, string targetCid = null, bool immediate
             //await BiliBiliService.API.GetVideoWeb(bvid);
         }
 
-        public async void RequestNavigateBack()
+        public async Task RequestNavigateFrom()
         {
             if (VideoPlayer.CurrentTime == TimeSpan.Zero && VideoPlayer.CurrentPlayingDuration.HasValue)
             {
@@ -204,7 +204,6 @@ public async void RequestNavigateBack()
             {
                 await Task.Run(() => StopPlay());
             }
-            App.NavigateBack(true);
         }
 
         public void StopPlay()
@@ -477,5 +476,15 @@ string GetString(int v)
         {
             return v.ToHumanString();
         }
+
+        private void TagClick(object sender, ItemClickEventArgs e)
+        {
+            var v = e.ClickedItem as Tag;
+            NavigateTo("BilibiliSub.Search", new SearchRequest
+            {
+                Keyword = v.Name,
+                DoSearch = true
+            });
+        }
     }
 }
diff --git a/HotPotPlayer/Pages/BilibiliSub/Search.xaml.cs b/HotPotPlayer/Pages/BilibiliSub/Search.xaml.cs
@@ -4,6 +4,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using HotPotPlayer.Bilibili.Models.HomeVideo;
 using HotPotPlayer.Bilibili.Models.Search;
+using HotPotPlayer.Models.BiliBili;
 using HotPotPlayer.Services;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -17,6 +18,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
@@ -41,17 +43,26 @@ public Search()
         protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
-            var defa = e.Parameter as string;
-            SearchBox.Text = defa;
+            var req = e.Parameter as SearchRequest;
+            SearchBox.Text = req.Keyword;
+            if (req.DoSearch)
+            {
+                await DoSearch(req.Keyword);
+            }
         }
 
-        private async void Search_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
+        private async Task DoSearch(string keyword)
         {
-            var search = await BiliBiliService.API.SearchAsync(sender.Text);
+            var search = await BiliBiliService.API.SearchAsync(keyword);
             var video = search.Data.Result.FirstOrDefault(r => r.ResultType == "video");
             VideoResult = video.Data;
         }
 
+        private async void Search_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
+        {
+            await DoSearch(sender.Text);
+        }
+
         private void SearchVideoClick(object sender, ItemClickEventArgs e)
         {
             var v = e.ClickedItem as SearchResultData;