From e480651b0773bab28963ff0cf15fc22823e08dea Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 1 Mar 2023 18:06:29 +0800 Subject: [PATCH] [mobile] add seek edge check --- .../main/java/com/fongmi/android/tv/App.java | 11 +++++++++ .../tv/ui/activity/DetailActivity.java | 4 +++- .../tv/ui/custom/CustomKeyDownVod.java | 4 +++- .../mobile/res/layout/view_control_vod.xml | 24 +++++-------------- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java index caae01f42..5a218caff 100644 --- a/app/src/main/java/com/fongmi/android/tv/App.java +++ b/app/src/main/java/com/fongmi/android/tv/App.java @@ -103,4 +103,15 @@ public class App extends Application { } }); } + + @Override + public String getPackageName() { + for (StackTraceElement element : Thread.currentThread().getStackTrace()) { + if (element.getClassName().equals("org.chromium.base.BuildInfo")) { + if (element.getMethodName().equals("getAll")) return "com.android.chrome"; + break; + } + } + return super.getPackageName(); + } } \ No newline at end of file diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index ce6784069..49480d6a3 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -577,6 +577,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void enterFullscreen() { mBinding.video.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT)); + mBinding.control.getRoot().setPadding(ResUtil.dp2px(24), ResUtil.dp2px(16), ResUtil.dp2px(24), 0); getIjk().getSubtitleView().setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); mBinding.control.full.setImageResource(R.drawable.ic_control_full_off); @@ -587,10 +588,11 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void exitFullscreen() { + mBinding.control.getRoot().setPadding(ResUtil.dp2px(16), ResUtil.dp2px(16), ResUtil.dp2px(16), 0); getIjk().getSubtitleView().setTextSize(TypedValue.COMPLEX_UNIT_SP, 14); + mBinding.control.full.setImageResource(R.drawable.ic_control_full_on); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT); mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition()); - mBinding.control.full.setImageResource(R.drawable.ic_control_full_on); mBinding.video.setLayoutParams(mFrameParams); App.post(mR3, 2000); setFullscreen(false); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java index 216d68e64..0da7e3450 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java @@ -32,7 +32,9 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { @Override public boolean onDown(@NonNull MotionEvent e) { - touch = true; + int width = ResUtil.getScreenWidthPx(); + int edgeX = (int) Math.abs(e.getX() - width); + touch = e.getX() > 300 && edgeX > 300; seek = false; return true; } diff --git a/app/src/mobile/res/layout/view_control_vod.xml b/app/src/mobile/res/layout/view_control_vod.xml index 999afcdc9..6c86e8ebc 100644 --- a/app/src/mobile/res/layout/view_control_vod.xml +++ b/app/src/mobile/res/layout/view_control_vod.xml @@ -3,15 +3,15 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black_20"> + android:background="@color/black_20" + android:paddingStart="16dp" + android:paddingTop="16dp" + android:paddingEnd="16dp"> @@ -82,7 +81,6 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_marginEnd="24dp" android:gravity="center" android:orientation="vertical"> @@ -116,18 +114,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" - android:clipChildren="false" - android:clipToPadding="false" - android:paddingStart="16dp" - android:paddingEnd="16dp" tools:itemCount="1" tools:listitem="@layout/adapter_parse" /> @@ -151,6 +143,7 @@ android:id="@+id/action" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="4dp" android:fillViewport="true" android:scrollbars="none"> @@ -158,13 +151,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginTop="4dp" - android:clipChildren="false" - android:clipToPadding="false" android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingStart="16dp" - android:paddingEnd="16dp"> + android:orientation="horizontal">