diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index f4a5eed73..0e82e3b4a 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -56,7 +56,6 @@ import com.fongmi.android.tv.event.ActionEvent; import com.fongmi.android.tv.event.ErrorEvent; import com.fongmi.android.tv.event.PlayerEvent; import com.fongmi.android.tv.event.RefreshEvent; -import com.fongmi.android.tv.event.ServerEvent; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.impl.SubtitleCallback; import com.fongmi.android.tv.model.SiteViewModel; @@ -87,7 +86,6 @@ import com.fongmi.android.tv.utils.Traffic; import com.fongmi.android.tv.utils.Util; import com.github.bassaer.library.MDColor; import com.github.catvod.net.OkHttp; -import com.github.catvod.utils.Path; import com.github.catvod.utils.Trans; import com.permissionx.guolindev.PermissionX; @@ -489,11 +487,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void checkDanmu(String danmu) { mBinding.danmaku.release(); mBinding.danmaku.setVisibility(danmu.isEmpty() ? View.GONE : View.VISIBLE); - App.execute(() -> { - String temp = danmu; - if (temp.startsWith("http")) temp = OkHttp.string(temp); - if (temp.length() > 0) mBinding.danmaku.prepare(new Parser(temp), mDanmakuContext); - }); + if (danmu.length() > 0) App.execute(() -> mBinding.danmaku.prepare(new Parser(danmu), mDanmakuContext)); } private void setEmpty(boolean finish) { @@ -1129,16 +1123,12 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onServerEvent(ServerEvent event) { - if (event.getType() != ServerEvent.Type.API) return; - if (mPlayers.isExo()) mPlayers.setSub(Sub.from(Path.local(event.getText()))); - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onRefreshEvent(RefreshEvent event) { if (event.getType() == RefreshEvent.Type.DETAIL) getDetail(); - if (event.getType() == RefreshEvent.Type.PLAYER) onRefresh(); + else if (event.getType() == RefreshEvent.Type.PLAYER) onRefresh(); + else if (event.getType() == RefreshEvent.Type.DANMAKU) checkDanmu(event.getPath()); + else if (event.getType() == RefreshEvent.Type.SUBTITLE) mPlayers.setSub(Sub.from(event.getPath())); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java index f5cb81c11..58a7f774f 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java @@ -151,7 +151,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener { @Subscribe(threadMode = ThreadMode.MAIN) public void onServerEvent(ServerEvent event) { - if (event.getType() != ServerEvent.Type.API) return; + if (event.getType() != ServerEvent.Type.SETTING) return; binding.text.setText(event.getText()); binding.text.setSelection(binding.text.getText().length()); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java index fae59d7c2..18cec2bd3 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java @@ -111,7 +111,7 @@ public class ProxyDialog implements DialogInterface.OnDismissListener { @Subscribe(threadMode = ThreadMode.MAIN) public void onServerEvent(ServerEvent event) { - if (event.getType() != ServerEvent.Type.API) return; + if (event.getType() != ServerEvent.Type.SETTING) return; binding.text.setText(event.getText()); binding.positive.performClick(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java index d488c522e..ccc8f37f7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java @@ -109,7 +109,7 @@ public class UaDialog implements DialogInterface.OnDismissListener { @Subscribe(threadMode = ThreadMode.MAIN) public void onServerEvent(ServerEvent event) { - if (event.getType() != ServerEvent.Type.API) return; + if (event.getType() != ServerEvent.Type.SETTING) return; binding.text.setText(event.getText()); binding.positive.performClick(); } diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index 5f56a8329..13eed00b3 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -46,7 +46,7 @@
- +
@@ -58,15 +58,15 @@