From 7c6ffae9fa52878b1dc1515837ff3f85f8a84283 Mon Sep 17 00:00:00 2001
From: 21561 <215613905@qq.com>
Date: Fri, 4 Apr 2025 00:18:59 +0800
Subject: [PATCH] fix bug

---
 .../tvbox/osc/ui/activity/DetailActivity.java |  2 +-
 .../tvbox/osc/ui/adapter/SeriesAdapter.java   | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

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 9e8c08a8..26931de2 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
@@ -175,7 +175,7 @@ public class DetailActivity extends BaseActivity {
         this.mGridViewLayoutMgr = new V7GridLayoutManager(this.mContext, 6);
         mGridView.setLayoutManager(this.mGridViewLayoutMgr);
 //        mGridView.setLayoutManager(new V7LinearLayoutManager(this.mContext, 0, false));
-        seriesAdapter = new SeriesAdapter();
+        seriesAdapter = new SeriesAdapter(this.mGridViewLayoutMgr);
         mGridView.setAdapter(seriesAdapter);
         mGridViewFlag = findViewById(R.id.mGridViewFlag);
         mGridViewFlag.setHasFixedSize(true);
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 aa50d18f..344e630b 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
@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.github.tvbox.osc.R;
 import com.github.tvbox.osc.bean.VodInfo;
+import com.owen.tvrecyclerview.widget.V7GridLayoutManager;
 
 import java.util.ArrayList;
 
@@ -16,8 +17,10 @@ import java.util.ArrayList;
  * @description:
  */
 public class SeriesAdapter extends BaseQuickAdapter<VodInfo.VodSeries, BaseViewHolder> {
-    public SeriesAdapter() {
+    private V7GridLayoutManager mGridLayoutManager;
+    public SeriesAdapter(V7GridLayoutManager gridLayoutManager) {
         super(R.layout.item_series, new ArrayList<>());
+        this.mGridLayoutManager = gridLayoutManager;
     }
 
     @Override
@@ -33,5 +36,20 @@ public class SeriesAdapter extends BaseQuickAdapter<VodInfo.VodSeries, BaseViewH
         if (getData().size() == 1 && helper.getLayoutPosition() == 0) {
             helper.itemView.setNextFocusUpId(R.id.mGridViewFlag);
         }
+
+        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