From 27f67ffab7851f74ec2a2f198d8bd21f7d6a9fb8 Mon Sep 17 00:00:00 2001 From: GD_ Slime <1289744583@qq.com> Date: Mon, 1 Jan 2024 20:55:37 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=AF=E6=BE=B3?= =?UTF-8?q?=E5=8F=B0=E7=95=AA=E5=89=A7=E6=92=AD=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs b/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs index 247b6ed1..a73d0765 100644 --- a/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs +++ b/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs @@ -16,6 +16,7 @@ public ApiModel Detail(string season_id, bool proxy = false) baseUrl = $"{baseUrl}/pgc/view/v2/app/season", parameter = ApiHelper.MustParameter(AppKey, true) + $"&season_id={season_id}" }; + api.parameter = api.parameter.Replace("build=6235200", "build=75900200"); api.parameter += ApiHelper.GetSign(api.parameter, AppKey); return api; } From 56056dccb9176c5285fc0d06535aaad8414b6deb Mon Sep 17 00:00:00 2001 From: GD-Slime <82302542+GD-Slime@users.noreply.github.com> Date: Wed, 3 Jan 2024 20:25:51 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=BB=8E?= =?UTF-8?q?=E9=9D=9E=E7=95=AA=E5=89=A7=E9=A1=B5=E6=89=93=E5=BC=80=E7=95=AA?= =?UTF-8?q?=E5=89=A7=E6=97=B6=E4=BA=A7=E7=94=9F=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20(#472)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复了从非番剧页打开番剧时产生的错误 --- src/BiliLite.UWP/Extensions/BiliExtensions.cs | 27 ++++++++++++++----- src/BiliLite.UWP/Models/Common/Enumerates.cs | 6 +++++ .../Models/Requests/Api/SeasonApi.cs | 23 +++++++++++++--- 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/BiliLite.UWP/Extensions/BiliExtensions.cs b/src/BiliLite.UWP/Extensions/BiliExtensions.cs index 0ce3636b..5800ff2c 100644 --- a/src/BiliLite.UWP/Extensions/BiliExtensions.cs +++ b/src/BiliLite.UWP/Extensions/BiliExtensions.cs @@ -1,11 +1,13 @@ -using BiliLite.Models.Common; +using BiliLite.Models; +using BiliLite.Models.Common; +using BiliLite.Models.Common.Season; +using BiliLite.Models.Exceptions; using BiliLite.Models.Requests.Api; using BiliLite.Models.Responses; using BiliLite.Services; using Microsoft.Toolkit.Uwp.Helpers; using Microsoft.Toolkit.Uwp.UI.Controls; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Net.Http; @@ -29,12 +31,25 @@ public static async Task BangumiEpidToSid(string epid) { try { - var re = await $"https://bangumi.bilibili.com/view/web_api/season?ep_id={epid}".GetString(); - var obj = JObject.Parse(re); - return obj["result"]["season_id"].ToString(); + var results = await new SeasonApi().Detail(epid, SeasonIdType.EpId).Request(); + if (!results.status) + { + throw new CustomizedErrorException(results.message); + } + + //访问番剧详情 + var data = await results.GetJson>(); + + if (!data.success) + { + throw new CustomizedErrorException(data.message); + } + + return data.data.SeasonId.ToString(); } - catch (Exception) + catch (Exception ex) { + _logger.Error("转换epId到seasonId错误", ex); return ""; } } diff --git a/src/BiliLite.UWP/Models/Common/Enumerates.cs b/src/BiliLite.UWP/Models/Common/Enumerates.cs index 8fa093ce..9cd26662 100644 --- a/src/BiliLite.UWP/Models/Common/Enumerates.cs +++ b/src/BiliLite.UWP/Models/Common/Enumerates.cs @@ -401,4 +401,10 @@ public enum MessageType /// OnlineRankChange, } + + public enum SeasonIdType + { + SeasonId, + EpId, + } } \ No newline at end of file diff --git a/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs b/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs index a73d0765..15e9e370 100644 --- a/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs +++ b/src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs @@ -1,12 +1,20 @@ using BiliLite.Services; using System; +using BiliLite.Models.Common; +using Bilibili.App.View.V1; namespace BiliLite.Models.Requests.Api { public class SeasonApi : BaseApi { - - public ApiModel Detail(string season_id, bool proxy = false) + /// + /// 用season_id / ep_id 取番剧信息 + /// + /// seasonId / epId + /// id类型 + /// + /// + public ApiModel Detail(string id, SeasonIdType type = SeasonIdType.SeasonId, bool proxy = false) { var baseUrl = ApiHelper.API_BASE_URL; @@ -14,8 +22,17 @@ public ApiModel Detail(string season_id, bool proxy = false) { method = RestSharp.Method.Get, baseUrl = $"{baseUrl}/pgc/view/v2/app/season", - parameter = ApiHelper.MustParameter(AppKey, true) + $"&season_id={season_id}" + parameter = ApiHelper.MustParameter(AppKey, true), }; + if (type == SeasonIdType.SeasonId) + { + api.parameter += $"&season_id={id}"; + } + else + { + api.parameter += $"&ep_id={id}"; + } + api.parameter = api.parameter.Replace("build=6235200", "build=75900200"); api.parameter += ApiHelper.GetSign(api.parameter, AppKey); return api; From 4b8c5bb8d159c26c31ad556f942147f0f0c1d1e2 Mon Sep 17 00:00:00 2001 From: ywmoyue Date: Thu, 4 Jan 2024 20:17:59 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0NSDanmaku=E5=92=8CFFmpe?= =?UTF-8?q?gInteropX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BiliLite.UWP/BiliLite.UWP.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BiliLite.UWP/BiliLite.UWP.csproj b/src/BiliLite.UWP/BiliLite.UWP.csproj index ed2dbce8..45b3e4a3 100644 --- a/src/BiliLite.UWP/BiliLite.UWP.csproj +++ b/src/BiliLite.UWP/BiliLite.UWP.csproj @@ -1161,7 +1161,7 @@ 1.0.2 - 1.0.0 + 1.0.1 5.0.0 @@ -1230,7 +1230,7 @@ 5.3.2 - 2.0.3 + 2.2.0 1.0.2 @@ -1288,4 +1288,4 @@ --> - + \ No newline at end of file From 9af175b69d5fc640c55883d55df5ed2c8248713c Mon Sep 17 00:00:00 2001 From: ywmoyue Date: Sat, 6 Jan 2024 12:10:53 +0800 Subject: [PATCH 04/20] =?UTF-8?q?FFmpegInteropX=E5=92=8CNSDanmaku=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BiliLite.UWP/BiliLite.UWP.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BiliLite.UWP/BiliLite.UWP.csproj b/src/BiliLite.UWP/BiliLite.UWP.csproj index 45b3e4a3..0954eedd 100644 --- a/src/BiliLite.UWP/BiliLite.UWP.csproj +++ b/src/BiliLite.UWP/BiliLite.UWP.csproj @@ -1161,7 +1161,7 @@ 1.0.2 - 1.0.1 + 1.0.0 5.0.0 @@ -1230,7 +1230,7 @@ 5.3.2 - 2.2.0 + 2.0.3 1.0.2 From cd69c3f8e8363deedb4f85f5015ee4c39f590287 Mon Sep 17 00:00:00 2001 From: ywmoyue Date: Sat, 6 Jan 2024 12:11:22 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E6=B6=88=E6=81=AFjson=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BiliLite.UWP/Modules/Live/LiveMessage.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/BiliLite.UWP/Modules/Live/LiveMessage.cs b/src/BiliLite.UWP/Modules/Live/LiveMessage.cs index 48329c8c..f9e04419 100644 --- a/src/BiliLite.UWP/Modules/Live/LiveMessage.cs +++ b/src/BiliLite.UWP/Modules/Live/LiveMessage.cs @@ -446,10 +446,15 @@ private void ParseMessage(string jsonMessage) } else if (cmd == "ONLINE_RANK_V2") { - if (obj["data"] != null) + if (obj["data"] != null && obj["data"]["list"] != null) { NewMessage?.Invoke(MessageType.OnlineRankChange, obj["data"]["list"].ToString()); } + + if (obj["data"] != null && obj["data"]["online_list"] != null) + { + NewMessage?.Invoke(MessageType.OnlineRankChange, obj["data"]["online_list"].ToString()); + } } } catch (Exception ex) From aba0968a33098759d7bb558371d8b39353e17113 Mon Sep 17 00:00:00 2001 From: GD-Slime <82302542+GD-Slime@users.noreply.github.com> Date: Sat, 6 Jan 2024 12:48:12 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E5=BC=B9=E5=B9=95?= =?UTF-8?q?=E6=A0=8F=E4=B8=8E=E4=BC=98=E5=8C=96=E7=9B=B4=E6=92=AD=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E4=BB=A5=E5=8F=8A=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20(#462)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 修改并美化了弹幕栏 - 重新布局了弹幕栏 - 加入了用户的头像 - 点击头像可进入该用户个人空间 2. 修改了up个人主页的直播间按钮可见条件。现在为一直可见。（有时候想提前进直播间等主播开播） 2. 修复了醒目留言有按钮边框的问题 3. 修复了舰长图片有可能会奇怪的像素化的问题（包括互动栏与大航海列表） 4. 修复了一个潜在的无法获取相应直播流的问题 5. 修复了有新的舰长时，舰长数目不更新的问题 4. 加入了 `停止直播` 的直播信息流项目，然而目前未测试到相应结果 6. 加入了 `等级禁言` 的信息流项目 5. 尝试 fix #436 现在会根据本条弹幕的类型进行相应的延迟。（请进行更多测试是否还会造成延迟！） 7. 现在在`StartLive`类型的弹幕开始加载直播流时应该不会提示播放错误了。（基本证明可用，可进行更多测试） 8. 优化了无法加载直播流时的播放器行为。现在应该不会一直转圈显示加载了。 --- .../Extensions/StringExtensions.cs | 4 +- src/BiliLite.UWP/Models/Common/Enumerates.cs | 28 +++++ .../Models/Common/Live/DanmuMsgModel.cs | 45 ++++++- .../Models/Common/Live/GuardBuyMsgModel.cs | 33 ++++- .../Live/LiveMessageHandleActionsMap.cs | 114 ++++++++++++----- src/BiliLite.UWP/Modules/Live/LiveMessage.cs | 89 +++++++++---- src/BiliLite.UWP/Pages/LiveDetailPage.xaml | 118 ++++++++++++------ src/BiliLite.UWP/Pages/LiveDetailPage.xaml.cs | 17 +++ src/BiliLite.UWP/Pages/UserInfoPage.xaml | 8 +- .../Player/SubPlayers/LiveHlsPlayer.cs | 8 +- .../ViewModels/Live/LiveRoomViewModel.cs | 28 +++-- 11 files changed, 384 insertions(+), 108 deletions(-) diff --git a/src/BiliLite.UWP/Extensions/StringExtensions.cs b/src/BiliLite.UWP/Extensions/StringExtensions.cs index 93e7ee39..87a9bcab 100644 --- a/src/BiliLite.UWP/Extensions/StringExtensions.cs +++ b/src/BiliLite.UWP/Extensions/StringExtensions.cs @@ -80,7 +80,7 @@ public static string TraditionalToSimplified(this string input) /// /// /// - public static RichTextBlock ToRichTextBlock(this string txt, JObject emote, bool isLive = false, string color = null, string fontWeight = "Normal") + public static RichTextBlock ToRichTextBlock(this string txt, JObject emote, bool isLive = false, string fontColor = null, string fontWeight = "Normal") { var input = txt; try @@ -112,7 +112,7 @@ public static RichTextBlock ToRichTextBlock(this string txt, JObject emote, bool {0} ", input, isLive ? 22 : 20, - color == null ? "" : $"Foreground=\"{color}\"", + fontColor == null ? "" : $"Foreground=\"{fontColor}\"", $"FontWeight=\"{fontWeight}\""); var p = (RichTextBlock)XamlReader.Load(xaml); return p; diff --git a/src/BiliLite.UWP/Models/Common/Enumerates.cs b/src/BiliLite.UWP/Models/Common/Enumerates.cs index 9cd26662..5e61cd59 100644 --- a/src/BiliLite.UWP/Models/Common/Enumerates.cs +++ b/src/BiliLite.UWP/Models/Common/Enumerates.cs @@ -400,6 +400,34 @@ public enum MessageType /// 高能榜变动 /// OnlineRankChange, + + /// + /// 停止直播 + /// + StopLive, + + /// + /// 直播间等级禁言 + /// + RoomSlient, + } + + public enum MessageDelayType { + + /// + /// 常规弹幕消息 + /// + DanmuMessage, + + /// + /// 礼物消息 + /// + GiftMessage, + + /// + /// 其他系统消息 + /// + SystemMessage, } public enum SeasonIdType diff --git a/src/BiliLite.UWP/Models/Common/Live/DanmuMsgModel.cs b/src/BiliLite.UWP/Models/Common/Live/DanmuMsgModel.cs index fa4ac5fa..1e018fce 100644 --- a/src/BiliLite.UWP/Models/Common/Live/DanmuMsgModel.cs +++ b/src/BiliLite.UWP/Models/Common/Live/DanmuMsgModel.cs @@ -3,6 +3,8 @@ using BiliLite.ViewModels.Live; using Newtonsoft.Json.Linq; using Windows.UI.Xaml.Controls; +using Windows.UI; +using Windows.UI.Xaml.Media; namespace BiliLite.Models.Common.Live { @@ -38,6 +40,16 @@ public class DanmuMsgModel /// public string UserNameFontWeight { get; set; } = "Normal"; + /// + /// 用户uid + /// + public string Uid { get; set; } + + /// + /// 头像 + /// + public string Face { get; set; } + ///// ///// 等级 ///// @@ -90,9 +102,9 @@ public string UserCaptainImage { get => UserCaptain switch { - "舰长" => "/Assets/Live/ic_live_guard_3.png", - "提督" => "/Assets/Live/ic_live_guard_2.png", - "总督" => "/Assets/Live/ic_live_guard_1.png", + "舰长" => "ms-appx:///Assets/Live/ic_live_guard_3.png", + "提督" => "ms-appx:///Assets/Live/ic_live_guard_2.png", + "总督" => "ms-appx:///Assets/Live/ic_live_guard_1.png", _ => null, }; } @@ -114,6 +126,31 @@ public class BigStickerInfo public int Width { get; set; } } + /// + /// 弹幕富文本卡片背景颜色 + /// + public SolidColorBrush CardColor { get; set; } = new SolidColorBrush((Color)Application.Current.Resources["CardColor"]); + + /// + /// 弹幕富文本卡片Padding + /// + public Thickness CardPadding { get; set; } = new Thickness(10, 8, 10, 8); + + /// + /// 弹幕富文本卡片水平对齐方式 + /// + public HorizontalAlignment CardHorizontalAlignment { get; set; } = HorizontalAlignment.Left; + + /// + /// 是否显示用户头像 + /// + public Visibility ShowUserFace { get; set; } = Visibility.Visible; + + /// + /// 是否显示用户名 + /// + public Visibility ShowUserName { get; set; } = Visibility.Visible; + /// /// 是否显示富文本(用于用户发出大表情时) /// @@ -123,7 +160,7 @@ public class BigStickerInfo /// 是否显示大表情 /// - public Visibility ShowBigSticker => (ShowRichText == Visibility.Visible) ? Visibility.Collapsed : Visibility.Visible; + public Visibility ShowBigSticker { get; set; } = Visibility.Collapsed; /// /// 是否显示房管 diff --git a/src/BiliLite.UWP/Models/Common/Live/GuardBuyMsgModel.cs b/src/BiliLite.UWP/Models/Common/Live/GuardBuyMsgModel.cs index 6c0934bc..ff406c28 100644 --- a/src/BiliLite.UWP/Models/Common/Live/GuardBuyMsgModel.cs +++ b/src/BiliLite.UWP/Models/Common/Live/GuardBuyMsgModel.cs @@ -1,4 +1,7 @@ -namespace BiliLite.Models.Common.Live +using Windows.UI; +using Windows.UI.Xaml; + +namespace BiliLite.Models.Common.Live { public class GuardBuyMsgModel { @@ -17,6 +20,34 @@ public class GuardBuyMsgModel /// public int GuardLevel { get; set; } + /// + /// 字体颜色 + /// + public string FontColor + { + get => GuardLevel switch + { + 3 => "#FF23709E", + 2 => "#FF7B166F", + 1 => "#FFC01039", + _ => null + }; + } + + /// + /// 卡片颜色 + /// + public Color CardColor + { + get => GuardLevel switch + { + 3 => Color.FromArgb(255, 192, 216, 255), + 2 => Color.FromArgb(255, 250, 187, 255), + 1 => Color.FromArgb(255, 255, 185, 187), + _ => (Color)Application.Current.Resources["CardColor"], + }; + } + /// /// 数量 /// diff --git a/src/BiliLite.UWP/Models/Common/Live/LiveMessageHandleActionsMap.cs b/src/BiliLite.UWP/Models/Common/Live/LiveMessageHandleActionsMap.cs index b4d580f2..660db35c 100644 --- a/src/BiliLite.UWP/Models/Common/Live/LiveMessageHandleActionsMap.cs +++ b/src/BiliLite.UWP/Models/Common/Live/LiveMessageHandleActionsMap.cs @@ -6,6 +6,8 @@ using Newtonsoft.Json; using BiliLite.Extensions; using BiliLite.Services; +using Windows.UI; +using Windows.UI.Xaml.Media; namespace BiliLite.Models.Common.Live { @@ -31,9 +33,11 @@ public LiveMessageHandleActionsMap() { MessageType.WaringOrCutOff, WaringOrCutOff }, { MessageType.StartLive, StartLive }, { MessageType.WatchedChange, WatchedChange }, - { MessageType.RedPocketLotteryStart, RedPocketLotteryStart}, - { MessageType.RedPocketLotteryWinner, RedPocketLotteryWinner}, - { MessageType.OnlineRankChange, OnlineRankChange}, + { MessageType.RedPocketLotteryStart, RedPocketLotteryStart }, + { MessageType.RedPocketLotteryWinner, RedPocketLotteryWinner }, + { MessageType.OnlineRankChange, OnlineRankChange }, + { MessageType.StopLive, StopLive }, + { MessageType.RoomSlient, RoomSlient }, }; } @@ -51,7 +55,11 @@ private void ConnectSuccess(LiveRoomViewModel viewModel, object message) { viewModel.Messages.Add(new DanmuMsgModel() { - UserName = message.ToString(), + ShowUserFace = Visibility.Collapsed, + ShowUserName = Visibility.Collapsed, + CardPadding = new Thickness(6, 4, 6, 4), + RichText = ("直播间 " + viewModel.RoomID.ToString() + " " + message.ToString()).ToRichTextBlock(null, fontWeight: "Medium"), + CardHorizontalAlignment = HorizontalAlignment.Center, }); } @@ -98,9 +106,10 @@ private void InteractWord(LiveRoomViewModel viewModel, object message) if (!viewModel.ReceiveWelcomeMsg) return; var msg = new DanmuMsgModel() { - UserName = info.UserName, - // UserNameColor = "#FFFF69B4",//Colors.HotPink - RichText = info.MsgType == 1 ? "进入直播间".ToRichTextBlock(null, color: "Gray") : "关注了主播".ToRichTextBlock(null, color: "Gray") + ShowUserName = Visibility.Visible, + ShowUserFace = Visibility.Collapsed, + ShowRichText = Visibility.Collapsed, + UserName = info.UserName + " 进入直播间", }; if (info.ShowMedal == Visibility.Visible) @@ -172,22 +181,29 @@ private void GuardBuy(LiveRoomViewModel viewModel, object message) var info = message as GuardBuyMsgModel; var msg = new DanmuMsgModel { - UserName = info.UserName, - UserNameColor = "#FFFF69B4",//Colors.HotPink - RichText = $"成为了主播的{info.GiftName}🎉".ToRichTextBlock(null, fontWeight: "Medium"), - UserCaptain = info.GiftName, - ShowCaptain = Visibility.Visible, - UserNameFontWeight = "SemiBold", // 字重调大, 防止与进场弹幕混淆 + ShowUserName = Visibility.Collapsed, + ShowUserFace = Visibility.Collapsed, + RichText = (info.UserName + $" 成为了主播的{info.GiftName}🎉").ToRichTextBlock(null, fontWeight: "SemiBold", fontColor: info.FontColor), + CardColor = new SolidColorBrush(info.CardColor), + CardHorizontalAlignment = HorizontalAlignment.Center, }; - viewModel.Messages.Add(msg); // 刷新舰队列表 - _ = viewModel.GetGuardList(); + viewModel.ReloadGuardList().RunWithoutAwait(); } private void RoomChange(LiveRoomViewModel viewModel, object message) { var info = message as RoomChangeMsgModel; + var msg = new DanmuMsgModel + { + ShowUserFace = Visibility.Collapsed, + ShowUserName = Visibility.Collapsed, + RichText = ($"直播间标题已修改:\n{viewModel.RoomTitle} ➡️ {info.Title}").ToRichTextBlock(null, fontWeight: "SemiBold", fontColor: "#ff1e653a"), //一种绿色 + CardColor = new SolidColorBrush(Color.FromArgb(255, 228, 255, 233)), + CardHorizontalAlignment = HorizontalAlignment.Center, + }; + viewModel.Messages.Add(msg); viewModel.RoomTitle = info.Title; } @@ -196,9 +212,11 @@ private void RoomBlock(LiveRoomViewModel viewModel, object message) var info = message as RoomBlockMsgModel; var msg = new DanmuMsgModel() { - UserName = info.UserName, - RichText = "被直播间禁言🚫".ToRichTextBlock(null, fontWeight: "Medium"), // 字重调大, 防止与进场弹幕混淆) - UserNameFontWeight = "SemiBold", + ShowUserFace = Visibility.Collapsed, + ShowUserName = Visibility.Collapsed, + RichText = (info.UserName + " 被直播间禁言🚫").ToRichTextBlock(null, fontWeight: "SemiBold", fontColor: "White"), // 白色 + CardColor = new SolidColorBrush(Color.FromArgb(255, 235, 45, 80)), // 一种红色 + CardHorizontalAlignment = HorizontalAlignment.Center, }; viewModel.Messages.Add(msg); @@ -207,29 +225,40 @@ private void RoomBlock(LiveRoomViewModel viewModel, object message) private void WaringOrCutOff(LiveRoomViewModel viewModel, object message) { var info = message as WarningOrCutOffMsgModel; + var text = info.Command switch + { + "WARNING" => "⚠️直播间警告", + "CUT_OFF" => "⛔直播间切断", + _ => null, + }; + var cardColor = info.Command switch + { + "WARNING" => new SolidColorBrush(Color.FromArgb(255, 235, 156, 0)), // 一种橙黄色 + "CUT_OFF" => new SolidColorBrush(Color.FromArgb(255, 210, 20, 54)), // 一种深红色 + _ => null, + }; var msg = new DanmuMsgModel() { - UserName = info.Command switch - { - "WARNING" => "⚠️直播间警告", - "CUT_OFF" => "⛔直播间切断", - _ => null, - }, - UserNameColor = "FFFF0000", - RichText = info.Message.ToRichTextBlock(null, color: "Red", fontWeight: "Medium"), // 字重调大, 防止与进场弹幕混淆 - UserNameFontWeight = "SemiBold", + ShowUserFace = Visibility.Collapsed, + ShowUserName = Visibility.Collapsed, + RichText = (text + "\n" + info.Message).ToRichTextBlock(null, fontColor: "White", fontWeight: "SemiBold"), + CardColor = cardColor, + CardHorizontalAlignment = HorizontalAlignment.Center, }; viewModel.Messages.Add(msg); } - private async void StartLive(LiveRoomViewModel viewModel, object room_Id) + private void StartLive(LiveRoomViewModel viewModel, object room_Id) { - await System.Threading.Tasks.Task.Delay(TimeSpan.FromSeconds(5)); // 挂起五秒再获取, 否则很大可能一直卡加载而不缓冲 viewModel.GetPlayUrls(room_Id.ToInt32(), SettingService.GetValue(SettingConstants.Live.DEFAULT_QUALITY, 10000)).RunWithoutAwait(); viewModel.Messages.Add(new DanmuMsgModel() { - UserName = $"{room_Id} 直播间开始直播", + ShowUserFace = Visibility.Collapsed, + ShowUserName = Visibility.Collapsed, + RichText = $"直播间 {room_Id} 开始直播".ToRichTextBlock(null, fontWeight: "Medium"), + CardHorizontalAlignment = HorizontalAlignment.Center, + CardPadding = new Thickness(6, 4, 6, 4), }); } @@ -237,5 +266,30 @@ private void OnlineRankChange(LiveRoomViewModel viewModel, object message) { viewModel.Ranks.Where(rank => rank.RankType == "contribution-rank").ToList()?[0]?.ReloadData().RunWithoutAwait(); } + + private void StopLive(LiveRoomViewModel viewModel, object message) + { + //viewModel.GetPlayUrls(viewModel.RoomID.ToInt32(), SettingService.GetValue(SettingConstants.Live.DEFAULT_QUALITY, 10000)).RunWithoutAwait(); + viewModel.Messages.Add(new DanmuMsgModel() + { + ShowUserFace = Visibility.Collapsed, + ShowUserName = Visibility.Collapsed, + RichText = $"直播间 {viewModel.RoomID} 停止直播".ToRichTextBlock(null, fontWeight: "Medium"), + CardHorizontalAlignment = HorizontalAlignment.Center, + CardPadding = new Thickness(6, 4, 6, 4), + }); + } + + private void RoomSlient(LiveRoomViewModel viewModel, object level) + { + viewModel.Messages.Add(new DanmuMsgModel() + { + ShowUserFace = Visibility.Collapsed, + ShowUserName = Visibility.Collapsed, + RichText = ((int)level > 0 ? $"直播间开启了等级{level}禁言🤐" : "直播间关闭了等级禁言🗣️").ToRichTextBlock(null, fontWeight: "SemiBold", fontColor: "White"), + CardHorizontalAlignment = HorizontalAlignment.Center, + CardColor = new SolidColorBrush(Color.FromArgb(255, 235, 45, 80)), // 一种红色 + }); + } } } diff --git a/src/BiliLite.UWP/Modules/Live/LiveMessage.cs b/src/BiliLite.UWP/Modules/Live/LiveMessage.cs index f9e04419..96c50163 100644 --- a/src/BiliLite.UWP/Modules/Live/LiveMessage.cs +++ b/src/BiliLite.UWP/Modules/Live/LiveMessage.cs @@ -148,17 +148,30 @@ private async Task ParseData(byte[] data) //可能有多条数据，做个分割 var textLines = Regex.Split(text, "[\x00-\x1f]+").Where(x => x.Length > 2 && x[0] == '{').ToArray(); - var delay = textLines.Length > 30 ? 0.1 : 0.05; // 大概3秒来一波 - delay = textLines.Length > 60 ? 0.2 : delay; foreach (var item in textLines) { - ParseMessage(item); - await Task.Delay(TimeSpan.FromSeconds(delay)); + // 每波弹幕大约2.5秒, 使用2.3秒避免弹幕延迟 + var delay = ParseMessage(item) switch + { + MessageDelayType.DanmuMessage => 2.3 / textLines.Length, // 常规弹幕类型, 加延迟 + MessageDelayType.GiftMessage => 0.1 / textLines.Length, // 礼物消息类型, 加一点延迟 + MessageDelayType.SystemMessage => 0.0, // 其他系统消息类型, 无需加延迟 + _ => 0.0 + }; + + if (delay > 0.0) + { + await Task.Delay(TimeSpan.FromSeconds(delay)); + } + else + { + continue; + } } } } - private void ParseMessage(string jsonMessage) + private MessageDelayType ParseMessage(string jsonMessage) { try { @@ -169,6 +182,16 @@ private void ParseMessage(string jsonMessage) var msg = new DanmuMsgModel(); if (obj["info"] != null && obj["info"].ToArray().Length != 0) { + // 获取头像 + if (obj["info"][0][15]["user"] != null) + { + var user = obj["info"][0][15]["user"]; + var uid = user["uid"].ToString(); + var face = user["base"]["face"].ToString(); + msg.Uid = uid; + msg.Face = face; + } + // 弹幕内黄豆表情详情 if (obj["info"][0][15]["extra"] != null)// && obj["info"][0][15]["extra"].ToArray().Length != 0) { @@ -181,9 +204,8 @@ private void ParseMessage(string jsonMessage) // 弹幕内大表情详情 if (obj["info"][0][13] != null && obj["info"][0][13].ToArray().Length != 0) - { - // 如果有大表情, 直接不需要显示任何文字 - msg.ShowRichText = Visibility.Collapsed; + { + msg.ShowBigSticker = Visibility.Visible; msg.BigSticker = new DanmuMsgModel.BigStickerInfo { Url = (string)obj["info"][0][13]["url"], @@ -199,6 +221,7 @@ private void ParseMessage(string jsonMessage) msg.Text = obj["info"][1].ToString(); // 字重调大, 防止与进场弹幕混淆 msg.UserNameFontWeight = "SemiBold"; + // 将弹幕普通文本转为富文本 msg.RichText = msg.Text.ToRichTextBlock(msg.Emoji, true, fontWeight: "Medium"); // 弹幕颜色 @@ -211,7 +234,7 @@ private void ParseMessage(string jsonMessage) // 是否为房管 if (obj["info"][2] != null && obj["info"][2].ToArray().Length != 0) { - msg.UserName = obj["info"][2][1].ToString() + ":"; + msg.UserName = obj["info"][2][1].ToString(); if (obj["info"][2][2] != null && Convert.ToInt32(obj["info"][2][2].ToString()) == 1) { msg.Role = "房管"; @@ -264,7 +287,7 @@ private void ParseMessage(string jsonMessage) //} NewMessage?.Invoke(MessageType.Danmu, msg); - return; + return MessageDelayType.DanmuMessage; } } else if (cmd == "SEND_GIFT" || cmd == "POPULARITY_RED_POCKET_NEW") @@ -280,7 +303,7 @@ private void ParseMessage(string jsonMessage) msg.UserID = obj["data"]["uid"].ToString(); NewMessage?.Invoke(MessageType.Gift, msg); } - return; + return MessageDelayType.GiftMessage; } else if (cmd == "COMBO_SEND") { @@ -295,7 +318,7 @@ private void ParseMessage(string jsonMessage) msg.UserID = obj["data"]["uid"].ToString(); NewMessage?.Invoke(MessageType.Gift, msg); } - return; + return MessageDelayType.GiftMessage; } else if (cmd == "INTERACT_WORD") { @@ -316,7 +339,7 @@ private void ParseMessage(string jsonMessage) NewMessage?.Invoke(MessageType.InteractWord, w); } - return; + return MessageDelayType.SystemMessage; } // 没写相关实现, 先注释掉 //if (cmd == "SYS_MSG") @@ -330,7 +353,7 @@ private void ParseMessage(string jsonMessage) { NewMessage?.Invoke(MessageType.AnchorLotteryStart, obj["data"].ToString()); } - return; + return MessageDelayType.SystemMessage; } else if (cmd == "ANCHOR_LOT_AWARD") { @@ -338,7 +361,7 @@ private void ParseMessage(string jsonMessage) { NewMessage?.Invoke(MessageType.AnchorLotteryAward, obj["data"].ToString()); } - return; + return MessageDelayType.SystemMessage; } else if (cmd == "POPULARITY_RED_POCKET_START") { @@ -346,7 +369,7 @@ private void ParseMessage(string jsonMessage) { NewMessage?.Invoke(MessageType.RedPocketLotteryStart, obj["data"].ToString()); } - return; + return MessageDelayType.SystemMessage; } else if (cmd == "POPULARITY_RED_POCKET_WINNER_LIST") { @@ -354,12 +377,12 @@ private void ParseMessage(string jsonMessage) { NewMessage?.Invoke(MessageType.RedPocketLotteryWinner, obj["data"].ToString()); } - return; + return MessageDelayType.SystemMessage; } else if (cmd == "SUPER_CHAT_MESSAGE") { var msgView = new SuperChatMsgViewModel(); - if (obj["data"] == null) return; + if (obj["data"] == null) return MessageDelayType.SystemMessage; msgView.BackgroundBottomColor = obj["data"]["background_bottom_color"].ToString(); msgView.BackgroundColor = obj["data"]["background_color"].ToString(); msgView.BackgroundImage = obj["data"]["background_image"].ToString(); @@ -374,7 +397,7 @@ private void ParseMessage(string jsonMessage) msgView.Price = obj["data"]["price"].ToInt32(); msgView.Username = obj["data"]["user_info"]["uname"].ToString(); NewMessage?.Invoke(MessageType.SuperChat, msgView); - return; + return MessageDelayType.SystemMessage; } else if (cmd == "ROOM_CHANGE") { @@ -389,7 +412,7 @@ private void ParseMessage(string jsonMessage) ParentAreaID = obj["data"]["parent_area_id"].ToInt32(), }); } - return; + return MessageDelayType.SystemMessage; } else if (cmd == "GUARD_BUY") { @@ -406,7 +429,7 @@ private void ParseMessage(string jsonMessage) GuardLevel = obj["data"]["guard_level"].ToInt32(), }); } - return; + return MessageDelayType.SystemMessage; } else if (cmd == "ROOM_BLOCK_MSG") { @@ -418,6 +441,7 @@ private void ParseMessage(string jsonMessage) UserName = obj["data"]["uname"].ToString(), }); } + return MessageDelayType.SystemMessage; } else if (cmd == "WARNING" || cmd == "CUT_OFF") { @@ -429,6 +453,7 @@ private void ParseMessage(string jsonMessage) Command = cmd, }); } + return MessageDelayType.SystemMessage; } else if (cmd == "LIVE" || cmd == "REENTER_LIVE_ROOM") { @@ -436,6 +461,7 @@ private void ParseMessage(string jsonMessage) { NewMessage?.Invoke(MessageType.StartLive, obj["roomid"].ToString()); } + return MessageDelayType.SystemMessage; } else if (cmd == "WATCHED_CHANGE") { @@ -443,6 +469,7 @@ private void ParseMessage(string jsonMessage) { NewMessage?.Invoke(MessageType.WatchedChange, obj["data"]["text_large"].ToString()); } + return MessageDelayType.SystemMessage; } else if (cmd == "ONLINE_RANK_V2") { @@ -450,12 +477,29 @@ private void ParseMessage(string jsonMessage) { NewMessage?.Invoke(MessageType.OnlineRankChange, obj["data"]["list"].ToString()); } - if (obj["data"] != null && obj["data"]["online_list"] != null) { NewMessage?.Invoke(MessageType.OnlineRankChange, obj["data"]["online_list"].ToString()); } + return MessageDelayType.SystemMessage; + } + else if (cmd == "PREPARING") //直播准备中, 即已停止直播(并没有测试到实际信息...) + { + if (obj["data"] != null) + { + NewMessage?.Invoke(MessageType.StopLive, null); + } + return MessageDelayType.SystemMessage; + } + else if (cmd == "ROOM_SILENT_ON" || cmd == "ROOM_SILENT_OFF") + { + if (obj["data"] != null) + { + NewMessage?.Invoke(MessageType.RoomSlient, obj["data"]["level"].ToInt32()); + } + return MessageDelayType.SystemMessage; } + return MessageDelayType.SystemMessage; } catch (Exception ex) { @@ -463,6 +507,7 @@ private void ParseMessage(string jsonMessage) { logger.Log("直播解析JSON包出错", LogType.Error ,ex); } + return MessageDelayType.SystemMessage; } } diff --git a/src/BiliLite.UWP/Pages/LiveDetailPage.xaml b/src/BiliLite.UWP/Pages/LiveDetailPage.xaml index b36e9b84..b0de229d 100644 --- a/src/BiliLite.UWP/Pages/LiveDetailPage.xaml +++ b/src/BiliLite.UWP/Pages/LiveDetailPage.xaml @@ -285,15 +285,47 @@ - - - - - - - 房管 - - + + + + + + + + + + + + + + + + + + + + + + + 房管 + + + + + + + + + + + + + + + + + + @@ -307,32 +339,36 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1054,7 +1090,7 @@ - + + + - - + + + diff --git a/src/BiliLite.UWP/Player/SubPlayers/LiveHlsPlayer.cs b/src/BiliLite.UWP/Player/SubPlayers/LiveHlsPlayer.cs index 485f0ebe..b504d27c 100644 --- a/src/BiliLite.UWP/Player/SubPlayers/LiveHlsPlayer.cs +++ b/src/BiliLite.UWP/Player/SubPlayers/LiveHlsPlayer.cs @@ -7,6 +7,7 @@ using BiliLite.Models.Common.Player; using BiliLite.Player.SubPlayers; using BiliLite.Player.MediaInfos; +using System.Linq; namespace BiliLite.Player { @@ -29,7 +30,11 @@ public LiveHlsPlayer(PlayerConfig playerConfig, MediaPlayerElement playerElement m_config.FFmpegOptions.Add("rtsp_transport", "tcp"); m_config.FFmpegOptions.Add("user_agent", "Mozilla/5.0 BiliDroid/1.12.0 (bbcallen@gmail.com)"); m_config.FFmpegOptions.Add("referer", "https://live.bilibili.com/"); - } + + m_config.FFmpegOptions.Add("reconnect_streamed", 1); + m_config.FFmpegOptions.Add("reconnect_on_http_error", "404"); //刚开播时会404, 但一会就好了 + m_config.FFmpegOptions.Add("reconnect_delay_max", 10); + } public override double Volume { @@ -157,6 +162,7 @@ public override async Task Load() { url = (urls.FlvUrls != null && selectRouteLine < urls.FlvUrls.Count) ? urls.FlvUrls[selectRouteLine].Url : urls.HlsUrls[selectRouteLine].Url; } + url ??= urls.FlvUrls.FirstOrDefault(x => x.Url != null).Url; // 不论如何是有flv流的 m_url = url; diff --git a/src/BiliLite.UWP/ViewModels/Live/LiveRoomViewModel.cs b/src/BiliLite.UWP/ViewModels/Live/LiveRoomViewModel.cs index 63c28ed4..45d68b38 100644 --- a/src/BiliLite.UWP/ViewModels/Live/LiveRoomViewModel.cs +++ b/src/BiliLite.UWP/ViewModels/Live/LiveRoomViewModel.cs @@ -130,6 +130,11 @@ public LiveRoomViewModel() /// public string WatchedNum { get; set; } + /// + /// 舰长数 + /// + public int GuardNum { get; set; } + public bool Loading { get; set; } = true; public bool Attention { get; set; } @@ -550,16 +555,14 @@ public async Task LoadLiveRoomDetail(string id) RoomID = data.data.RoomInfo.RoomId; RoomTitle = data.data.RoomInfo.Title; - //WatchedNum = data.data.RoomInfo.Online; Liveing = data.data.RoomInfo.LiveStatus == 1; + GuardNum = data.data.GuardInfo.Count; LiveInfo = data.data; + if (Ranks == null) { Ranks = new List() { - //new LiveRoomRankViewModel(RoomID, data.data.RoomInfo.Uid, "金瓜子榜", "gold-rank"), - //new LiveRoomRankViewModel(RoomID, data.data.RoomInfo.Uid, "今日礼物榜", "today-rank"), - //new LiveRoomRankViewModel(RoomID, data.data.RoomInfo.Uid, "七日礼物榜", "seven-rank"), new LiveRoomRankViewModel(RoomID, data.data.RoomInfo.Uid, "高能用户贡献榜", "contribution-rank"), new LiveRoomRankViewModel(RoomID, data.data.RoomInfo.Uid, "粉丝榜", "fans"), }; @@ -870,10 +873,10 @@ public async Task GetGuardList() var data = await result.GetData(); if (!data.success) return; var guardNum = data.data["info"]["num"].ToInt32(); - LiveInfo.GuardInfo.Count = guardNum; // 更新显示数字(似乎不生效...) + GuardNum = guardNum; // 更新显示数字 var top3 = JsonConvert.DeserializeObject>(data.data["top3"].ToString()); - if (Guards.Count == 0 && top3 != null && top3.Count != 0 && Guards.Count < guardNum) + if (Guards.Count == 0 && top3 != null && top3.Count != 0 && Guards.Count < GuardNum) { foreach (var item in top3) { @@ -882,7 +885,7 @@ public async Task GetGuardList() } var list = JsonConvert.DeserializeObject>(data.data["list"].ToString()); - if (list != null && list.Count != 0 && Guards.Count < guardNum) + if (list != null && list.Count != 0 && Guards.Count < GuardNum) { foreach (var item in list) { @@ -923,6 +926,17 @@ public async void LoadMoreGuardList() await GetGuardList(); } + /// + /// 重新加载舰队信息 + /// + public async Task ReloadGuardList() + { + if (LoadingGuard) { return; } + Guards?.Clear(); + GuardPage = 1; + await GetGuardList(); + } + public async Task GetFreeSilverTime() { try From 9115e5f8d78d0bffcb4c1223ce7f473baa153566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=8E=E9=A3=8E?= <31241581+JimHans@users.noreply.github.com> Date: Sat, 6 Jan 2024 13:02:24 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E5=B0=BA=E5=AF=B8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=BC=E5=AE=B9=E6=A8=A1=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=AE=BE=E5=A4=87=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E7=94=BB=E9=9D=A2=E9=BB=91=E5=B1=8F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#475)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BiliLite.UWP/Controls/Player.xaml.cs | 25 +++++++++++++++++++ src/BiliLite.UWP/Controls/PlayerControl.xaml | 1 + .../Controls/PlayerControl.xaml.cs | 2 ++ src/BiliLite.UWP/Player/IBiliPlayer.cs | 4 +++ 4 files changed, 32 insertions(+) diff --git a/src/BiliLite.UWP/Controls/Player.xaml.cs b/src/BiliLite.UWP/Controls/Player.xaml.cs index 2ce9783e..c9248775 100644 --- a/src/BiliLite.UWP/Controls/Player.xaml.cs +++ b/src/BiliLite.UWP/Controls/Player.xaml.cs @@ -1086,6 +1086,30 @@ public void SetRatioMode(int mode) mediaPlayerVideo.Height = this.ActualHeight; mediaPlayerVideo.Width = this.ActualHeight * 4 / 3; break; + case 4: + if (m_dashInfo != null) + { + if (((double)this.ActualWidth / (double)this.ActualHeight) <= ((double)m_dashInfo.Video.Width / (double)m_dashInfo.Video.Height)) + { + /// 原视频长宽比大于等于窗口长宽比 + mediaPlayerVideo.Stretch = Stretch.Fill; + mediaPlayerVideo.Width = this.ActualWidth; + mediaPlayerVideo.Height = this.ActualWidth * (double)m_dashInfo.Video.Height / (double)m_dashInfo.Video.Width; + } + else { + /// 原视频长宽比小于窗口长宽比 + mediaPlayerVideo.Stretch = Stretch.Fill; + mediaPlayerVideo.Width = this.ActualHeight * (double)m_dashInfo.Video.Width / (double)m_dashInfo.Video.Height; + mediaPlayerVideo.Height = this.ActualHeight; + } + } + else { + /// 未获取到DASH视频信息则不缩放 + mediaPlayerVideo.Stretch = Stretch.None; + mediaPlayerVideo.Width = double.NaN; + mediaPlayerVideo.Height = double.NaN; + } + break; default: break; } @@ -1308,6 +1332,7 @@ public string GetMediaInfo() if (m_dashInfo != null && m_dashInfo.Audio != null) { info += $"Resolution: {m_dashInfo.Video.Width} x {m_dashInfo.Video.Height}\r\n"; + info += $"View Resolution: {(int)mediaPlayerVideo.Width} x {(int)mediaPlayerVideo.Height}\r\n"; info += $"Video Codec: {m_dashInfo.Video.Codecs}\r\n"; info += $"Video DataRate: {(m_dashInfo.Video.BandWidth / 1024).ToString("0.0")}Kbps\r\n"; info += $"Average Frame: {m_dashInfo.Video.FrameRate}\r\n"; diff --git a/src/BiliLite.UWP/Controls/PlayerControl.xaml b/src/BiliLite.UWP/Controls/PlayerControl.xaml index be2e2ca1..741b6ce1 100644 --- a/src/BiliLite.UWP/Controls/PlayerControl.xaml +++ b/src/BiliLite.UWP/Controls/PlayerControl.xaml @@ -494,6 +494,7 @@ 填充 16:9 4:3 + 兼容 diff --git a/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs b/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs index 7bd77e14..13dc8920 100644 --- a/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs +++ b/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs @@ -2329,6 +2329,8 @@ private void Player_PlayStateChanged(object sender, PlayState e) BottomBtnLoading.Visibility = Visibility.Visible; BottomBtnPlay.Visibility = Visibility.Collapsed; BottomBtnPause.Visibility = Visibility.Collapsed; + // 更新画面比例 + Player.SetRatioMode(PlayerSettingRatio.SelectedIndex); break; case PlayState.Playing: KeepScreenOn(true); diff --git a/src/BiliLite.UWP/Player/IBiliPlayer.cs b/src/BiliLite.UWP/Player/IBiliPlayer.cs index 1dd620a2..4e65963d 100644 --- a/src/BiliLite.UWP/Player/IBiliPlayer.cs +++ b/src/BiliLite.UWP/Player/IBiliPlayer.cs @@ -24,6 +24,10 @@ public enum PlayerAspectRatio /// 保持4：3 /// S4_3, + /// + /// 兼容 + /// + Compatible } public enum PlayerState { From c04f6c703ac976324b19f83587bb73c870b8aa68 Mon Sep 17 00:00:00 2001 From: GD-Slime <82302542+GD-Slime@users.noreply.github.com> Date: Sat, 20 Jan 2024 09:41:34 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=A4=B9=E7=A7=81=E5=AF=86=E9=97=AE=E9=A2=98=20(#481)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BiliLite.UWP/Models/Requests/Api/User/FavoriteAPI.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BiliLite.UWP/Models/Requests/Api/User/FavoriteAPI.cs b/src/BiliLite.UWP/Models/Requests/Api/User/FavoriteAPI.cs index 621fd4b3..363047b4 100644 --- a/src/BiliLite.UWP/Models/Requests/Api/User/FavoriteAPI.cs +++ b/src/BiliLite.UWP/Models/Requests/Api/User/FavoriteAPI.cs @@ -117,7 +117,7 @@ public ApiModel CreateFavorite(string title, string intro, bool isOpen) { method = RestSharp.Method.Post, baseUrl = $"{ApiHelper.API_BASE_URL}/x/v3/fav/folder/add", - body = ApiHelper.MustParameter(AppKey, true) + $"privacy={(isOpen ? 0 : 1)}&title={Uri.EscapeDataString(title)}&intro={Uri.EscapeDataString(intro)}" + body = ApiHelper.MustParameter(AppKey, true) + $"&privacy={(isOpen ? 0 : 1)}&title={Uri.EscapeDataString(title)}&intro={Uri.EscapeDataString(intro)}" }; api.body += ApiHelper.GetSign(api.body, AppKey); return api; @@ -136,7 +136,7 @@ public ApiModel EditFavorite(string title, string intro, bool isOpen, string med { method = RestSharp.Method.Post, baseUrl = $"{ApiHelper.API_BASE_URL}/x/v3/fav/folder/edit", - body = ApiHelper.MustParameter(AppKey, true) + $"privacy={(isOpen ? 0 : 1)}&title={Uri.EscapeDataString(title)}&intro={Uri.EscapeDataString(intro)}&media_id={media_id}" + body = ApiHelper.MustParameter(AppKey, true) + $"&privacy={(isOpen ? 0 : 1)}&title={Uri.EscapeDataString(title)}&intro={Uri.EscapeDataString(intro)}&media_id={media_id}" }; api.body += ApiHelper.GetSign(api.body, AppKey); return api; From 551213fb448e8d794430ed733e2676e35fb4d018 Mon Sep 17 00:00:00 2001 From: GD-Slime <82302542+GD-Slime@users.noreply.github.com> Date: Sat, 20 Jan 2024 10:11:04 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=83=AD=E9=97=A8?= =?UTF-8?q?=E9=A1=B5=E9=94=99=E8=AF=AF=EF=BC=8C=E8=B0=83=E6=95=B4=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E5=B8=83=E5=B1=80=20(#480)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update item width * 修复热门页故障 --- .../Models/Requests/Api/Home/HotApi.cs | 1 + src/BiliLite.UWP/Pages/Home/HotPage.xaml | 22 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/BiliLite.UWP/Models/Requests/Api/Home/HotApi.cs b/src/BiliLite.UWP/Models/Requests/Api/Home/HotApi.cs index 6a3b46b3..ca62e3ec 100644 --- a/src/BiliLite.UWP/Models/Requests/Api/Home/HotApi.cs +++ b/src/BiliLite.UWP/Models/Requests/Api/Home/HotApi.cs @@ -12,6 +12,7 @@ public ApiModel Popular(string idx = "0", string last_param = "") baseUrl = $"https://app.bilibili.com/x/v2/show/popular/index", parameter = ApiHelper.MustParameter(AppKey, true) + $"&idx={idx}&last_param={last_param}" }; + api.parameter = api.parameter.Replace("mobi_app=iphone", "mobi_app=android"); api.parameter += ApiHelper.GetSign(api.parameter, AppKey); return api; } diff --git a/src/BiliLite.UWP/Pages/Home/HotPage.xaml b/src/BiliLite.UWP/Pages/Home/HotPage.xaml index 0b081c00..acf449fd 100644 --- a/src/BiliLite.UWP/Pages/Home/HotPage.xaml +++ b/src/BiliLite.UWP/Pages/Home/HotPage.xaml @@ -44,10 +44,10 @@ - + - + @@ -55,14 +55,20 @@ - - - + + + + + + + + + - - - + + + From acb2ab8053abb500439a50e591a5657f3afadb3b Mon Sep 17 00:00:00 2001 From: ywmoyue Date: Sat, 20 Jan 2024 10:49:00 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0contributors=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/_img/contributors.png | Bin 13125 -> 17323 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/document/_img/contributors.png b/document/_img/contributors.png index 82d637eed838be143e9a6c90324cf6db4fd04143..839b886b84f27b97b362f0cad63a21870fc134ef 100644 GIT binary patch literal 17323 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�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 yEq>qy%Rok1@|phMGavs17yr-Pxi Date: Sat, 27 Jan 2024 11:40:56 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=B6=E4=BD=BF=E7=94=A8=E7=9A=84build?= =?UTF-8?q?=E5=80=BC=EF=BC=9B=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84build=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Common/SettingConstants.cs | 13 ++++++++++ src/BiliLite.UWP/Pages/SettingPage.xaml | 8 ++++++- src/BiliLite.UWP/Pages/SettingPage.xaml.cs | 24 +++++++++++++++++++ src/BiliLite.UWP/Services/ApiHelper.cs | 4 +++- 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/BiliLite.UWP/Models/Common/SettingConstants.cs b/src/BiliLite.UWP/Models/Common/SettingConstants.cs index 236d4156..64812d2e 100644 --- a/src/BiliLite.UWP/Models/Common/SettingConstants.cs +++ b/src/BiliLite.UWP/Models/Common/SettingConstants.cs @@ -581,6 +581,9 @@ public class Download } + /// + /// 开发者选项 + /// public class Other { /// @@ -622,6 +625,16 @@ public class Other /// 更新json请求地址 /// public const string UPDATE_JSON_ADDRESS = "RawRepositoryAddress"; + + /// + /// 发起请求时使用的build值 + /// + public const string REQUEST_BUILD = "RequestBuild"; + + /// + /// 默认发起请求时使用的build值 + /// + public const string DEFAULT_REQUEST_BUILD = "75900200"; } } } diff --git a/src/BiliLite.UWP/Pages/SettingPage.xaml b/src/BiliLite.UWP/Pages/SettingPage.xaml index 0434fda8..6fb8b8aa 100644 --- a/src/BiliLite.UWP/Pages/SettingPage.xaml +++ b/src/BiliLite.UWP/Pages/SettingPage.xaml @@ -561,7 +561,7 @@ - 其他 + 开发者选项 @@ -584,6 +584,12 @@ 优先使用Grpc请求动态 + 发起请求时使用的build值 + + + + + BiliLite-WebApi（用于处理UWP无法完成的事项） diff --git a/src/BiliLite.UWP/Pages/SettingPage.xaml.cs b/src/BiliLite.UWP/Pages/SettingPage.xaml.cs index f12d1cf0..ffe00250 100644 --- a/src/BiliLite.UWP/Pages/SettingPage.xaml.cs +++ b/src/BiliLite.UWP/Pages/SettingPage.xaml.cs @@ -760,6 +760,9 @@ private void LoadOther() SettingService.SetValue(SettingConstants.Other.FIRST_GRPC_REQUEST_DYNAMIC, swFirstGrpcRequestDynamic.IsOn); }); + RequestBuildTextBox.Text = SettingService.GetValue(SettingConstants.Other.REQUEST_BUILD, + SettingConstants.Other.DEFAULT_REQUEST_BUILD); + // BiliLiteWebApi BiliLiteWebApiTextBox.Text = SettingService.GetValue(SettingConstants.Other.BILI_LITE_WEB_API_BASE_URL, ApiConstants.BILI_LITE_WEB_API_DEFAULT_BASE_URL); BiliLiteWebApiTextBox.Loaded += (sender, e) => @@ -1021,5 +1024,26 @@ private void mirrorComboboxSelectAction(object selectedValue) } } } + + private void RequestBuildSaveBtn_OnClick(object sender, RoutedEventArgs e) + { + var build = RequestBuildTextBox.Text; + if (string.IsNullOrWhiteSpace(build)) + { + Notify.ShowMessageToast("请输入正确的build值"); + return; + } + + SettingService.SetValue(SettingConstants.Other.REQUEST_BUILD, build); + Notify.ShowMessageToast("已保存"); + } + + private void RequestBuildDefaultBtn_OnClick(object sender, RoutedEventArgs e) + { + var build = SettingConstants.Other.DEFAULT_REQUEST_BUILD; + SettingService.SetValue(SettingConstants.Other.REQUEST_BUILD, build); + RequestBuildTextBox.Text = build; + Notify.ShowMessageToast("已恢复默认"); + } } } diff --git a/src/BiliLite.UWP/Services/ApiHelper.cs b/src/BiliLite.UWP/Services/ApiHelper.cs index df071583..3718449d 100644 --- a/src/BiliLite.UWP/Services/ApiHelper.cs +++ b/src/BiliLite.UWP/Services/ApiHelper.cs @@ -49,7 +49,6 @@ public static class ApiHelper public static ApiKeyInfo AndroidKey = new ApiKeyInfo(Constants.ANDROID_APP_KEY, "560c52ccd288fed045859ed18bffd973", Constants.ANDROID_MOBI_APP, Constants.ANDROID_USER_AGENT); - private const string build = "6235200"; private const string _platform = "android"; public static string deviceId = ""; private static int[] mixinKeyEncTab = new int[] { @@ -134,6 +133,9 @@ public static string MustParameter(ApiKeyInfo apikey, bool needAccesskey = false { url = $"access_key={SettingService.Account.AccessKey}&"; } + + var build = SettingService.GetValue(SettingConstants.Other.REQUEST_BUILD, + SettingConstants.Other.DEFAULT_REQUEST_BUILD); return url + $"appkey={apikey.Appkey}&build={build}&mobi_app={apikey.MobiApp}&platform={_platform}&ts={TimeExtensions.GetTimestampS()}"; } From 5cff9f598f3643455b6861a7d52f82ff5912b23d Mon Sep 17 00:00:00 2001 From: GD-Slime <82302542+GD-Slime@users.noreply.github.com> Date: Sun, 4 Feb 2024 12:06:56 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=85=B3=E5=BA=95=E9=83=A8=E7=A4=BC=E7=89=A9?= =?UTF-8?q?=E6=A0=8F=E7=9A=84=E6=8C=89=E9=92=AE=20(#488)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 直播间添加开关底部礼物栏的按钮 --- src/BiliLite.UWP/Pages/LiveDetailPage.xaml | 14 +++++++++----- src/BiliLite.UWP/Pages/LiveDetailPage.xaml.cs | 5 +++++ .../ViewModels/Live/LiveDetailPageViewModel.cs | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/BiliLite.UWP/Pages/LiveDetailPage.xaml b/src/BiliLite.UWP/Pages/LiveDetailPage.xaml index b0de229d..ab49f2b7 100644 --- a/src/BiliLite.UWP/Pages/LiveDetailPage.xaml +++ b/src/BiliLite.UWP/Pages/LiveDetailPage.xaml @@ -571,13 +571,13 @@ - - - - + @@ -130,7 +138,7 @@ - 下载完成() + 下载完成() @@ -206,7 +214,7 @@ StretchContentForSingleRow="false" DesiredWidth="460" SelectionMode="None" - ItemsSource="{x:Bind Path=m_viewModel.Downloadeds,Mode=OneWay}" + ItemsSource="{x:Bind Path=m_viewModel.DownloadedViewModels,Mode=OneWay}" IsItemClickEnabled="True"> - + @@ -134,7 +135,7 @@ - + diff --git a/src/BiliLite.UWP/Pages/SettingPage.xaml.cs b/src/BiliLite.UWP/Pages/SettingPage.xaml.cs index 9603448a..554decdc 100644 --- a/src/BiliLite.UWP/Pages/SettingPage.xaml.cs +++ b/src/BiliLite.UWP/Pages/SettingPage.xaml.cs @@ -6,7 +6,6 @@ using Microsoft.Toolkit.Uwp.UI; using Microsoft.UI.Xaml.Controls; using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using Windows.Foundation; @@ -17,6 +16,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; +using BiliLite.Models.Common.Home; using BiliLite.ViewModels.Download; using Microsoft.Extensions.DependencyInjection; @@ -272,11 +272,9 @@ private void LoadUI() }); }); - gridHomeCustom.ItemsSource = SettingService.GetValue>(SettingConstants.UI.HOEM_ORDER, HomeVM.GetAllNavItems()); + var navItems = SettingService.GetValue(SettingConstants.UI.HOEM_ORDER, DefaultHomeNavItems.GetDefaultHomeNavItems()); + gridHomeCustom.ItemsSource = new ObservableCollection(navItems); ExceptHomeNavItems(); - - - } private void LoadPlayer() { @@ -810,28 +808,41 @@ private void LoadOther() private void ExceptHomeNavItems() { - List list = new List(); - var all = HomeVM.GetAllNavItems(); - foreach (var item in all) + var defaultNavItems = DefaultHomeNavItems.GetDefaultHomeNavItems(); + var hideNavItems = DefaultHomeNavItems.GetDefaultHideHomeNavItems(); + var customNavItem = gridHomeCustom.ItemsSource as ObservableCollection; + + var customDontHideNavItems = hideNavItems.Where(hideNavItem => + customNavItem.Any(x => x.Title == hideNavItem.Title)).ToList(); + + foreach (var customDontHideNavItem in customDontHideNavItems) { - if ((gridHomeCustom.ItemsSource as ObservableCollection).FirstOrDefault(x => x.Title == item.Title) == null) + hideNavItems.Remove(customDontHideNavItem); + } + + foreach (var navItem in defaultNavItems) + { + if (!customNavItem.Any(x => x.Title == navItem.Title)) { - list.Add(item); + hideNavItems.Add(navItem); } } - gridHomeNavItem.ItemsSource = list; + + gridHomeNavItem.ItemsSource = hideNavItems; } private void gridHomeCustom_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args) { - SettingService.SetValue(SettingConstants.UI.HOEM_ORDER, gridHomeCustom.ItemsSource as ObservableCollection); + if (!(gridHomeCustom.ItemsSource is ObservableCollection navItems)) return; + SettingService.SetValue(SettingConstants.UI.HOEM_ORDER, navItems.ToList()); Notify.ShowMessageToast("更改成功,重启生效"); } private void gridHomeNavItem_ItemClick(object sender, ItemClickEventArgs e) { var item = e.ClickedItem as HomeNavItem; - (gridHomeCustom.ItemsSource as ObservableCollection).Add(item); - SettingService.SetValue(SettingConstants.UI.HOEM_ORDER, gridHomeCustom.ItemsSource as ObservableCollection); + if (!(gridHomeCustom.ItemsSource is ObservableCollection navItems)) return; + navItems.Add(item); + SettingService.SetValue(SettingConstants.UI.HOEM_ORDER, navItems.ToList()); ExceptHomeNavItems(); Notify.ShowMessageToast("更改成功,重启生效"); } diff --git a/src/BiliLite.UWP/ViewModels/Home/HomeNavItemViewModel.cs b/src/BiliLite.UWP/ViewModels/Home/HomeNavItemViewModel.cs new file mode 100644 index 00000000..f9a71193 --- /dev/null +++ b/src/BiliLite.UWP/ViewModels/Home/HomeNavItemViewModel.cs @@ -0,0 +1,27 @@ +using System; +using BiliLite.ViewModels.Common; +using FontAwesome5; +using PropertyChanged; + +namespace BiliLite.ViewModels.Home +{ + public class HomeNavItemViewModel : BaseViewModel + { + [DoNotNotify] + public string Title { get; set; } + + [DoNotNotify] + public EFontAwesomeIcon Icon { get; set; } + + [DoNotNotify] + public Type Page { get; set; } + + [DoNotNotify] + public object Parameters { get; set; } + + [DoNotNotify] + public bool NeedLogin { get; set; } + + public bool Show { get; set; } + } +} \ No newline at end of file diff --git a/src/BiliLite.UWP/ViewModels/Home/HomeViewModel.cs b/src/BiliLite.UWP/ViewModels/Home/HomeViewModel.cs new file mode 100644 index 00000000..026eef5f --- /dev/null +++ b/src/BiliLite.UWP/ViewModels/Home/HomeViewModel.cs @@ -0,0 +1,71 @@ +using System.Collections.ObjectModel; +using System.Linq; +using System.Threading.Tasks; +using AutoMapper; +using BiliLite.Models.Common; +using BiliLite.Models.Common.Home; +using BiliLite.Modules; +using BiliLite.Services; +using BiliLite.ViewModels.Common; +using Microsoft.Extensions.DependencyInjection; + +namespace BiliLite.ViewModels.Home +{ + public class HomeViewModel : BaseViewModel + { + #region Fields + + private readonly IMapper m_mapper; + private readonly Account m_account; + + #endregion + + #region Constructors + + public HomeViewModel() + { + m_account = new Account(); + m_mapper = App.ServiceProvider.GetRequiredService(); + var homeNavItemList = SettingService.GetValue(SettingConstants.UI.HOEM_ORDER, DefaultHomeNavItems.GetDefaultHomeNavItems()); + HomeNavItems = m_mapper.Map>(homeNavItemList); + SelectItem = HomeNavItems.FirstOrDefault(); + if (!SettingService.Account.Logined) return; + IsLogin = true; + foreach (var item in HomeNavItems) + { + if (!item.Show && item.NeedLogin) item.Show = true; + } + } + + #endregion + + #region Properties + + public ObservableCollection HomeNavItems { get; set; } + + public HomeNavItemViewModel SelectItem { get; set; } + + public bool IsLogin { get; set; } + + public HomeUserCardModel Profile { get; set; } + + public ObservableCollection SuggestSearchContents { get; set; } + + #endregion + + #region Public Methods + + public async Task LoginUserCard() + { + var data = await m_account.GetHomeUserCard(); + if (data != null) + { + Profile = data; + return; + } + //检查Token + } + + #endregion + } +}