Merge pull request #271 from okcaptain/dev

udpate

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

@@ -138,6 +138,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     private List<String> mBroken;
     private History mHistory;
     private Players mPlayers;
+    private EpisodeDialog mEpisodeDialog;
     private boolean background;
     private boolean fullscreen;
     private boolean initTrack;
@@ -843,9 +844,18 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         else mBinding.danmaku.hide();
     }
 
+    public void setEpisodeDialog(EpisodeDialog dialog) {
+        mEpisodeDialog = dialog;
+    }
+
     private void onEpisodes() {
-        EpisodeDialog.create().episodes(getFlag().getEpisodes()).show(this);
-        hideControl();
+        if (mEpisodeDialog != null) {
+            mEpisodeDialog.dismiss();
+            mEpisodeDialog = null;
+        } else {
+            EpisodeDialog.create().episodes(getFlag().getEpisodes()).show(this);
+            hideControl();
+        }
     }
 
     private void checkNext() {

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java

@@ -69,14 +69,10 @@ public class EpisodeDialog extends BaseDialog implements ArrayPresenter.OnClickL
     }
 
     public void show(FragmentActivity activity) {
-        for (Fragment f : activity.getSupportFragmentManager().getFragments()) {
-            if (f instanceof EpisodeDialog) {
-                ((EpisodeDialog) f).dismiss();
-                return;
-            }
-        }
+        for (Fragment f : activity.getSupportFragmentManager().getFragments()) if (f instanceof BottomSheetDialogFragment) return;
         show(activity.getSupportFragmentManager(), null);
         this.activity = (VideoActivity) activity;
+        this.activity.setEpisodeDialog(this);
     }
 
     @Override

app/src/main/res/values-zh-rTW/strings.xml

@@ -76,7 +76,7 @@
     <string name="setting_quality">圖片品質</string>
     <string name="setting_size">圖片尺寸</string>
     <string name="setting_aggregated_search">聚合搜索</string>
-    <string name="setting_fullscreen_menu_key">全屏菜單鍵</string>
+    <string name="setting_fullscreen_menu_key">全屏選單鍵</string>
     <string name="setting_doh">DoH</string>
     <string name="setting_proxy">Proxy</string>
     <string name="setting_cache">暫存</string>