diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/SeriesAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/SeriesAdapter.java index 344e630b..79d68cbb 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/SeriesAdapter.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/SeriesAdapter.java @@ -1,6 +1,8 @@ package com.github.tvbox.osc.ui.adapter; +import android.app.Activity; import android.graphics.Color; +import android.view.View; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; @@ -37,19 +39,20 @@ public class SeriesAdapter extends BaseQuickAdapter= lastRowStart) { - helper.itemView.setNextFocusDownId(R.id.tvPlay); + View mSeriesGroupTv = ((Activity) helper.itemView.getContext()).findViewById(R.id.mSeriesGroupTv); + if (getData().size()>1 && mSeriesGroupTv != null && mSeriesGroupTv.getVisibility() == View.VISIBLE) { + int spanCount = mGridLayoutManager.getSpanCount(); + int position = helper.getLayoutPosition(); + if (position < spanCount) { + helper.itemView.setNextFocusUpId(R.id.mSeriesSortTv); + } + int totalCount = getData().size(); + int remainder = totalCount % spanCount; + int lastRowStart = remainder == 0 ? totalCount - spanCount : totalCount - remainder; + + if (position >= lastRowStart) { + helper.itemView.setNextFocusDownId(R.id.tvPlay); + } } } } \ No newline at end of file