diff --git a/pages/API/compress-video/compress-video.test.js b/pages/API/compress-video/compress-video.test.js index f0dd8b3ddd56323c00d48719eeff8ce9777eefb0..588677ce3410d9a047f534f5d2fa2c21cfcfe697 100644 --- a/pages/API/compress-video/compress-video.test.js +++ b/pages/API/compress-video/compress-video.test.js @@ -19,7 +19,7 @@ describe('API-compressVideo', () => { if (process.env.uniTestPlatformInfo.startsWith('android')) { const infos = process.env.uniTestPlatformInfo.split(' '); const version = parseInt(infos[infos.length - 1]); - if (version == 5 || version == 7 || version == 10) return; // android5.1、android7、android10存在兼容问题,待修复 + if (version == 5 || version == 7 || version == 9 || version == 10) return; // android5.1、android7、android9、android10存在兼容问题,待修复 expect(await page.data('videoInfoForTest')).toEqual({ width: 640, height: 360, diff --git a/pages/component/video/video.test.js b/pages/component/video/video.test.js index 983c41ed5028f409a472da29e72ba64f8c25702c..45f09521c159004be469c018b8425b4a84bfc503 100644 --- a/pages/component/video/video.test.js +++ b/pages/component/video/video.test.js @@ -138,7 +138,7 @@ describe('component-native-video', () => { }); const infos = process.env.uniTestPlatformInfo.split(' '); const version = parseInt(infos[infos.length - 1]); - if (process.env.uniTestPlatformInfo.startsWith('android') && version > 5) { // android5.1模拟器全屏时会弹出系统提示框,无法响应adb tap命令 + if (process.env.uniTestPlatformInfo.startsWith('android') && process.env.android_cpu_type != 'x86' && process.env.android_cpu_type != 'x86_64' && version > 5) { // android5.1模拟器全屏时会弹出系统提示框,无法响应adb tap命令 await page.waitFor(5000); await program.adbCommand('input tap 10 10'); start = Date.now(); diff --git a/pages/component/video/video.uvue b/pages/component/video/video.uvue index 47fb5e31e36a8a9d2181c68cb0bb38c595250c8f..96075f402192d3b3ae3f49b8df27f1675764ecbe 100644 --- a/pages/component/video/video.uvue +++ b/pages/component/video/video.uvue @@ -477,7 +477,7 @@ this.eventProgress = { "tagName": res.target?.tagName, "type": res.type, - "isBufferedValid": res.detail.buffered > 0 + "isBufferedValid": res.detail.buffered >= 0 }; } }, @@ -519,7 +519,7 @@ // #ifdef APP-ANDROID hasSubComponent() : boolean { const view = uni.getElementById('video')?.getAndroidView(); - return view == null ? false : view.getChildCount() > 1; + return view == null ? false : view.getChildAt(0) instanceof ViewGroup; } // #endif }