From 2c558933d3c109a89bb248a1714b1ba59ec8bed6 Mon Sep 17 00:00:00 2001
From: 21561 <215613905@qq.com>
Date: Wed, 27 Jul 2022 08:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=8F=E6=98=8E=E6=A0=8F?=
 =?UTF-8?q?=20=E8=89=B2=E5=8F=B7=20=E4=BF=AE=E6=AD=A3TV=E7=AB=AF=E7=84=A6?=
 =?UTF-8?q?=E7=82=B9=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/tvbox/osc/player/controller/VodController.java  | 2 ++
 .../com/github/tvbox/osc/ui/activity/DetailActivity.java   | 7 +++++++
 app/src/main/res/layout/player_vod_control_view.xml        | 2 +-
 app/src/main/res/values/colors.xml                         | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
index b81f8775..2e85c9dd 100644
--- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
+++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
@@ -55,6 +55,7 @@ public class VodController extends BaseController {
                     }
                     case 1002: { // 显示底部菜单
                         mBottomRoot.setVisibility(VISIBLE);
+                        mBottomRoot.requestFocus();
                         break;
                     }
                     case 1003: { // 隐藏底部菜单
@@ -565,6 +566,7 @@ public class VodController extends BaseController {
             } else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) {
                 if (!isBottomVisible()) {
                     showBottom();
+                    return true;
                 }
             }
         } else if (action == KeyEvent.ACTION_UP) {
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
index 5bc456c8..b121420a 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
@@ -4,6 +4,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -115,6 +116,12 @@ public class DetailActivity extends BaseActivity {
     }
 
     private void initView() {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                tvPlay.requestFocus();
+            }
+        },500);
         llLayout = findViewById(R.id.llLayout);
         llPlayerPlace = findViewById(R.id.previewPlayerPlace);
         llPlayerFragmentContainer = findViewById(R.id.previewPlayer);
diff --git a/app/src/main/res/layout/player_vod_control_view.xml b/app/src/main/res/layout/player_vod_control_view.xml
index fa42cec8..ea0f76e7 100644
--- a/app/src/main/res/layout/player_vod_control_view.xml
+++ b/app/src/main/res/layout/player_vod_control_view.xml
@@ -185,7 +185,7 @@
                 android:background="@drawable/button_dialog_main"
                 android:focusable="true"
                 android:padding="@dimen/vs_10"
-                android:text="↺"
+                android:text="重置"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/ts_24" />
         </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0a4af74c..d0d0ce1d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,6 @@
     <color name="color_BBFFFFFF">#bbffffff</color>
     <color name="color_FFFFFF">#ffffffff</color>
     <color name="color_33FFFFFF">#33ffffff</color>
-    <color name="color_99FFFFFF">#99ffffff</color>
+    <color name="color_99FFFFFF">#1A000000</color>
     <color name="color_59353744">#59353744</color>
 </resources>
\ No newline at end of file