From f5fa8faf2374ea451104b4ace78cee923e3bd9e8 Mon Sep 17 00:00:00 2001
From: Anran Zhang <anranzhang@microsoft.com>
Date: Wed, 2 Jun 2021 09:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=AD=90=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.ruleset                                   |   3 +-
 src/App/App.csproj                            |   7 ++
 src/App/Pages/Overlay/SubPartitionPage.xaml   |  11 ++
 .../Pages/Overlay/SubPartitionPage.xaml.cs    |  18 +++
 src/Models/Models.BiliBili/Banner.cs          |  67 +++++++++++
 .../{ => Partition}/Partition.cs              |   0
 .../Models.BiliBili/Partition/SubPartition.cs |  51 ++++++++
 src/Models/Models.BiliBili/Tag.cs             |  49 ++++++++
 src/Models/Models.BiliBili/Video.cs           | 109 ++++++++++++++++++
 .../SubPartitionViewModel.Properties.cs       |  11 ++
 .../SubPartitionViewModel.cs                  |  11 ++
 .../ViewModels.Uwp/ViewModels.Uwp.csproj      |   2 +
 12 files changed, 338 insertions(+), 1 deletion(-)
 create mode 100644 src/App/Pages/Overlay/SubPartitionPage.xaml
 create mode 100644 src/App/Pages/Overlay/SubPartitionPage.xaml.cs
 create mode 100644 src/Models/Models.BiliBili/Banner.cs
 rename src/Models/Models.BiliBili/{ => Partition}/Partition.cs (100%)
 create mode 100644 src/Models/Models.BiliBili/Partition/SubPartition.cs
 create mode 100644 src/Models/Models.BiliBili/Tag.cs
 create mode 100644 src/Models/Models.BiliBili/Video.cs
 create mode 100644 src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.Properties.cs
 create mode 100644 src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.cs

diff --git a/App.ruleset b/App.ruleset
index 498b5ce..e4613ab 100644
--- a/App.ruleset
+++ b/App.ruleset
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for App" Description="Code analysis rules for App.csproj." ToolsVersion="15.0">
+<RuleSet Name="Rules for App" Description="Code analysis rules for App.csproj." ToolsVersion="16.0">
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA1001" Action="Warning" />
     <Rule Id="CA1009" Action="Warning" />
@@ -77,6 +77,7 @@
     <Rule Id="SA0001" Action="None" />
     <Rule Id="SA1101" Action="None" />
     <Rule Id="SA1309" Action="None" />
+    <Rule Id="SA1402" Action="None" />
     <Rule Id="SA1623" Action="None" />
     <Rule Id="SA1642" Action="None" />
   </Rules>
diff --git a/src/App/App.csproj b/src/App/App.csproj
index a007aff..417b6c2 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -55,6 +55,9 @@
     <Compile Include="Pages\MyFavoritePage.xaml.cs">
       <DependentUpon>MyFavoritePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\Overlay\SubPartitionPage.xaml.cs">
+      <DependentUpon>SubPartitionPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\PartitionPage.xaml.cs">
       <DependentUpon>PartitionPage.xaml</DependentUpon>
     </Compile>
