From a7ce520b580e92f34c6d1562de927fa2b78b8514 Mon Sep 17 00:00:00 2001
From: okjackcaptain <378702538@qq.com>
Date: Sun, 13 Nov 2022 20:21:12 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=A2=84=E8=A7=88=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E4=B8=AD(by=20okjack)=20-=20=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E7=AA=97=E5=8F=A3=E5=8F=AF=E7=82=B9=E5=87=BB=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F(by=20okjack)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tvbox/osc/ui/activity/DetailActivity.java     | 15 +++------------
 .../main/res/drawable/preview_player_block.xml    | 14 ++++++++++++++
 app/src/main/res/layout/activity_detail.xml       | 14 ++++++++------
 3 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/drawable/preview_player_block.xml

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 02970c91..f7daa20e 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
@@ -208,6 +208,8 @@ public class DetailActivity extends BaseActivity {
         //禁用播放地址焦点
         tvPlayUrl.setFocusable(false);
 
+        llPlayerFragmentContainerBlock.setOnClickListener((view -> toggleFullPreview()));
+
         tvSort.setOnClickListener(new View.OnClickListener() {
             @SuppressLint("NotifyDataSetChanged")
             @Override
@@ -648,6 +650,7 @@ public class DetailActivity extends BaseActivity {
                             jumpToPlay();
                             llPlayerFragmentContainer.setVisibility(View.VISIBLE);
                             llPlayerFragmentContainerBlock.setVisibility(View.VISIBLE);
+                            llPlayerFragmentContainerBlock.requestFocus();
                         }
                         // startQuickSearch();
                     } else {
@@ -903,18 +906,6 @@ public class DetailActivity extends BaseActivity {
         return super.dispatchKeyEvent(event);
     }
 
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (showPreview && !fullWindows) {
-            Rect editTextRect = new Rect();
-            llPlayerFragmentContainerBlock.getHitRect(editTextRect);
-            if (editTextRect.contains((int) ev.getX(), (int) ev.getY())) {
-                return true;
-            }
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
     // preview
     VodInfo previewVodInfo = null;
     boolean showPreview = Hawk.get(HawkConfig.SHOW_PREVIEW, true);; // true 开启 false 关闭
diff --git a/app/src/main/res/drawable/preview_player_block.xml b/app/src/main/res/drawable/preview_player_block.xml
new file mode 100644
index 00000000..34ce8901
--- /dev/null
+++ b/app/src/main/res/drawable/preview_player_block.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape>
+            <solid android:color="@android:color/transparent" />
+            <stroke android:width="2mm" android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:state_focused="false">
+        <shape>
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index 9c5cd5c1..9b5e1659 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -290,21 +290,23 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/previewPlayer"
-        android:layout_width="@dimen/vs_470"
-        android:layout_height="@dimen/vs_300"
+        android:layout_width="@dimen/vs_480"
+        android:layout_height="@dimen/vs_320"
         android:layout_marginStart="@dimen/vs_50"
         android:layout_marginLeft="@dimen/vs_50"
-        android:layout_marginTop="@dimen/vs_20"
+        android:layout_marginTop="@dimen/vs_10"
         android:layout_marginBottom="@dimen/vs_10"
         android:visibility="gone" />
 
     <View
         android:id="@+id/previewPlayerBlock"
-        android:layout_width="@dimen/vs_470"
-        android:layout_height="@dimen/vs_300"
+        android:layout_width="@dimen/vs_480"
+        android:layout_height="@dimen/vs_320"
+        android:focusable="true"
+        android:background="@drawable/preview_player_block"
         android:layout_marginStart="@dimen/vs_50"
         android:layout_marginLeft="@dimen/vs_50"
-        android:layout_marginTop="@dimen/vs_20"
+        android:layout_marginTop="@dimen/vs_10"
         android:layout_marginBottom="@dimen/vs_10"
         android:visibility="gone" />
 </FrameLayout>