From f93d55789edf4dbf4c80ee3427850c9891933fc3 Mon Sep 17 00:00:00 2001
From: yinjiacheng <yinjiacheng@dcloud.io>
Date: Thu, 15 Aug 2024 17:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0video=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/API/compress-video/compress-video.test.js | 2 +-
 pages/component/video/video.test.js             | 2 +-
 pages/component/video/video.uvue                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/API/compress-video/compress-video.test.js b/pages/API/compress-video/compress-video.test.js
index f0dd8b3d..588677ce 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 983c41ed..45f09521 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 47fb5e31..96075f40 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<ViewGroup>();
-        return view == null ? false : view.getChildCount() > 1;
+        return view == null ? false : view.getChildAt(0) instanceof ViewGroup;
       }
       // #endif
     }
-- 
GitLab