Skip to content
This repository has been archived by the owner on Dec 20, 2023. It is now read-only.

修复互动视频返回异常 #996

Merged
merged 1 commit into from
Apr 3, 2022
Merged

修复互动视频返回异常 #996

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
2 changes: 1 addition & 1 deletion src/App/Controls/Player/BiliPlayerTransportControls/BiliPlayerTransportControls.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@
Padding="0"
ToolTipService.ToolTip="{loc:LocaleLocator Name=BackToStart}"
Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ViewModel.IsInteraction, Converter={StaticResource BoolToVisibilityConverter}}">
<icons:RegularFluentIcon FontSize="14" Symbol="Home16" />
<icons:RegularFluentIcon FontSize="14" Symbol="EraserMedium24" />
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="H" Modifiers="Control" />
</Button.KeyboardAccelerators>
Expand Down
2 changes: 1 addition & 1 deletion src/App/Resources/Strings/zh-CN/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ BV号以 BV 开头，是一串英文数字混合的编号， 如 BV1JL4y1875w</v
<value>请输入验证码</value>
</data>
<data name="InteractionEnd" xml:space="preserve">
<value>互动视频结束，可点击左上角“🏘”按钮返回开头</value>
<value>互动视频结束，可点击视频区域内左上角的 “橡皮擦” 按钮返回开头</value>
</data>
<data name="InteractionQuality" xml:space="preserve">
<value>交互式清晰度选择</value>
Expand Down
4 changes: 2 additions & 2 deletions src/ViewModels/ViewModels.Uwp/Common/PlayerViewModel/PlayerViewModel.Methods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ private void InitializeVideoDetail()
RelatedVideoCollection.Add(new VideoViewModel(video));
}

if (_videoDetail.History != null && _videoDetail.History.Progress > 0)
if (_videoDetail.History != null && _videoDetail.History.Progress > 0 && !IsInteraction)
{
var title = string.Empty;
if (IsShowParts)
Expand Down Expand Up @@ -624,7 +624,7 @@ private void CheckPartSelection()
item.IsSelected = item.Data.Equals(CurrentVideoPart);
}

if (VideoPartCollection.Count > 0)
if (VideoPartCollection.Count > 0 && CurrentVideoPart != null)
{
IsPreviousEpisodeButtonEnabled = CurrentVideoPart.Page.Page_ != VideoPartCollection.First().Data.Page.Page_;
IsNextEpisodeButtonEnabled = CurrentVideoPart.Page.Page_ != VideoPartCollection.Last().Data.Page.Page_;
Expand Down