@@ -189,6 +192,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\Overlay\SubPartitionPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\PartitionPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/App/Pages/Overlay/SubPartitionPage.xaml b/src/App/Pages/Overlay/SubPartitionPage.xaml
new file mode 100644
index 0000000..4467f9b
--- /dev/null
+++ b/src/App/Pages/Overlay/SubPartitionPage.xaml
@@ -0,0 +1,11 @@
+<Page
+    x:Class="Richasy.Bili.App.Pages.Overlay.SubPartitionPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Richasy.Bili.App.Pages.Overlay"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid />
+</Page>
diff --git a/src/App/Pages/Overlay/SubPartitionPage.xaml.cs b/src/App/Pages/Overlay/SubPartitionPage.xaml.cs
new file mode 100644
index 0000000..ba65595
--- /dev/null
+++ b/src/App/Pages/Overlay/SubPartitionPage.xaml.cs
@@ -0,0 +1,18 @@
+using Windows.UI.Xaml.Controls;
+
+namespace Richasy.Bili.App.Pages.Overlay
+{
+    /// <summary>
+    /// 子分区页面.
+    /// </summary>
+    public sealed partial class SubPartitionPage : Page
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubPartitionPage"/> class.
+        /// </summary>
+        public SubPartitionPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/src/Models/Models.BiliBili/Banner.cs b/src/Models/Models.BiliBili/Banner.cs
new file mode 100644
index 0000000..d5bbf1c
--- /dev/null
+++ b/src/Models/Models.BiliBili/Banner.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Richasy. All rights reserved.
+
+using Newtonsoft.Json;
+
+namespace Richasy.Bili.Models.BiliBili
+{
+    /// <summary>
+    /// 横幅定义.
+    /// </summary>
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    public class Banner
+    {
+        /// <summary>
+        /// 横幅Id.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "id", Required = Required.Default)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 横幅标题.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "title", Required = Required.Default)]
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 横幅图片地址.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "image", Required = Required.Default)]
+        public string Image { get; set; }
+
+        /// <summary>
+        /// 哈希特征值.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "hash", Required = Required.Default)]
+        public string Hash { get; set; }
+
+        /// <summary>
+        /// 导航地址.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "uri", Required = Required.Default)]
+        public string NavigateUri { get; set; }
+
+        /// <summary>
+        /// 对应资源的Id值.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "resource_id", Required = Required.Default)]
+        public int ResourceId { get; set; }
+
+        /// <summary>
+        /// 请求Id.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "request_id", Required = Required.Default)]
+        public string RequestId { get; set; }
+
+        /// <summary>
+        /// 是否为广告.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "is_ad", Required = Required.Default)]
+        public bool IsAD { get; set; }
+
+        /// <summary>
+        /// 在集合中的索引值.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "index", Required = Required.Default)]
+        public int Index { get; set; }
+    }
+}
diff --git a/src/Models/Models.BiliBili/Partition.cs b/src/Models/Models.BiliBili/Partition/Partition.cs
similarity index 100%
rename from src/Models/Models.BiliBili/Partition.cs
rename to src/Models/Models.BiliBili/Partition/Partition.cs
diff --git a/src/Models/Models.BiliBili/Partition/SubPartition.cs b/src/Models/Models.BiliBili/Partition/SubPartition.cs
new file mode 100644
index 0000000..f6d1b92
--- /dev/null
+++ b/src/Models/Models.BiliBili/Partition/SubPartition.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Richasy. All rights reserved.
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Richasy.Bili.Models.BiliBili
+{
+    /// <summary>
+    /// 子分区类型定义.
+    /// </summary>
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    public class SubPartition
+    {
+        /// <summary>
+        /// 推荐视频列表.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "recommend", Required = Required.Default)]
+        public List<Video> RecommendVideos { get; set; }
+
+        /// <summary>
+        /// 新的视频列表.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "new", Required = Required.Default)]
+        public List<Video> NewVideos { get; set; }
+    }
+
+    /// <summary>
+    /// 子分区的推荐模块.
+    /// </summary>
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    public class SubPartitionRecommend : SubPartition
+    {
+        /// <summary>
+        /// 横幅.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "banner", Required = Required.Default)]
+        public RecommendBanner Banner { get; set; }
+
+        /// <summary>
+        /// 推荐列表下的横幅定义.
+        /// </summary>
+        public class RecommendBanner
+        {
+            /// <summary>
+            /// 顶层横幅.
+            /// </summary>
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "top", Required = Required.Default)]
+            public List<Banner> TopBanners { get; set; }
+        }
+    }
+}
diff --git a/src/Models/Models.BiliBili/Tag.cs b/src/Models/Models.BiliBili/Tag.cs
new file mode 100644
index 0000000..12bce85
--- /dev/null
+++ b/src/Models/Models.BiliBili/Tag.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Richasy. All rights reserved.
+
+using Newtonsoft.Json;
+
+namespace Richasy.Bili.Models.BiliBili
+{
+    /// <summary>
+    /// 标签类型.
+    /// </summary>
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    public class Tag
+    {
+        /// <summary>
+        /// 标签ID.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "tid", Required = Required.Default)]
+        public int TagId { get; set; }
+
+        /// <summary>
+        /// 标签名.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "tname", Required = Required.Default)]
+        public string TagName { get; set; }
+
+        /// <summary>
+        /// 所属子分区ID.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "rid", Required = Required.Default)]
+        public int SubPartitionId { get; set; }
+
+        /// <summary>
+        /// 所属子分区名称.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "rname", Required = Required.Default)]
+        public string SubPartitionName { get; set; }
+
+        /// <summary>
+        /// 所属主分区ID.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "reid", Required = Required.Default)]
+        public int PartitionId { get; set; }
+
+        /// <summary>
+        /// 所属主分区名称.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "rename", Required = Required.Default)]
+        public string PartitionName { get; set; }
+    }
+}
diff --git a/src/Models/Models.BiliBili/Video.cs b/src/Models/Models.BiliBili/Video.cs
new file mode 100644
index 0000000..9d4eaab
--- /dev/null
+++ b/src/Models/Models.BiliBili/Video.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Richasy. All rights reserved.
+
+using Newtonsoft.Json;
+
+namespace Richasy.Bili.Models.BiliBili
+{
+    /// <summary>
+    /// 视频基类型.
+    /// </summary>
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    public class Video
+    {
+        /// <summary>
+        /// 视频标题.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "title", Required = Required.Default)]
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 视频封面图片地址.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "cover", Required = Required.Default)]
+        public string Cover { get; set; }
+
+        /// <summary>
+        /// 视频播放地址.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "uri", Required = Required.Default)]
+        public string Uri { get; set; }
+
+        /// <summary>
+        /// 参数，通常指代视频ID.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "param", Required = Required.Default)]
+        public string Parameter { get; set; }
+
+        /// <summary>
+        /// 视频类型.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "goto", Required = Required.Default)]
+        public string Type { get; set; }
+
+        /// <summary>
+        /// 视频上传者.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "name", Required = Required.Default)]
+        public string Publisher { get; set; }
+
+        /// <summary>
+        /// 视频上传者的头像.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "face", Required = Required.Default)]
+        public string PublisherAvatar { get; set; }
+
+        /// <summary>
+        /// 视频播放数.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "play", Required = Required.Default)]
+        public int PlayCount { get; set; }
+
+        /// <summary>
+        /// 弹幕数.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "danmaku", Required = Required.Default)]
+        public int DanmakuCount { get; set; }
+
+        /// <summary>
+        /// 视频评论数.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "reply", Required = Required.Default)]
+        public int ReplyCount { get; set; }
+
+        /// <summary>
+        /// 视频收藏数.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "favourite", Required = Required.Default)]
+        public int FavouriteCount { get; set; }
+
+        /// <summary>
+        /// 视频发布时间 (Unix时间戳).
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "pubdate", Required = Required.Default)]
+        public int PublishDateTime { get; set; }
+
+        /// <summary>
+        /// 视频时长 (秒).
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "duration", Required = Required.Default)]
+        public int Duration { get; set; }
+
+        /// <summary>
+        /// 所属分区ID.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "rid", Required = Required.Default)]
+        public int PartitionId { get; set; }
+
+        /// <summary>
+        /// 所属分区名称.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "rname", Required = Required.Default)]
+        public string PartitionName { get; set; }
+
+        /// <summary>
+        /// 点赞数.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "like", Required = Required.Default)]
+        public int LikeCount { get; set; }
+    }
+}
diff --git a/src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.Properties.cs b/src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.Properties.cs
new file mode 100644
index 0000000..1497ae7
--- /dev/null
+++ b/src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.Properties.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Richasy. All rights reserved.
+
+namespace Richasy.Bili.ViewModels.Uwp
+{
+    /// <summary>
+    /// 子分区视图模型属性集.
+    /// </summary>
+    public partial class SubPartitionViewModel
+    {
+    }
+}
diff --git a/src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.cs b/src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.cs
new file mode 100644
index 0000000..0a64dc6
--- /dev/null
+++ b/src/ViewModels/ViewModels.Uwp/SubPartitionViewModel/SubPartitionViewModel.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Richasy. All rights reserved.
+
+namespace Richasy.Bili.ViewModels.Uwp
+{
+    /// <summary>
+    /// 子分区视图模型.
+    /// </summary>
+    public partial class SubPartitionViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj b/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
index c19be85..a5d660a 100644
--- a/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
+++ b/src/ViewModels/ViewModels.Uwp/ViewModels.Uwp.csproj
@@ -13,6 +13,8 @@
     <Compile Include="AppViewModel\AppViewModel.Properties.cs" />
     <Compile Include="PartitionViewModel\PartitionViewModel.cs" />
     <Compile Include="PartitionViewModel\PartitionViewModel.Properties.cs" />
+    <Compile Include="SubPartitionViewModel\SubPartitionViewModel.cs" />
+    <Compile Include="SubPartitionViewModel\SubPartitionViewModel.Properties.cs" />
     <Compile Include="ViewModelBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="$(SolutionDir)\src\Shared\SharedAssemblyInfo.cs">
-- 
GitLab