From 30c1c5ef27c385b93c6a476f72c6cf2e24420deb Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 5 Sep 2023 12:30:19 +0800 Subject: [PATCH] [mobile] fix bug --- .../main/java/com/fongmi/android/tv/utils/ResUtil.java | 8 ++------ app/src/mobile/java/com/fongmi/android/tv/Product.java | 10 +++++----- .../fongmi/android/tv/ui/activity/CollectActivity.java | 2 +- .../fongmi/android/tv/ui/activity/HistoryActivity.java | 2 +- .../fongmi/android/tv/ui/activity/KeepActivity.java | 2 +- .../fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../fongmi/android/tv/ui/activity/VideoActivity.java | 8 ++++---- .../android/tv/ui/custom/dialog/EpisodeGridDialog.java | 2 +- .../fongmi/android/tv/ui/fragment/TypeFragment.java | 2 +- 9 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java index d90ca435a..6f767efd2 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java @@ -85,12 +85,8 @@ public class ResUtil { return e.getRawX() < edge || e.getRawX() > getScreenWidthNav() - edge || e.getRawY() < edge || e.getRawY() > getScreenHeightNav() - edge; } - public static int getOrient() { - return App.get().getResources().getConfiguration().orientation; - } - - public static boolean isLand() { - return getOrient() == Configuration.ORIENTATION_LANDSCAPE; + public static boolean isLand(Context context) { + return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; } public static boolean isPad() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/Product.java b/app/src/mobile/java/com/fongmi/android/tv/Product.java index 0ba965c1c..227fce5ff 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Product.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Product.java @@ -11,14 +11,14 @@ public class Product { return 1; } - public static int getColumn() { - int count = ResUtil.isLand() ? 7 : 5; + public static int getColumn(Context context) { + int count = ResUtil.isLand(context) ? 7 : 5; count = count + (ResUtil.isPad() ? 1 : 0); return Math.abs(Setting.getSize() - count); } - public static int getColumn(Style style) { - return style.isLand() ? getColumn() - 1 : getColumn(); + public static int getColumn(Context context, Style style) { + return style.isLand() ? getColumn(context) - 1 : getColumn(context); } public static int[] getSpec(Context context) { @@ -26,7 +26,7 @@ public class Product { } public static int[] getSpec(Context context, Style style) { - int column = getColumn(style); + int column = getColumn(context, style); int space = ResUtil.dp2px(32) + ResUtil.dp2px(16 * (column - 1)); if (style.isOval()) space += ResUtil.dp2px(column * 16); return getSpec(context, space, column, style); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java index e25cd89a6..4f8859119 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java @@ -140,7 +140,7 @@ public class CollectActivity extends BaseActivity implements CustomScroller.Call } private void setViewType(int viewType) { - int count = Product.getColumn() - 1; + int count = Product.getColumn(this) - 1; mSearchAdapter.setViewType(viewType, count); mSearchAdapter.setSize(Product.getSpec(this, ResUtil.dp2px((count + 2) * 16), count + 1)); ((GridLayoutManager) mBinding.recycler.getLayoutManager()).setSpanCount(mSearchAdapter.isGrid() ? count : 1); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java index f7842eeec..87eefcd1e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java @@ -50,7 +50,7 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl private void setRecyclerView() { mBinding.recycler.setHasFixedSize(true); mBinding.recycler.getItemAnimator().setChangeDuration(0); - mBinding.recycler.setLayoutManager(new GridLayoutManager(this, Product.getColumn())); + mBinding.recycler.setLayoutManager(new GridLayoutManager(this, Product.getColumn(this))); mBinding.recycler.setAdapter(mAdapter = new HistoryAdapter(this)); mAdapter.setSize(Product.getSpec(getActivity())); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java index 96575bc08..d9c899c47 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java @@ -54,7 +54,7 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis private void setRecyclerView() { mBinding.recycler.setHasFixedSize(true); mBinding.recycler.getItemAnimator().setChangeDuration(0); - mBinding.recycler.setLayoutManager(new GridLayoutManager(this, Product.getColumn())); + mBinding.recycler.setLayoutManager(new GridLayoutManager(this, Product.getColumn(this))); mBinding.recycler.setAdapter(mAdapter = new KeepAdapter(this)); mAdapter.setSize(Product.getSpec(getActivity())); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 2fd3c2bed..c3ce7b548 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -301,7 +301,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List private void onRotate() { setR1Callback(); setRotate(!isRotate()); - setRequestedOrientation(ResUtil.isLand() ? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); + setRequestedOrientation(ResUtil.isLand(this) ? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); } private void onTrack(View view) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index ade0f2917..128089b2f 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -371,7 +371,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setVideoView() { mPlayers.set(getExo(), getIjk()); - if (isPort() && ResUtil.isLand()) enterFullscreen(); + if (isPort() && ResUtil.isLand(this)) enterFullscreen(); getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle()); getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle()); setSubtitle(14); @@ -666,7 +666,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void onRotate() { setR1Callback(); setRotate(!isRotate()); - setRequestedOrientation(ResUtil.isLand() ? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); + setRequestedOrientation(ResUtil.isLand(this) ? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); } private void onSetting() { @@ -830,13 +830,13 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private int getLockOrient() { if (isLock()) { - return ResUtil.isLand() ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT; + return ResUtil.isLand(this) ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT; } else if (isRotate()) { return ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT; } else if (isPort() && Utils.isAutoRotate()) { return ActivityInfo.SCREEN_ORIENTATION_FULL_USER; } else { - return ResUtil.isLand() ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT; + return ResUtil.isLand(this) ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT; } } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeGridDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeGridDialog.java index 3824be683..72eb5d97c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeGridDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeGridDialog.java @@ -67,7 +67,7 @@ public class EpisodeGridDialog extends BaseDialog { private void setSpanCount() { int total = 0; - int row = ResUtil.isLand() ? 5 : 10; + int row = ResUtil.isLand(getActivity()) ? 5 : 10; for (Episode item : episodes) total += item.getName().length(); int offset = (int) Math.ceil((double) total / episodes.size()); if (offset >= 12) spanCount = 1; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java index 26d6b9ca1..324a123e3 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java @@ -125,7 +125,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac private void setStyle(Style style) { mBinding.recycler.setAdapter(mAdapter = new VodAdapter(this, style, Product.getSpec(getActivity(), style))); - mBinding.recycler.setLayoutManager(style.isList() ? new LinearLayoutManager(getActivity()) : new GridLayoutManager(getContext(), Product.getColumn(style))); + mBinding.recycler.setLayoutManager(style.isList() ? new LinearLayoutManager(getActivity()) : new GridLayoutManager(getContext(), Product.getColumn(getActivity(), style))); } private void setViewModel() {