diff --git a/pages/component/video/video.test.js b/pages/component/video/video.test.js
index e598fec3b4d7244f5fc7d6a6091243569d2e752f..983c41ed5028f409a472da29e72ba64f8c25702c 100644
--- a/pages/component/video/video.test.js
+++ b/pages/component/video/video.test.js
@@ -105,10 +105,7 @@ describe('component-native-video', () => {
if (process.env.uniTestPlatformInfo.toLowerCase().startsWith('ios')) {
return
}
- await page.setData({
- pos: 10
- });
- await page.callMethod('seek');
+ await page.callMethod('seek', 10);
start = Date.now();
await page.waitFor(async () => {
return (await page.data('eventWaiting')) && (await page.data('eventProgress')) || (Date.now() - start > 1000);
@@ -169,10 +166,7 @@ describe('component-native-video', () => {
if (process.env.uniTestPlatformInfo.toLowerCase().startsWith('ios')) {
return
}
- await page.setData({
- pos: 120
- });
- await page.callMethod('seek');
+ await page.callMethod('seek', 120);
start = Date.now();
await page.waitFor(async () => {
return (await page.data('eventEnded')) || (Date.now() - start > 5000);
@@ -220,6 +214,16 @@ describe('component-native-video', () => {
});
});
+ it('test sub component', async () => {
+ if (process.env.uniTestPlatformInfo.toLowerCase().startsWith('ios')) return
+ await page.setData({
+ subCompEnable: true,
+ subCompShow: true
+ });
+ await page.waitFor(100);
+ expect(await page.callMethod('hasSubComponent')).toBe(true);
+ });
+
it('test format', async () => {
page = await program.navigateTo('/pages/component/video/video-format');
await page.waitFor(1000);
diff --git a/pages/component/video/video.uvue b/pages/component/video/video.uvue
index feedda44e78404e6650e76e1d4f9c21b825a136c..47fb5e31e36a8a9d2181c68cb0bb38c595250c8f 100644
--- a/pages/component/video/video.uvue
+++ b/pages/component/video/video.uvue
@@ -11,7 +11,8 @@
@ended="onEnded" @timeupdate="onTimeUpdate" @waiting="onWaiting" @error="onError" @progress="onProgress"
@fullscreenclick="onFullScreenClick" @controlstoggle="onControlsToggle" @fullscreenchange="onFullScreenChange">
-
+
+
@@ -21,9 +22,9 @@
-
- 中间播放按钮是否替换为子组件
-
+
+ 子组件实现快进、快退功能(全屏后显示)
+
@@ -37,7 +38,7 @@
-
+
@@ -96,6 +97,9 @@
@@ -519,12 +542,21 @@
margin: 10px;
}
- .custom-play-btn {
- width: 60px;
- height: 60px;
+ .img-fast-backward {
+ width: 40px;
+ height: 40px;
top: 50%;
- left: 50%;
+ left: 12%;
transform: translate(-50%, -50%);
position: absolute;
}
+
+ .img-fast-forward {
+ width: 40px;
+ height: 40px;
+ top: 50%;
+ right: 12%;
+ transform: translate(50%, -50%);
+ position: absolute;
+ }
diff --git a/static/test-video/fast-backward.png b/static/test-video/fast-backward.png
new file mode 100644
index 0000000000000000000000000000000000000000..79a650b4174548956b8d72356cd8adfbac2ea82a
Binary files /dev/null and b/static/test-video/fast-backward.png differ
diff --git a/static/test-video/fast-forward.png b/static/test-video/fast-forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..91e389be97f6f052e7194f0e79f65490c6c58220
Binary files /dev/null and b/static/test-video/fast-forward.png differ