diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index bdb787e1e..0674f0dd3 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -181,6 +181,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { if (mFullscreen) Notify.show(ResUtil.getString(R.string.play_ready, item.getName())); mSiteViewModel.playerContent(getKey(), getVodFlag().getFlag(), item.getUrl()); mBinding.progress.getRoot().setVisibility(View.VISIBLE); + mBinding.error.getRoot().setVisibility(View.GONE); updateHistory(item, replay); } @@ -389,6 +390,8 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { case 0: checkPosition(); break; + case Player.STATE_IDLE: + break; case Player.STATE_BUFFERING: mBinding.progress.getRoot().setVisibility(View.VISIBLE); break; @@ -399,8 +402,10 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { onNext(); break; default: + Players.get().stop(); mBinding.progress.getRoot().setVisibility(View.GONE); - Notify.show(event.getMsg()); + mBinding.error.getRoot().setVisibility(View.VISIBLE); + mBinding.error.text.setText(event.getMsg()); break; } } diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml index 2dc312160..1175af221 100644 --- a/app/src/leanback/res/layout/activity_detail.xml +++ b/app/src/leanback/res/layout/activity_detail.xml @@ -29,6 +29,14 @@ layout="@layout/view_progress" android:visibility="gone" /> + + - @@ -18,7 +19,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index ee92f8202..ef9bef554 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -108,7 +108,9 @@ public class Players implements Player.Listener { } public void setMediaSource(Result result) { - if (result.getParse().equals("1")) { + if (result.getUrl().isEmpty()) { + EventBus.getDefault().post(new PlayerEvent(ResUtil.getString(R.string.error_play_load))); + } else if (result.getParse().equals("1")) { loadWebView(result.getUrl()); } else { setMediaSource(getPlayHeader(result), result.getUrl()); @@ -152,7 +154,7 @@ public class Players implements Player.Listener { public void stop() { if (exoPlayer != null) { exoPlayer.stop(); - exoPlayer.seekTo(0); + exoPlayer.clearMediaItems(); exoPlayer.setPlaybackSpeed(1.0f); } if (webView != null) { @@ -192,7 +194,7 @@ public class Players implements Player.Listener { @Override public void onPlayerError(@NonNull PlaybackException error) { - EventBus.getDefault().post(new PlayerEvent(ResUtil.getString(R.string.error_play))); + EventBus.getDefault().post(new PlayerEvent(ResUtil.getString(R.string.error_play_format))); } @Override diff --git a/app/src/main/res/drawable-hdpi/ic_vod_error.png b/app/src/main/res/drawable-hdpi/ic_vod_error.png new file mode 100644 index 000000000..40715e1cb Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_vod_error.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_vod_error.png b/app/src/main/res/drawable-mdpi/ic_vod_error.png new file mode 100644 index 000000000..23f1ac1e2 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_vod_error.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_vod_error.png b/app/src/main/res/drawable-xhdpi/ic_vod_error.png new file mode 100644 index 000000000..f0d05bb92 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_vod_error.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_vod_error.png b/app/src/main/res/drawable-xxhdpi/ic_vod_error.png new file mode 100644 index 000000000..e73afcaa1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_vod_error.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_empty.png b/app/src/main/res/drawable-xxxhdpi/ic_empty.png deleted file mode 100644 index 9d0247a67..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_empty.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_error.png b/app/src/main/res/drawable-xxxhdpi/ic_img_error.png deleted file mode 100644 index 3cf8315d3..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_img_error.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png b/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png deleted file mode 100644 index 04af817a7..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_img_loading.png and /dev/null differ diff --git a/app/src/main/res/layout/view_error.xml b/app/src/main/res/layout/view_error.xml new file mode 100644 index 000000000..aa14c0e54 --- /dev/null +++ b/app/src/main/res/layout/view_error.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 70f140366..dd213d10c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -5,7 +5,7 @@ 再按一次返回键退出 - 正在载入配置 + 正在加载配置 点播 @@ -25,7 +25,7 @@ 远程 - 手机或电脑连接同一个局域网,扫描 QR Code 或浏览器输入网址\n%s + 手机或电脑连接同一个局域网,扫描 QR Code 或浏览器输入地址\n%s 站源:%s @@ -61,8 +61,9 @@ 配置解析失败 已经是最后一集了! 已经是第一集了! - 无法解析网址 - 不支援的影片格式 + 播放地址解析失败 + 播放信息加载失败 + 不支援的影片格式 找不到数据 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ff121a3ed..09b06109e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -61,8 +61,9 @@ 配置解析失敗 已經是最後一集了! 已經是第一集了! - 無法解析網址 - 不支援的影片格式 + 播放網址解析失敗 + 播放資料載入失敗 + 不支援的影片格式 找不到資料 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 423438eb4..975d00ba8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,7 +62,8 @@ It\'s the last episode! It\'s the first episode! Unable to parse url - Unsupported video format + Unable to load url + Unsupported video format Not found