From aa30fd836f41acc42b86ce4fd632bda71a7f9c14 Mon Sep 17 00:00:00 2001 From: croire <1432593898@qq.com> Date: Mon, 27 Feb 2023 22:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3tabId=E6=BA=A2=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DownKyi.Core/BiliApi/Favorites/FavoritesResource.cs | 2 +- DownKyi.Core/BiliApi/Users/UserRelation.cs | 2 +- DownKyi.Core/BiliApi/Users/UserSpace.cs | 2 +- DownKyi/Services/FavoritesService.cs | 4 ++-- DownKyi/ViewModels/Friends/ViewFollowingViewModel.cs | 2 +- DownKyi/ViewModels/PageViewModels/TabHeader.cs | 4 ++-- DownKyi/ViewModels/ViewFriendsViewModel.cs | 2 +- DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DownKyi.Core/BiliApi/Favorites/FavoritesResource.cs b/DownKyi.Core/BiliApi/Favorites/FavoritesResource.cs index 36082b8..9268ff7 100644 --- a/DownKyi.Core/BiliApi/Favorites/FavoritesResource.cs +++ b/DownKyi.Core/BiliApi/Favorites/FavoritesResource.cs @@ -18,7 +18,7 @@ namespace DownKyi.Core.BiliApi.Favorites /// public static List GetFavoritesMedia(long mediaId, int pn, int ps) { - string url = $"https://api.bilibili.com/x/v3/fav/resource/list?media_id={mediaId}&pn={pn}&ps={ps}"; + string url = $"https://api.bilibili.com/x/v3/fav/resource/list?media_id={mediaId}&pn={pn}&ps={ps}&platform=web"; string referer = "https://www.bilibili.com"; string response = WebClient.RequestWeb(url, referer); diff --git a/DownKyi.Core/BiliApi/Users/UserRelation.cs b/DownKyi.Core/BiliApi/Users/UserRelation.cs index 63c6a86..f56acd7 100644 --- a/DownKyi.Core/BiliApi/Users/UserRelation.cs +++ b/DownKyi.Core/BiliApi/Users/UserRelation.cs @@ -210,7 +210,7 @@ namespace DownKyi.Core.BiliApi.Users /// 每页项数 /// 排序方式 /// - public static List GetFollowingGroupContent(int tagId, int pn, int ps, FollowingOrder order = FollowingOrder.DEFAULT) + public static List GetFollowingGroupContent(long tagId, int pn, int ps, FollowingOrder order = FollowingOrder.DEFAULT) { string orderType = ""; if (order == FollowingOrder.ATTENTION) diff --git a/DownKyi.Core/BiliApi/Users/UserSpace.cs b/DownKyi.Core/BiliApi/Users/UserSpace.cs index e7c5c18..9295a8b 100644 --- a/DownKyi.Core/BiliApi/Users/UserSpace.cs +++ b/DownKyi.Core/BiliApi/Users/UserSpace.cs @@ -112,7 +112,7 @@ namespace DownKyi.Core.BiliApi.Users /// 视频分区 /// 搜索关键词 /// - public static SpacePublicationList GetPublication(long mid, int pn, int ps, int tid = 0, PublicationOrder order = PublicationOrder.PUBDATE, string keyword = "") + public static SpacePublicationList GetPublication(long mid, int pn, int ps, long tid = 0, PublicationOrder order = PublicationOrder.PUBDATE, string keyword = "") { string url = $"https://api.bilibili.com/x/space/arc/search?mid={mid}&pn={pn}&ps={ps}&order={order.ToString("G").ToLower()}&tid={tid}&keyword={keyword}"; string referer = "https://www.bilibili.com"; diff --git a/DownKyi/Services/FavoritesService.cs b/DownKyi/Services/FavoritesService.cs index a04bfe8..05df126 100644 --- a/DownKyi/Services/FavoritesService.cs +++ b/DownKyi/Services/FavoritesService.cs @@ -198,7 +198,7 @@ namespace DownKyi.Services App.PropertyChangeAsync(new Action(() => { - tabHeaders.Add(new TabHeader { Id = (int)item.Id, Title = item.Title, SubTitle = item.MediaCount.ToString() }); + tabHeaders.Add(new TabHeader { Id = item.Id, Title = item.Title, SubTitle = item.MediaCount.ToString() }); })); } } @@ -223,7 +223,7 @@ namespace DownKyi.Services App.PropertyChangeAsync(new Action(() => { - tabHeaders.Add(new TabHeader { Id = (int)item.Id, Title = item.Title, SubTitle = item.MediaCount.ToString() }); + tabHeaders.Add(new TabHeader { Id = item.Id, Title = item.Title, SubTitle = item.MediaCount.ToString() }); })); } } diff --git a/DownKyi/ViewModels/Friends/ViewFollowingViewModel.cs b/DownKyi/ViewModels/Friends/ViewFollowingViewModel.cs index 0cec046..061f766 100644 --- a/DownKyi/ViewModels/Friends/ViewFollowingViewModel.cs +++ b/DownKyi/ViewModels/Friends/ViewFollowingViewModel.cs @@ -305,7 +305,7 @@ namespace DownKyi.ViewModels.Friends return true; } - private async Task LoadFollowingGroupContent(int tagId, int pn, int ps) + private async Task LoadFollowingGroupContent(long tagId, int pn, int ps) { List contents = null; await Task.Run(() => diff --git a/DownKyi/ViewModels/PageViewModels/TabHeader.cs b/DownKyi/ViewModels/PageViewModels/TabHeader.cs index ad37256..f2d54b0 100644 --- a/DownKyi/ViewModels/PageViewModels/TabHeader.cs +++ b/DownKyi/ViewModels/PageViewModels/TabHeader.cs @@ -5,8 +5,8 @@ namespace DownKyi.ViewModels.PageViewModels { public class TabHeader : BindableBase { - private int id; - public int Id + private long id; + public long Id { get => id; set => SetProperty(ref id, value); diff --git a/DownKyi/ViewModels/ViewFriendsViewModel.cs b/DownKyi/ViewModels/ViewFriendsViewModel.cs index bc3d683..097c532 100644 --- a/DownKyi/ViewModels/ViewFriendsViewModel.cs +++ b/DownKyi/ViewModels/ViewFriendsViewModel.cs @@ -110,7 +110,7 @@ namespace DownKyi.ViewModels /// /// /// - private void NavigationView(int id, bool isFirst) + private void NavigationView(long id, bool isFirst) { // isFirst参数表示是否是从PageFriends的headerTable的item点击进入的 // true表示加载PageFriends后第一次进入 diff --git a/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs b/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs index 1a16f8f..2f47d48 100644 --- a/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs +++ b/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs @@ -152,8 +152,8 @@ namespace DownKyi.ViewModels TabHeaders = new ObservableCollection { - new TabHeader { Id = (int)Core.BiliApi.Users.Models.BangumiType.ANIME, Title = DictionaryResource.GetString("FollowAnime") }, - new TabHeader { Id = (int)Core.BiliApi.Users.Models.BangumiType.EPISODE, Title = DictionaryResource.GetString("FollowMovie") } + new TabHeader { Id = (long)Core.BiliApi.Users.Models.BangumiType.ANIME, Title = DictionaryResource.GetString("FollowAnime") }, + new TabHeader { Id = (long)Core.BiliApi.Users.Models.BangumiType.EPISODE, Title = DictionaryResource.GetString("FollowMovie") } }; Medias = new ObservableCollection();