From f998d01d0f47fd88c7e2a792a5bce13b14fb294b Mon Sep 17 00:00:00 2001
From: okjack <okjackcaptain@gmail.com>
Date: Fri, 7 Jun 2024 14:44:10 +0800
Subject: [PATCH] merge dev

---
 app/src/leanback/res/layout/activity_cast.xml        | 3 +--
 app/src/leanback/res/layout/activity_live.xml        | 3 +--
 app/src/leanback/res/layout/activity_video.xml       | 3 +--
 app/src/mobile/res/layout-sw600dp/activity_video.xml | 3 +--
 app/src/mobile/res/layout/activity_live.xml          | 3 +--
 app/src/mobile/res/layout/activity_video.xml         | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/leanback/res/layout/activity_cast.xml b/app/src/leanback/res/layout/activity_cast.xml
index 14c219bc7..0e12e5350 100644
--- a/app/src/leanback/res/layout/activity_cast.xml
+++ b/app/src/leanback/res/layout/activity_cast.xml
@@ -11,8 +11,7 @@
         android:id="@+id/exo"
         style="@style/Player.Vod"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:surface_type="none" />
+        android:layout_height="match_parent" />
 
     <tv.danmaku.ijk.media.player.ui.IjkVideoView
         android:id="@+id/ijk"
diff --git a/app/src/leanback/res/layout/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index 67d5ceee8..edbca4d78 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -18,8 +18,7 @@
             android:id="@+id/exo"
             style="@style/Player.Live"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:surface_type="none" />
+            android:layout_height="match_parent" />
 
         <tv.danmaku.ijk.media.player.ui.IjkVideoView
             android:id="@+id/ijk"
diff --git a/app/src/leanback/res/layout/activity_video.xml b/app/src/leanback/res/layout/activity_video.xml
index 14765cc04..546c086cf 100644
--- a/app/src/leanback/res/layout/activity_video.xml
+++ b/app/src/leanback/res/layout/activity_video.xml
@@ -27,8 +27,7 @@
             android:id="@+id/exo"
             style="@style/Player.Vod"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:surface_type="none" />
+            android:layout_height="match_parent" />
 
         <tv.danmaku.ijk.media.player.ui.IjkVideoView
             android:id="@+id/ijk"
diff --git a/app/src/mobile/res/layout-sw600dp/activity_video.xml b/app/src/mobile/res/layout-sw600dp/activity_video.xml
index 96b0a5333..10cb5dc91 100644
--- a/app/src/mobile/res/layout-sw600dp/activity_video.xml
+++ b/app/src/mobile/res/layout-sw600dp/activity_video.xml
@@ -25,8 +25,7 @@
                 android:id="@+id/exo"
                 style="@style/Player.Vod"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:surface_type="none" />
+                android:layout_height="match_parent" />
 
             <tv.danmaku.ijk.media.player.ui.IjkVideoView
                 android:id="@+id/ijk"
diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml
index ae8a23426..a22d87d23 100644
--- a/app/src/mobile/res/layout/activity_live.xml
+++ b/app/src/mobile/res/layout/activity_live.xml
@@ -18,8 +18,7 @@
             android:id="@+id/exo"
             style="@style/Player.Live"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:surface_type="none" />
+            android:layout_height="match_parent" />
 
         <tv.danmaku.ijk.media.player.ui.IjkVideoView
             android:id="@+id/ijk"
diff --git a/app/src/mobile/res/layout/activity_video.xml b/app/src/mobile/res/layout/activity_video.xml
index b439ed892..c5c9f0b0a 100644
--- a/app/src/mobile/res/layout/activity_video.xml
+++ b/app/src/mobile/res/layout/activity_video.xml
@@ -18,8 +18,7 @@
             android:id="@+id/exo"
             style="@style/Player.Vod"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:surface_type="none" />
+            android:layout_height="match_parent" />
 
         <tv.danmaku.ijk.media.player.ui.IjkVideoView
             android:id="@+id/ijk"