From 7a969ea40e0c4254ce5a5e572bba1019694641fd Mon Sep 17 00:00:00 2001 From: Richasy Date: Sun, 3 Apr 2022 16:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E5=88=86=E5=8C=BA=20(#994)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 支持显示热门标签和全部标签 * 完成直播分区详情页 * 添加连接动画 --- src/App/App.csproj | 21 +++ .../Controls/App/CenterPopup/CenterPopup.xaml | 5 +- .../Controls/App/RootNavigationView.xaml.cs | 3 + .../Common/HorizontalRepeaterView.xaml | 2 +- src/App/Controls/Live/LiveAreaItem.xaml | 33 ++++ src/App/Controls/Live/LiveAreaItem.xaml.cs | 62 +++++++ src/App/Controls/Live/LiveAreaView.xaml | 64 +++++++ src/App/Controls/Live/LiveAreaView.xaml.cs | 45 +++++ src/App/Pages/LivePage.xaml | 32 +++- src/App/Pages/LivePage.xaml.cs | 21 +++ src/App/Pages/Overlay/LiveAreaDetailPage.xaml | 145 +++++++++++++++ .../Pages/Overlay/LiveAreaDetailPage.xaml.cs | 51 ++++++ .../Resources/Strings/zh-CN/Resources.resw | 12 ++ .../Controller.Uwp/BiliController.Live.cs | 38 ++++ .../Controller.Uwp/BiliController.cs | 5 + src/Lib/Lib.Interfaces/ILiveProvider.cs | 17 ++ src/Lib/Lib.Uwp/LiveProvider/LiveProvider.cs | 38 ++++ .../Args/LiveAreaRoomIterationEventArgs.cs | 53 ++++++ .../LiveFeedAdditionalDataChangedEventArgs.cs | 2 +- .../Models.App/Constants/ApiConstants.cs | 10 ++ .../Models.App/Constants/ServiceConstants.cs | 5 + src/Models/Models.BiliBili/Live/LiveArea.cs | 99 +++++++++++ .../Live/LiveAreaDetailResponse.cs | 75 ++++++++ .../Models.BiliBili/Live/LiveAreaResponse.cs | 20 +++ ...{LiveFeedFollowRoom.cs => LiveFeedRoom.cs} | 4 +- .../Models.BiliBili/Live/LiveRoomBase.cs | 6 - src/Models/Models.Enums/App/LanguageNames.cs | 4 + src/Models/Models.Enums/App/PageIds.cs | 5 + .../Common/VideoViewModel/VideoViewModel.cs | 2 +- .../LiveAreaViewModel.Properties.cs | 62 +++++++ .../LiveAreaViewModel/LiveAreaViewModel.cs | 165 ++++++++++++++++++ .../LiveModuleViewModel.Properties.cs | 41 ++++- .../LiveModuleViewModel.cs | 57 ++++++ .../ViewModels.Uwp/ViewModels.Uwp.csproj | 2 + 34 files changed, 1187 insertions(+), 19 deletions(-) create mode 100644 src/App/Controls/Live/LiveAreaItem.xaml create mode 100644 src/App/Controls/Live/LiveAreaItem.xaml.cs create mode 100644 src/App/Controls/Live/LiveAreaView.xaml create mode 100644 src/App/Controls/Live/LiveAreaView.xaml.cs create mode 100644 src/App/Pages/Overlay/LiveAreaDetailPage.xaml create mode 100644 src/App/Pages/Overlay/LiveAreaDetailPage.xaml.cs create mode 100644 src/Models/Models.App/Args/LiveAreaRoomIterationEventArgs.cs create mode 100644 src/Models/Models.BiliBili/Live/LiveArea.cs create mode 100644 src/Models/Models.BiliBili/Live/LiveAreaDetailResponse.cs create mode 100644 src/Models/Models.BiliBili/Live/LiveAreaResponse.cs rename src/Models/Models.BiliBili/Live/{LiveFeedFollowRoom.cs => LiveFeedRoom.cs} (97%) create mode 100644 src/ViewModels/ViewModels.Uwp/Live/LiveAreaViewModel/LiveAreaViewModel.Properties.cs create mode 100644 src/ViewModels/ViewModels.Uwp/Live/LiveAreaViewModel/LiveAreaViewModel.cs diff --git a/src/App/App.csproj b/src/App/App.csproj index d7c6f179a..0269d5ed2 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -48,6 +48,12 @@ + + LiveAreaItem.xaml + + + LiveAreaView.xaml + ViewLaterView.xaml @@ -334,6 +340,9 @@ HistoryPage.xaml + + LiveAreaDetailPage.xaml + MessagePage.xaml @@ -572,6 +581,14 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -940,6 +957,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/App/Controls/App/CenterPopup/CenterPopup.xaml b/src/App/Controls/App/CenterPopup/CenterPopup.xaml index 7eab62e3e..d649e2b40 100644 --- a/src/App/Controls/App/CenterPopup/CenterPopup.xaml +++ b/src/App/Controls/App/CenterPopup/CenterPopup.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:icons="using:Richasy.FluentIcon.Uwp" + xmlns:loc="using:Richasy.Bili.Locator.Uwp" xmlns:local="using:Richasy.Bili.App.Controls"> @@ -73,8 +74,10 @@ TextTrimming="CharacterEllipsis" /> +