Merge pull request #235 from okcaptain/dev

numColumns，build.gradle

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 222
-        versionName "0119"
+        versionName "2.2.3"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

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

@@ -630,7 +630,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         int width = ResUtil.getScreenWidth() - ResUtil.dp2px(48);
         ViewGroup.LayoutParams params = mBinding.episodeVert.getLayoutParams();
         params.width = ResUtil.getScreenWidth();
-        params.height = rowNum > 6 ? ResUtil.dp2px(300) : ResUtil.dp2px(rowNum * 50);
+        params.height = rowNum > 6 ? ResUtil.dp2px(300) : ResUtil.dp2px(rowNum * 44);
         mBinding.episodeVert.setNumColumns(numColumns);
         mBinding.episodeVert.setColumnWidth((width - ((numColumns - 1) * ResUtil.dp2px(8))) / numColumns);
         mBinding.episodeVert.setLayoutParams(params);

app/src/leanback/res/layout/activity_video.xml

@@ -296,6 +296,8 @@
                 android:paddingStart="24dp"
                 android:paddingEnd="24dp"
                 android:focusable="false"
+                app:focusOutEnd="true"
+                app:focusOutFront="true"
                 android:visibility="gone" />
 
             <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
@@ -319,6 +321,8 @@
                 android:paddingStart="24dp"
                 android:paddingEnd="24dp"
                 android:focusable="false"
+                app:focusOutEnd="true"
+                app:focusOutFront="true"
                 android:visibility="gone" />
 
             <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView