Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lindexi_gd
Uno
提交
801f41cb
U
Uno
项目概览
lindexi_gd
/
Uno
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
Uno
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
801f41cb
编写于
6月 21, 2023
作者:
R
Rafael Rosa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: update for unified the player state
上级
84facf30
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
22 deletion
+34
-22
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs
+16
-19
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayerState.cs
...ns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayerState.cs
+15
-0
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs
...ns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs
+3
-3
未找到文件。
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs
浏览文件 @
801f41cb
...
...
@@ -20,7 +20,6 @@ internal partial class HtmlMediaPlayer : Border
{
private
HtmlVideo
_htmlVideo
=
new
HtmlVideo
();
private
HtmlAudio
_htmlAudio
=
new
HtmlAudio
();
private
bool
_isPlaying
;
private
readonly
ImmutableArray
<
string
>
audioTagAllowedFormats
=
ImmutableArray
.
Create
(
new
string
[]
{
".MP3"
,
".WAV"
});
...
...
@@ -28,7 +27,7 @@ internal partial class HtmlMediaPlayer : Border
ImmutableArray
.
Create
(
new
string
[]
{
".MP4"
,
".WEBM"
,
".OGG"
});
private
UIElement
_activeElement
;
private
string
_activeElementName
;
public
bool
IsPaus
e
;
public
HtmlMediaPlayerState
PlayerStat
e
;
public
event
EventHandler
<
object
>
OnSourceLoaded
;
public
event
EventHandler
<
object
>
OnStatusChanged
;
...
...
@@ -45,6 +44,7 @@ internal partial class HtmlMediaPlayer : Border
}
_htmlVideo
.
SetCssStyle
(
"visibility"
,
"hidden"
);
_htmlAudio
.
SetCssStyle
(
"visibility"
,
"hidden"
);
PlayerState
=
HtmlMediaPlayerState
.
None
;
AddChild
(
_htmlVideo
);
AddChild
(
_htmlAudio
);
...
...
@@ -326,7 +326,7 @@ internal partial class HtmlMediaPlayer : Border
{
this
.
Log
().
Debug
(
$"Media ended [
{
Source
}
]"
);
}
_isPlaying
=
fals
e
;
PlayerState
=
HtmlMediaPlayerState
.
Non
e
;
OnSourceEnded
?.
Invoke
(
this
,
EventArgs
.
Empty
);
}
...
...
@@ -336,6 +336,7 @@ internal partial class HtmlMediaPlayer : Border
{
Duration
=
NativeMethods
.
GetDuration
(
_activeElement
.
HtmlId
);
}
PlayerState
=
HtmlMediaPlayerState
.
Opening
;
OnMetadataLoaded
?.
Invoke
(
this
,
Duration
);
}
...
...
@@ -350,10 +351,10 @@ internal partial class HtmlMediaPlayer : Border
_activeElementName
=
IsVideo
?
"Video"
:
IsAudio
?
"Audio"
:
""
;
if
(
_activeElement
!=
null
)
{
PlayerState
=
NativeMethods
.
GetPaused
(
_activeElement
.
HtmlId
)
?
HtmlMediaPlayerState
.
Paused
:
HtmlMediaPlayerState
.
Playing
;
_activeElement
.
SetCssStyle
(
"visibility"
,
"visible"
);
IsPause
=
NativeMethods
.
GetPaused
(
_activeElement
.
HtmlId
);
}
_isPlaying
=
!
IsPause
;
OnStatusChanged
?.
Invoke
(
this
,
EventArgs
.
Empty
);
}
...
...
@@ -384,9 +385,8 @@ internal partial class HtmlMediaPlayer : Border
if
(
_activeElement
!=
null
)
{
IsPause
=
NativeMethods
.
GetPaused
(
_activeElement
.
HtmlId
)
;
PlayerState
=
NativeMethods
.
GetPaused
(
_activeElement
.
HtmlId
)
?
HtmlMediaPlayerState
.
Paused
:
HtmlMediaPlayerState
.
Playing
;
}
_isPlaying
=
!
IsPause
;
OnStatusChanged
?.
Invoke
(
this
,
EventArgs
.
Empty
);
}
...
...
@@ -396,7 +396,7 @@ internal partial class HtmlMediaPlayer : Border
{
this
.
Log
().
Debug
(
$"Media Changed Status Play [
{
Source
}
]"
);
}
IsPause
=
false
;
PlayerState
=
HtmlMediaPlayerState
.
Playing
;
OnStatusChanged
?.
Invoke
(
this
,
EventArgs
.
Empty
);
}
...
...
@@ -406,8 +406,7 @@ internal partial class HtmlMediaPlayer : Border
{
this
.
Log
().
Debug
(
$"Media Changed Status Pause [
{
Source
}
]"
);
}
IsPause
=
true
;
PlayerState
=
HtmlMediaPlayerState
.
Paused
;
OnStatusChanged
?.
Invoke
(
this
,
EventArgs
.
Empty
);
}
...
...
@@ -422,7 +421,7 @@ internal partial class HtmlMediaPlayer : Border
{
this
.
Log
().
Error
(
$"
{
_activeElementName
}
source failed: [
{
Source
}
]"
);
}
IsPause
=
tru
e
;
PlayerState
=
HtmlMediaPlayerState
.
Non
e
;
OnSourceFailed
?.
Invoke
(
this
,
e
.
Detail
);
}
...
...
@@ -457,6 +456,7 @@ internal partial class HtmlMediaPlayer : Border
player
.
_activeElement
.
SetHtmlAttribute
(
"src"
,
encodedSource
);
player
.
_activeElement
.
SetCssStyle
(
"visibility"
,
"visible"
);
player
.
PlayerState
=
HtmlMediaPlayerState
.
Opening
;
if
(
player
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
player
.
Log
().
Debug
(
$"
{
player
.
_activeElementName
}
source changed: [
{
player
.
Source
}
]"
);
...
...
@@ -616,10 +616,9 @@ internal partial class HtmlMediaPlayer : Border
{
this
.
Log
().
Debug
(
$"Play()"
);
}
if
(
_activeElement
!=
null
&&
!
_is
Playing
)
if
(
_activeElement
!=
null
&&
PlayerState
!=
HtmlMediaPlayerState
.
Playing
)
{
IsPause
=
false
;
_isPlaying
=
true
;
PlayerState
=
HtmlMediaPlayerState
.
Playing
;
NativeMethods
.
Play
(
_activeElement
.
HtmlId
);
}
}
...
...
@@ -631,10 +630,9 @@ internal partial class HtmlMediaPlayer : Border
{
this
.
Log
().
Debug
(
$"Pause()"
);
}
if
(
_activeElement
!=
null
&&
_is
Playing
)
if
(
_activeElement
!=
null
&&
PlayerState
==
HtmlMediaPlayerState
.
Playing
)
{
_isPlaying
=
false
;
IsPause
=
true
;
PlayerState
=
HtmlMediaPlayerState
.
Paused
;
NativeMethods
.
Pause
(
_activeElement
.
HtmlId
);
}
}
...
...
@@ -649,8 +647,7 @@ internal partial class HtmlMediaPlayer : Border
if
(
_activeElement
!=
null
)
{
NativeMethods
.
Stop
(
_activeElement
.
HtmlId
);
_isPlaying
=
false
;
IsPause
=
true
;
PlayerState
=
HtmlMediaPlayerState
.
None
;
}
}
...
...
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayerState.cs
0 → 100644
浏览文件 @
801f41cb
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
Uno.UI.Media
;
public
enum
HtmlMediaPlayerState
{
None
=
0
,
Opening
=
1
,
Playing
=
3
,
Paused
=
4
,
}
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs
浏览文件 @
801f41cb
...
...
@@ -235,14 +235,14 @@ public partial class MediaPlayerExtension : IMediaPlayerExtension
{
if
(
this
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
this
.
Log
().
Debug
(
$"MediaPlayerExtension.OnStatusMediaChanged
Paused (
{
_player
?.
IsPause
.
ToString
()}
)
"
);
this
.
Log
().
Debug
(
$"MediaPlayerExtension.OnStatusMediaChanged
to state
{
_player
?.
PlayerState
.
ToString
()}
"
);
}
if
(
_player
?.
IsPause
==
true
&&
_owner
.
PlaybackSession
.
PlaybackState
==
MediaPlaybackState
.
Playing
)
if
(
_player
?.
PlayerState
==
HtmlMediaPlayerState
.
Paused
&&
_owner
.
PlaybackSession
.
PlaybackState
==
MediaPlaybackState
.
Playing
)
{
_owner
.
PlaybackSession
.
PlaybackState
=
MediaPlaybackState
.
Paused
;
}
else
if
(
_player
?.
IsPause
==
false
&&
_owner
.
PlaybackSession
.
PlaybackState
==
MediaPlaybackState
.
Paused
)
else
if
(
_player
?.
PlayerState
==
HtmlMediaPlayerState
.
Playing
&&
_owner
.
PlaybackSession
.
PlaybackState
==
MediaPlaybackState
.
Paused
)
{
_owner
.
PlaybackSession
.
PlaybackState
=
MediaPlaybackState
.
Playing
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录