Merge pull request #267 from okcaptain/dev

update

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 28
-        versionCode 224
-        versionName "0203"
+        versionCode 225
+        versionName "2.2.5"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

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

@@ -20,6 +20,7 @@ import com.android.cast.dlna.dmr.DLNARendererService;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Product;
 import com.fongmi.android.tv.R;
+import com.fongmi.android.tv.Setting;
 import com.fongmi.android.tv.Updater;
 import com.fongmi.android.tv.api.config.LiveConfig;
 import com.fongmi.android.tv.api.config.VodConfig;
@@ -320,7 +321,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
 
     @Override
     public void onItemClick(Vod item) {
-        VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic());
+        if (Setting.isAggregatedSearch()) CollectActivity.start(this, item.getVodName());
+        else VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic());
     }
 
     @Override

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

@@ -348,7 +348,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         mBinding.control.danmu.setOnClickListener(view -> onDanmu());
         mBinding.control.next.setOnClickListener(view -> checkNext());
         mBinding.control.prev.setOnClickListener(view -> checkPrev());
-        mBinding.control.episodes.setOnClickListener(view -> showEpisodes());
+        mBinding.control.episodes.setOnClickListener(view -> onEpisodes());
         mBinding.control.scale.setOnClickListener(view -> onScale());
         mBinding.control.speed.setOnClickListener(view -> onSpeed());
         mBinding.control.reset.setOnClickListener(view -> onReset());
@@ -843,8 +843,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         else mBinding.danmaku.hide();
     }
 
-    private void showEpisodes() {
+    private void onEpisodes() {
         EpisodeDialog.create().episodes(getFlag().getEpisodes()).show(this);
+        hideControl();
     }
 
     private void checkNext() {