Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Bili.Uwp
提交
5557e721
B
Bili.Uwp
项目概览
jobily
/
Bili.Uwp
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
Bili.Uwp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
5557e721
编写于
8月 09, 2022
作者:
R
Richasy
提交者:
GitHub
8月 09, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复SMTC显示重复播放器的问题 (#1446)
* 修复SMTC显示重复播放器的问题 * 修复SMTC在直播下的暂停问题
上级
f94e61d0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
6 deletion
+16
-6
src/ViewModels/ViewModels.Uwp/Core/FFmpegPlayerViewModel/FFmpegPlayerViewModel.Methods.cs
...re/FFmpegPlayerViewModel/FFmpegPlayerViewModel.Methods.cs
+2
-2
src/ViewModels/ViewModels.Uwp/Core/FFmpegPlayerViewModel/FFmpegPlayerViewModel.cs
...s.Uwp/Core/FFmpegPlayerViewModel/FFmpegPlayerViewModel.cs
+8
-0
src/ViewModels/ViewModels.Uwp/Core/MediaPlayerViewModel/MediaPlayerViewModel.Live.cs
...wp/Core/MediaPlayerViewModel/MediaPlayerViewModel.Live.cs
+1
-1
src/ViewModels/ViewModels.Uwp/Core/MediaPlayerViewModel/MediaPlayerViewModel.Method.cs
.../Core/MediaPlayerViewModel/MediaPlayerViewModel.Method.cs
+3
-1
src/ViewModels/ViewModels.Uwp/Core/MediaPlayerViewModel/MediaPlayerViewModel.Video.cs
...p/Core/MediaPlayerViewModel/MediaPlayerViewModel.Video.cs
+2
-2
未找到文件。
src/ViewModels/ViewModels.Uwp/Core/FFmpegPlayerViewModel/FFmpegPlayerViewModel.Methods.cs
浏览文件 @
5557e721
...
...
@@ -70,11 +70,9 @@ namespace Bili.ViewModels.Uwp.Core
{
_audioPlaybackItem
=
_audioFFSource
.
CreateMediaPlaybackItem
();
_mediaTimelineController
=
GetTimelineController
();
_videoPlayer
.
CommandManager
.
IsEnabled
=
false
;
_videoPlayer
.
TimelineController
=
_mediaTimelineController
;
_audioPlayer
=
GetAudioPlayer
();
_audioPlayer
.
CommandManager
.
IsEnabled
=
false
;
_audioPlayer
.
Source
=
_audioPlaybackItem
;
_audioPlayer
.
TimelineController
=
_mediaTimelineController
;
}
...
...
@@ -141,6 +139,7 @@ namespace Bili.ViewModels.Uwp.Core
player
.
CurrentStateChanged
+=
OnMediaPlayerCurrentStateChangedAsync
;
player
.
MediaEnded
+=
OnMediaPlayerEndedAsync
;
player
.
MediaFailed
+=
OnMediaPlayerFailedAsync
;
player
.
CommandManager
.
IsEnabled
=
false
;
return
player
;
}
...
...
@@ -148,6 +147,7 @@ namespace Bili.ViewModels.Uwp.Core
{
var
player
=
new
MediaPlayer
();
player
.
MediaFailed
+=
OnMediaPlayerFailedAsync
;
player
.
CommandManager
.
IsEnabled
=
false
;
return
player
;
}
...
...
src/ViewModels/ViewModels.Uwp/Core/FFmpegPlayerViewModel/FFmpegPlayerViewModel.cs
浏览文件 @
5557e721
...
...
@@ -69,6 +69,14 @@ namespace Bili.ViewModels.Uwp.Core
}
else
{
if
(
_videoPlayer
!=
null
&&
_videoPlayer
.
TimelineController
==
null
&&
_videoPlayer
.
PlaybackSession
!=
null
&&
_videoPlayer
.
PlaybackSession
.
CanPause
)
{
_videoPlayer
.
Pause
();
}
if
(
_audioPlayer
!=
null
&&
_audioPlayer
.
TimelineController
==
null
&&
_audioPlayer
.
PlaybackSession
!=
null
...
...
src/ViewModels/ViewModels.Uwp/Core/MediaPlayerViewModel/MediaPlayerViewModel.Live.cs
浏览文件 @
5557e721
...
...
@@ -95,7 +95,7 @@ namespace Bili.ViewModels.Uwp.Core
private
async
Task
InitializeLivePlayerAsync
(
string
url
)
{
await
_player
.
SetSourceAsync
(
url
);
StartTimers
AndDisplayRequest
();
StartTimers
();
}
private
async
Task
ChangeLiveAudioOnlyAsync
(
bool
isAudioOnly
)
...
...
src/ViewModels/ViewModels.Uwp/Core/MediaPlayerViewModel/MediaPlayerViewModel.Method.cs
浏览文件 @
5557e721
...
...
@@ -49,6 +49,7 @@ namespace Bili.ViewModels.Uwp.Core
if
(
_systemMediaTransportControls
!=
null
)
{
_systemMediaTransportControls
.
DisplayUpdater
.
ClearAll
();
_systemMediaTransportControls
.
IsEnabled
=
false
;
_systemMediaTransportControls
=
null
;
}
...
...
@@ -118,7 +119,7 @@ namespace Bili.ViewModels.Uwp.Core
}
}
private
void
StartTimers
AndDisplayRequest
()
private
void
StartTimers
()
{
_progressTimer
?.
Start
();
_unitTimer
?.
Start
();
...
...
@@ -259,6 +260,7 @@ namespace Bili.ViewModels.Uwp.Core
}
var
updater
=
_systemMediaTransportControls
.
DisplayUpdater
;
updater
.
ClearAll
();
updater
.
Type
=
MediaPlaybackType
.
Video
;
updater
.
Thumbnail
=
Windows
.
Storage
.
Streams
.
RandomAccessStreamReference
.
CreateFromUri
(
new
Uri
(
cover
));
updater
.
VideoProperties
.
Title
=
title
;
...
...
src/ViewModels/ViewModels.Uwp/Core/MediaPlayerViewModel/MediaPlayerViewModel.Video.cs
浏览文件 @
5557e721
...
...
@@ -29,7 +29,7 @@ namespace Bili.ViewModels.Uwp.Core
ResetPlayer
();
ResetMediaData
();
await
LoadVideoAsync
();
StartTimers
AndDisplayRequest
();
StartTimers
();
}
private
async
Task
LoadVideoAsync
()
...
...
@@ -143,7 +143,7 @@ namespace Bili.ViewModels.Uwp.Core
try
{
await
_player
.
SetSourceAsync
(
_video
,
_audio
);
StartTimers
AndDisplayRequest
();
StartTimers
();
}
catch
(
Exception
ex
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录