Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lindexi_gd
Uno
提交
00184cb6
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,发现更多精彩内容 >>
提交
00184cb6
编写于
4月 26, 2023
作者:
R
Rafael Rosa
提交者:
Jerome Laban
5月 03, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: updates for comments
Co-Authored-By:
N
Carl de Billy
<
carl.debilly@gmail.com
>
上级
0a300319
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
44 addition
and
43 deletion
+44
-43
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs
+7
-5
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlVideo.cs
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlVideo.cs
+3
-2
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs
...ns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs
+4
-1
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs
....MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs
+10
-13
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/VideoStretch.cs
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/VideoStretch.cs
+0
-12
src/SamplesApp/SamplesApp.Shared/App.xaml.cs
src/SamplesApp/SamplesApp.Shared/App.xaml.cs
+1
-1
src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/MediaPlayerElement/MediaPlayerElement_Mov_Extension.xaml
.../MediaPlayerElement/MediaPlayerElement_Mov_Extension.xaml
+1
-1
src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs
...UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs
+5
-2
src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.Others.cs
...ontrols/MediaPlayerElement/MediaPlayerPresenter.Others.cs
+4
-2
src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.cs
.../Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.cs
+5
-2
src/Uno.UWP/Media/Playback/MediaPlayer.others.cs
src/Uno.UWP/Media/Playback/MediaPlayer.others.cs
+4
-2
未找到文件。
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs
浏览文件 @
00184cb6
...
...
@@ -10,6 +10,7 @@ using Windows.UI.Xaml.Controls;
using
Windows.UI.Xaml
;
using
System.Globalization
;
using
Windows.UI.Xaml.Controls.Maps
;
using
Windows.UI.Xaml.Media
;
namespace
Uno.UI.Media
;
...
...
@@ -447,20 +448,21 @@ internal partial class HtmlMediaPlayer : Border
}
}
internal
void
UpdateVideoStretch
(
Video
Stretch
stretch
)
internal
void
UpdateVideoStretch
(
Stretch
stretch
)
{
switch
(
stretch
)
{
case
Video
Stretch
.
None
:
case
Stretch
.
None
:
_htmlVideo
.
SetCssStyle
(
"object-fit"
,
"none"
);
break
;
case
Video
Stretch
.
Fill
:
case
Stretch
.
Fill
:
_htmlVideo
.
SetCssStyle
(
"object-fit"
,
"fill"
);
break
;
case
Video
Stretch
.
Uniform
:
case
Stretch
.
Uniform
:
_htmlVideo
.
SetCssStyle
(
"object-fit"
,
"cover"
);
break
;
case
Video
Stretch
.
UniformToFill
:
case
Stretch
.
UniformToFill
:
_htmlVideo
.
SetCssStyle
(
"object-fit"
,
"contain"
);
break
;
}
...
...
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlVideo.cs
浏览文件 @
00184cb6
...
...
@@ -9,7 +9,8 @@ internal class HtmlVideo : UIElement
public
HtmlVideo
()
:
base
(
"video"
)
{
SetAttribute
(
"background-color"
,
"transparent"
);
SetStyle
(
"width"
,
"100%"
);
SetStyle
(
"height"
,
"100%"
);
SetStyle
(
(
"width"
,
"100%"
),
(
"height"
,
"100%"
));
}
}
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs
浏览文件 @
00184cb6
...
...
@@ -243,7 +243,10 @@ public partial class MediaPlayerExtension : IMediaPlayerExtension
public
void
InitializeSource
()
{
Console
.
WriteLine
(
$"MediaPlayerExtension.InitializeSource()"
);
if
(
this
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
this
.
Log
().
LogDebug
(
"Enter MediaPlayerExtension.InitializeSource()."
);
}
NaturalDuration
=
TimeSpan
.
Zero
;
if
(
Position
!=
TimeSpan
.
Zero
)
...
...
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs
浏览文件 @
00184cb6
...
...
@@ -2,6 +2,7 @@
using
System
;
using
Uno.Foundation.Extensibility
;
using
Uno.Foundation.Logging
;
using
Uno.Media.Playback
;
using
Windows.Foundation
;
using
Windows.Media.Playback
;
...
...
@@ -33,8 +34,10 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension
public
void
MediaPlayerChanged
()
{
Console
.
WriteLine
(
$"MediaPlayerPresenterExtension.MediaPlayerChanged()"
);
if
(
this
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
this
.
Log
().
LogDebug
(
"Enter MediaPlayerPresenterExtension.MediaPlayerChanged()."
);
}
if
(
_owner
is
not
null
&&
MediaPlayerExtension
.
GetByMediaPlayer
(
_owner
.
MediaPlayer
)
is
{
}
extension
)
{
...
...
@@ -42,7 +45,10 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension
}
else
{
Console
.
WriteLine
(
$"MediaPlayerPresenter.OnMediaPlayerChanged: Unable to find associated MediaPlayerExtension"
);
if
(
this
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
this
.
Log
().
LogDebug
(
$"MediaPlayerPresenter.OnMediaPlayerChanged: Unable to find associated MediaPlayerExtension"
);
}
}
}
...
...
@@ -51,16 +57,7 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension
{
if
(
_owner
is
not
null
)
{
var
stretch
=
_owner
.
Stretch
switch
{
Stretch
.
Uniform
=>
VideoStretch
.
Uniform
,
Stretch
.
Fill
=>
VideoStretch
.
Fill
,
Stretch
.
None
=>
VideoStretch
.
None
,
Stretch
.
UniformToFill
=>
VideoStretch
.
UniformToFill
,
_
=>
throw
new
NotSupportedException
(
$"Stretch mode
{
_owner
.
Stretch
}
is not supported"
)
};
_htmlPlayer
.
UpdateVideoStretch
(
stretch
);
_htmlPlayer
.
UpdateVideoStretch
(
_owner
.
Stretch
);
}
}
}
src/AddIns/Uno.UI.MediaPlayer.WebAssembly/VideoStretch.cs
已删除
100644 → 0
浏览文件 @
0a300319
#
nullable
enable
namespace
Uno.UI.Media
;
internal
enum
VideoStretch
{
Uniform
,
Fill
,
None
,
UniformToFill
}
src/SamplesApp/SamplesApp.Shared/App.xaml.cs
浏览文件 @
00184cb6
...
...
@@ -443,7 +443,7 @@ namespace SamplesApp
// Runtime Tests control logging
builder
.
AddFilter
(
"Uno.UI.Samples.Tests"
,
LogLevel
.
Information
);
builder
.
AddFilter
(
"Uno.UI.Media"
,
LogLevel
.
Debug
);
builder
.
AddFilter
(
"Uno.UI.Media"
,
LogLevel
.
Information
);
builder
.
AddFilter
(
"Uno"
,
LogLevel
.
Warning
);
builder
.
AddFilter
(
"Windows"
,
LogLevel
.
Warning
);
...
...
src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/MediaPlayerElement/MediaPlayerElement_Mov_Extension.xaml
浏览文件 @
00184cb6
...
...
@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="">
<MediaPlayerElement Source="http://
localhost:5000/mov
.mov"
<MediaPlayerElement Source="http://
file-examples.com/wp-content/uploads/2018/04/file_example_MOV_1280_1_4MB
.mov"
AreTransportControlsEnabled="True"
AutoPlay="True" />
...
...
src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs
浏览文件 @
00184cb6
...
...
@@ -4,6 +4,7 @@ using Windows.Media.Playback;
using
Windows.UI.Core
;
using
Windows.UI.ViewManagement
;
using
Windows.UI.Xaml.Media
;
using
Uno.Foundation.Logging
;
namespace
Windows.UI.Xaml.Controls
{
...
...
@@ -44,8 +45,10 @@ namespace Windows.UI.Xaml.Controls
{
if
(
sender
is
MediaPlayerElement
mpe
)
{
Console
.
WriteLine
(
$"MediaPlayerElement.SourceChanged(
{
args
.
NewValue
}
)"
);
if
(
mpe
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
mpe
.
Log
().
LogDebug
(
$"MediaPlayerElement.SourceChanged(
{
args
.
NewValue
}
)"
);
}
var
source
=
args
.
NewValue
as
IMediaPlaybackSource
;
if
(
mpe
.
MediaPlayer
!=
null
)
...
...
src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.Others.cs
浏览文件 @
00184cb6
...
...
@@ -17,8 +17,10 @@ namespace Windows.UI.Xaml.Controls
partial
void
InitializePartial
()
{
Console
.
WriteLine
(
$"MediaPlayerPresenter"
);
if
(
this
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
this
.
Log
().
LogDebug
(
$"Enter MediaPlayerPresenter InitializePartial"
);
}
if
(!
ApiExtensibility
.
CreateInstance
<
IMediaPlayerPresenterExtension
>(
this
,
out
_extension
))
{
if
(
this
.
Log
().
IsEnabled
(
LogLevel
.
Error
))
...
...
src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.cs
浏览文件 @
00184cb6
...
...
@@ -3,6 +3,7 @@ using Windows.Foundation;
using
Windows.Media.Playback
;
using
Windows.UI.Core
;
using
Windows.UI.Xaml.Media
;
using
Uno.Foundation.Logging
;
namespace
Windows.UI.Xaml.Controls
{
...
...
@@ -27,10 +28,12 @@ namespace Windows.UI.Xaml.Controls
private
static
void
OnMediaPlayerChanged
(
DependencyObject
sender
,
DependencyPropertyChangedEventArgs
args
)
{
Console
.
WriteLine
(
$"MediaPlayerPresenter.OnMediaPlayerChanged(
{
args
.
NewValue
}
)"
);
if
(
sender
is
MediaPlayerPresenter
presenter
)
{
if
(
presenter
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
presenter
.
Log
().
LogDebug
(
$"MediaPlayerPresenter.OnMediaPlayerChanged(
{
args
.
NewValue
}
)"
);
}
if
(
args
.
OldValue
is
Windows
.
Media
.
Playback
.
MediaPlayer
oldPlayer
)
{
oldPlayer
.
VideoRatioChanged
-=
presenter
.
OnVideoRatioChanged
;
...
...
src/Uno.UWP/Media/Playback/MediaPlayer.others.cs
浏览文件 @
00184cb6
...
...
@@ -18,8 +18,10 @@ namespace Windows.Media.Playback
public
void
Initialize
()
{
Console
.
WriteLine
(
$"MediaPlayer()"
);
if
(
this
.
Log
().
IsEnabled
(
LogLevel
.
Debug
))
{
this
.
Log
().
LogDebug
(
"Enter Initialize MediaPlayer()."
);
}
if
(!
ApiExtensibility
.
CreateInstance
<
IMediaPlayerExtension
>(
this
,
out
_extension
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录