Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加直播时使用网页播放器的选项 #806

Merged
merged 1 commit into from
Oct 13, 2024
Merged

增加直播时使用网页播放器的选项 #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Desktop/BiliCopilot.UI.Models/Constants/SettingNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,5 @@ public enum SettingNames
IsTopNavBarShown,
MTCBehavior,
IsAIStreamingResponse,
UseWebPlayerWhenLive,
}
3 changes: 3 additions & 0 deletions src/Desktop/BiliCopilot.UI/Controls/Settings/PlayerBehaviorSettingControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@
</ComboBox.ItemTemplate>
</ComboBox>
</base:SettingsCard>
<base:SettingsCard Description="{ext:Locale Name=UseWebPlayerWhenLiveDescription}" Header="{ext:Locale Name=UseWebPlayerWhenLive}">
<ToggleSwitch IsOn="{x:Bind ViewModel.UseWebPlayerWhenLive, Mode=TwoWay}" />
</base:SettingsCard>
<base:SettingsCard Header="{ext:Locale Name=AutoPlayWhenLoaded}">
<ToggleSwitch IsOn="{x:Bind ViewModel.IsAutoPlayWhenLoaded, Mode=TwoWay}" />
</base:SettingsCard>
Expand Down
3 changes: 2 additions & 1 deletion src/Desktop/BiliCopilot.UI/Forms/PlayerWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ public void OpenLive(MediaIdentifier room)
{
Activate();
var preferPlayer = SettingsToolkit.ReadLocalSetting(SettingNames.PlayerType, PlayerType.Island);
if (preferPlayer == PlayerType.Web)
var useWebPlayer = SettingsToolkit.ReadLocalSetting(SettingNames.UseWebPlayerWhenLive, false);
if (preferPlayer == PlayerType.Web || useWebPlayer)
{
MainFrame.Navigate(typeof(WebPlayerPage), $"https://live.bilibili.com/{room.Id}");
return;
Expand Down
6 changes: 6 additions & 0 deletions src/Desktop/BiliCopilot.UI/Resources/zh-Hans-CN/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,4 +2738,10 @@
<data name="CustomMpvConfigDescription" xml:space="preserve">
<value>MPV 用户请参考 mpv.io 的说明进行自定义配置</value>
</data>
<data name="UseWebPlayerWhenLive" xml:space="preserve">
<value>使用网页播放器观看直播</value>
</data>
<data name="UseWebPlayerWhenLiveDescription" xml:space="preserve">
<value>如果本机观看直播体验不佳，请打开此选项在网页中观看</value>
</data>
</root>
3 changes: 2 additions & 1 deletion src/Desktop/BiliCopilot.UI/ViewModels/Items/LiveItemViewModel/LiveItemViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ private void Play()
}

var preferPlayer = SettingsToolkit.ReadLocalSetting(SettingNames.PlayerType, PlayerType.Island);
if (preferPlayer == PlayerType.Web)
var useWebPlayer = SettingsToolkit.ReadLocalSetting(SettingNames.UseWebPlayerWhenLive, false);
if (preferPlayer == PlayerType.Web || useWebPlayer)
{
this.Get<NavigationViewModel>().NavigateToOver(typeof(WebPlayerPage), GetWebUrl());
return;
Expand Down
3 changes: 3 additions & 0 deletions .../BiliCopilot.UI/ViewModels/View/SettingsPageViewModel/SettingsPageViewModel.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ public sealed partial class SettingsPageViewModel
[ObservableProperty]
private List<MTCBehavior> _mTCBehaviorCollection;

[ObservableProperty]
private bool _useWebPlayerWhenLive;

/// <summary>
/// WebDav 配置.
/// </summary>
Expand Down
4 changes: 4 additions & 0 deletions src/Desktop/BiliCopilot.UI/ViewModels/View/SettingsPageViewModel/SettingsPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ private void Initialize()

OpenFolderAfterDownload = SettingsToolkit.ReadLocalSetting(SettingNames.OpenFolderAfterDownload, true);
DownloadWithDanmaku = SettingsToolkit.ReadLocalSetting(SettingNames.DownloadWithDanmaku, false);
UseWebPlayerWhenLive = SettingsToolkit.ReadLocalSetting(SettingNames.UseWebPlayerWhenLive, false);

var copyrightTemplate = ResourceToolkit.GetLocalizedString(StringNames.Copyright);
Copyright = string.Format(copyrightTemplate, 2024);
Expand Down Expand Up @@ -289,4 +290,7 @@ partial void OnMTCBehaviorChanged(MTCBehavior value)

partial void OnIsAIStreamingResponseChanged(bool value)
=> SettingsToolkit.WriteLocalSetting(SettingNames.IsAIStreamingResponse, value);

partial void OnUseWebPlayerWhenLiveChanged(bool value)
=> SettingsToolkit.WriteLocalSetting(SettingNames.UseWebPlayerWhenLive, value);
}
Loading