Merge pull request CatVodTVOfficial#168 from haha459862/main

直播bug修复
anapupa · Jul 18, 2022 · e8c12d2 · e8c12d2
2 parents 6b71a63 + befb61a
commit e8c12d2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/LivePlayActivity.java
@@ -172,6 +172,23 @@ public boolean dispatchKeyEvent(KeyEvent event) {
         return super.dispatchKeyEvent(event);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mVideoView != null) {
+            mVideoView.resume();
+        }
+    }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (mVideoView != null) {
+            mVideoView.pause();
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -384,6 +401,7 @@ public void run() {
                     public void onAnimationEnd(Animator animation) {
                         super.onAnimationEnd(animation);
                         tvRightSettingLayout.setVisibility(View.INVISIBLE);
+                        liveSettingGroupAdapter.setSelectedGroupIndex(-1);
                     }
                 });
                 animator.start();

diff --git a/app/src/main/res/layout/player_live_control_view.xml b/app/src/main/res/layout/player_live_control_view.xml
@@ -13,8 +13,8 @@
         tools:visibility="visible">
 
         <LinearLayout
-            android:layout_width="@dimen/vs_280"
-            android:layout_height="@dimen/vs_200"
+            android:layout_width="@dimen/vs_200"
+            android:layout_height="@dimen/vs_140"
             android:layout_gravity="center"
             android:background="@drawable/shape_user_focus"
             android:focusable="false"
@@ -39,6 +39,7 @@
                 android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:tag="vod_control_pause_t"
+                android:visibility="gone"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/ts_30"
                 tools:text="100" />