Merge pull request #240 from okcaptain/dev

episode

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -371,7 +371,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         mBinding.array.addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() {
             @Override
             public void onChildViewHolderSelected(@NonNull RecyclerView parent, @Nullable RecyclerView.ViewHolder child, int position, int subposition) {
-                if (mEpisodeAdapter.size() > getGroupSize() && position > 1) getEpisodeView().setSelectedPosition((position - 2) * getGroupSize() + 1);
+                if (mEpisodeAdapter.size() > getGroupSize() && position > 1) {
+                    int pos = (position - 2) * getGroupSize() + 1;
+                    if (Setting.getEpisode() == 1) pos += 3 * mEpisodePresenter.getNumColumns();
+                    getEpisodeView().setSelectedPosition(pos);
+                }
             }
         });
     }

app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpisodePresenter.java

@@ -34,6 +34,10 @@ public class EpisodePresenter extends Presenter {
         this.nextFocusUp = nextFocus;
     }
 
+    public int getNumColumns() {
+        return numColumns;
+    }
+
     public void setNumColumns(int numColumns) {
         this.numColumns = numColumns;
     }