From 146944fe6adb34e3ca80f27e3bca5fe5dfde2e27 Mon Sep 17 00:00:00 2001
From: okjackcaptain <378702538@qq.com>
Date: Thu, 29 Sep 2022 19:10:48 +0800
Subject: [PATCH] =?UTF-8?q?-=20live=E6=92=AD=E6=94=BE=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B2=A1=E5=8F=8D=E5=BA=94bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/activity_live_play.xml    | 297 +++++++++---------
 1 file changed, 148 insertions(+), 149 deletions(-)

diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml
index e56005e8..d8d197d6 100644
--- a/app/src/main/res/layout/activity_live_play.xml
+++ b/app/src/main/res/layout/activity_live_play.xml
@@ -7,207 +7,206 @@
     <xyz.doikki.videoplayer.player.VideoView
         android:id="@+id/mVideoView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent" />
+
+	<LinearLayout
+		android:id="@+id/tvLeftChannnelListLayout"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_gravity="center_horizontal"
+		android:layout_margin="0dp"
+		android:baselineAligned="false"
+		android:orientation="horizontal"
+		android:padding="0dp">
 
 		<LinearLayout
-			android:id="@+id/tvLeftChannnelListLayout"
-			android:layout_width="match_parent"
+			android:id="@+id/ll_typeSelect"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:layout_gravity="center_horizontal"
-			android:layout_margin="0dp"
+			android:layout_margin="20dp"
+			android:background="@drawable/bg_channel_list"
 			android:baselineAligned="false"
-			android:orientation="horizontal"
 			android:padding="0dp">
 
 			<LinearLayout
-				android:id="@+id/ll_typeSelect"
 				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:layout_margin="20dp"
-				android:background="@drawable/bg_channel_list"
-				android:baselineAligned="false"
-				android:padding="0dp">
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:orientation="horizontal">
 
-				<LinearLayout
-					android:layout_width="wrap_content"
+				<com.owen.tvrecyclerview.widget.TvRecyclerView
+					android:id="@+id/mGroupGridView"
+					android:layout_width="@dimen/vs_240"
 					android:layout_height="wrap_content"
-					android:layout_gravity="center_vertical"
-					android:orientation="horizontal">
-
-					<com.owen.tvrecyclerview.widget.TvRecyclerView
-						android:id="@+id/mGroupGridView"
-						android:layout_width="@dimen/vs_240"
-						android:layout_height="wrap_content"
-						android:divider="@null"
-						android:fadeScrollbars="false"
-						android:listSelector="@drawable/item_bg_selector_left"
-						android:padding="10dp"
-						android:scrollbars="none" />
+					android:divider="@null"
+					android:fadeScrollbars="false"
+					android:listSelector="@drawable/item_bg_selector_left"
+					android:padding="10dp"
+					android:scrollbars="none" />
 
