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 @@ + + + + + + + + + + + + + + \ 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 @@