-				</LinearLayout>
+			</LinearLayout>
+
+
+			<LinearLayout
+				android:id="@+id/divLoadEpgleft"
+				style="@style/epg_window_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:focusable="true"
+				android:onClick="divLoadEpgLeft"
+				android:orientation="vertical"
+				android:visibility="gone">
+
+				<TextView
+					android:id="@+id/tv_arrow0"
+					android:layout_width="20dp"
+					android:layout_height="match_parent"
+					android:gravity="center"
+					android:onClick="divLoadEpgLeft"
+					android:paddingBottom="5dp"
+					android:shadowColor="#CC000000"
+					android:shadowDx="5.0"
+					android:shadowRadius="5.0"
+					android:text="更 多"
+					android:textColor="@color/color_FFFFFF"
+					android:textStyle="bold" />
+
+				<ImageView
+					android:id="@+id/iv_arrow2"
+					android:layout_width="20dp"
+					android:layout_height="20dp"
+					android:gravity="center|left"
+					android:onClick="divLoadEpgLeft"
+					android:paddingLeft="-5dp"
+					android:paddingTop="5dp"
+					android:src="@drawable/scrollviewleft" />
+
+				<TextView
+					android:id="@+id/tv_arrow3"
+					android:layout_width="20dp"
+					android:layout_height="match_parent"
+					android:gravity="center"
+					android:onClick="divLoadEpgLeft"
+					android:paddingTop="5dp"
+					android:shadowColor="#CC000000"
+					android:shadowDx="5.0"
+					android:shadowRadius="5.0"
+					android:text="节 目"
+					android:textColor="@color/color_FFFFFF"
+					android:textStyle="bold" />
+			</LinearLayout>
+
+			<LinearLayout
+				android:layout_width="1dp"
+				android:layout_height="match_parent"
+				android:layout_margin="1dp"
+				android:background="#FF333333" />
+
+			<com.owen.tvrecyclerview.widget.TvRecyclerView
+				android:id="@+id/mChannelGridView"
+				android:layout_width="@dimen/vs_280"
+				android:layout_height="match_parent"
+				android:divider="@null"
+				android:fadeScrollbars="false"
+				android:focusable="true"
+				android:listSelector="@drawable/item_bg_selector_right"
+				android:padding="5dp"
+				android:scrollbars="none" />
+
+			<LinearLayout
+				android:layout_width="1dp"
+				android:layout_height="match_parent"
+				android:layout_margin="2dp"
+				android:background="#FF333333" />
+
+
+			<FrameLayout
+				android:id="@+id/divEPG"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_gravity="center_horizontal"
+				android:orientation="horizontal">
+
+				<com.github.tvbox.osc.ui.tv.widget.ChannelListView
+					android:id="@+id/lv_epg"
+					android:layout_width="@dimen/vs_340"
+					android:layout_height="match_parent"
+					android:divider="@null"
+					android:fadeScrollbars="false"
+					android:listSelector="@drawable/item_bg_selector_right"
+					android:padding="3dp"
+					android:scrollbars="none"
+					android:visibility="gone" />
+
+				<TextView
+					android:id="@+id/txtNoEpg"
+					android:layout_width="@dimen/vs_360"
+					android:layout_height="match_parent"
+					android:layout_gravity="center"
+					android:layout_marginTop="50px"
+					android:gravity="center"
+					android:paddingLeft="5dp"
+					android:text="暂无节目信息…"
+					android:textColor="@color/color_FF0057"
+					android:visibility="gone" />
 
 
 				<LinearLayout
-					android:id="@+id/divLoadEpgleft"
+					android:id="@+id/divLoadEpg"
 					style="@style/epg_window_btn"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical"
-					android:focusable="true"
-					android:onClick="divLoadEpgLeft"
-					android:orientation="vertical"
-					android:visibility="gone">
+					android:onClick="divLoadEpgRight"
+					android:orientation="vertical">
 
 					<TextView
-						android:id="@+id/tv_arrow0"
+						android:id="@+id/tv_arrow"
 						android:layout_width="20dp"
 						android:layout_height="match_parent"
 						android:gravity="center"
-						android:onClick="divLoadEpgLeft"
+						android:onClick="divLoadEpgRight"
 						android:paddingBottom="5dp"
 						android:shadowColor="#CC000000"
 						android:shadowDx="5.0"
 						android:shadowRadius="5.0"
-						android:text="更 多"
+						android:text="节 目"
 						android:textColor="@color/color_FFFFFF"
 						android:textStyle="bold" />
 
 					<ImageView
-						android:id="@+id/iv_arrow2"
+						android:id="@+id/iv_arrow"
 						android:layout_width="20dp"
 						android:layout_height="20dp"
+						android:layout_gravity="center"
+						android:layout_marginLeft="1dp"
 						android:gravity="center|left"
-						android:onClick="divLoadEpgLeft"
-						android:paddingLeft="-5dp"
+						android:onClick="divLoadEpgRight"
 						android:paddingTop="5dp"
-						android:src="@drawable/scrollviewleft" />
+						android:src="@drawable/scrollview" />
 
 					<TextView
-						android:id="@+id/tv_arrow3"
+						android:id="@+id/tv_arrow2"
 						android:layout_width="20dp"
 						android:layout_height="match_parent"
 						android:gravity="center"
-						android:onClick="divLoadEpgLeft"
+						android:onClick="divLoadEpgRight"
 						android:paddingTop="5dp"
 						android:shadowColor="#CC000000"
 						android:shadowDx="5.0"
 						android:shadowRadius="5.0"
-						android:text="节 目"
+						android:text="信 息"
 						android:textColor="@color/color_FFFFFF"
 						android:textStyle="bold" />
 				</LinearLayout>
 
-				<LinearLayout
-					android:layout_width="1dp"
-					android:layout_height="match_parent"
-					android:layout_margin="1dp"
-					android:background="#FF333333" />
 
-				<com.owen.tvrecyclerview.widget.TvRecyclerView
-					android:id="@+id/mChannelGridView"
-					android:layout_width="@dimen/vs_280"
-					android:layout_height="match_parent"
-					android:divider="@null"
-					android:fadeScrollbars="false"
-					android:focusable="true"
-					android:listSelector="@drawable/item_bg_selector_right"
-					android:padding="5dp"
-					android:scrollbars="none" />
-
-				<LinearLayout
-					android:layout_width="1dp"
-					android:layout_height="match_parent"
-					android:layout_margin="2dp"
-					android:background="#FF333333" />
-
-
-				<FrameLayout
-					android:id="@+id/divEPG"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:layout_gravity="center_horizontal"
-					android:orientation="horizontal">
+			</FrameLayout>
 
-					<com.github.tvbox.osc.ui.tv.widget.ChannelListView
-						android:id="@+id/lv_epg"
-						android:layout_width="@dimen/vs_340"
-						android:layout_height="match_parent"
-						android:divider="@null"
-						android:fadeScrollbars="false"
-						android:listSelector="@drawable/item_bg_selector_right"
-						android:padding="3dp"
-						android:scrollbars="none"
-						android:visibility="gone" />
 
-					<TextView
-						android:id="@+id/txtNoEpg"
-						android:layout_width="@dimen/vs_360"
-						android:layout_height="match_parent"
-						android:layout_gravity="center"
-						android:layout_marginTop="50px"
-						android:gravity="center"
-						android:paddingLeft="5dp"
-						android:text="暂无节目信息…"
-						android:textColor="@color/color_FF0057"
-						android:visibility="gone" />
-
-
-					<LinearLayout
-						android:id="@+id/divLoadEpg"
-						style="@style/epg_window_btn"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_gravity="center_vertical"
-						android:onClick="divLoadEpgRight"
-						android:orientation="vertical">
-
-						<TextView
-							android:id="@+id/tv_arrow"
-							android:layout_width="20dp"
-							android:layout_height="match_parent"
-							android:gravity="center"
-							android:onClick="divLoadEpgRight"
-							android:paddingBottom="5dp"
-							android:shadowColor="#CC000000"
-							android:shadowDx="5.0"
-							android:shadowRadius="5.0"
-							android:text="节 目"
-							android:textColor="@color/color_FFFFFF"
-							android:textStyle="bold" />
-
-						<ImageView
-							android:id="@+id/iv_arrow"
-							android:layout_width="20dp"
-							android:layout_height="20dp"
-							android:layout_gravity="center"
-							android:layout_marginLeft="1dp"
-							android:gravity="center|left"
-							android:onClick="divLoadEpgRight"
-							android:paddingTop="5dp"
-							android:src="@drawable/scrollview" />
-
-						<TextView
-							android:id="@+id/tv_arrow2"
-							android:layout_width="20dp"
-							android:layout_height="match_parent"
-							android:gravity="center"
-							android:onClick="divLoadEpgRight"
-							android:paddingTop="5dp"
-							android:shadowColor="#CC000000"
-							android:shadowDx="5.0"
-							android:shadowRadius="5.0"
-							android:text="信 息"
-							android:textColor="@color/color_FFFFFF"
-							android:textStyle="bold" />
-					</LinearLayout>
-
-
-				</FrameLayout>
-
-
-			</LinearLayout>
 		</LinearLayout>
-	</xyz.doikki.videoplayer.player.VideoView>
+	</LinearLayout>
 <!--添加EPG显示，更改样式 by 龍-->