From 8ce84eac8698209ee9534563e50531ad8982ef2e Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 16 Aug 2022 21:42:53 +0800 Subject: [PATCH] Fix player bug --- .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java | 2 +- .../main/java/com/fongmi/android/tv/model/SiteViewModel.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 38ef27ff9..34a67cda0 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 @@ -380,7 +380,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { long duration = Players.get().getDuration(); long current = Players.get().getCurrentPosition(); if (mHistory.getOpening() >= current) Players.get().seekTo(mHistory.getOpening()); - if (duration > 0 && mHistory.getEnding() + current >= duration) { + if (mHistory.getEnding() > 0 && mHistory.getEnding() + current >= duration) { keep = false; onNext(); } diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java index 4ae3ffe1c..29c17ce91 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java @@ -186,6 +186,7 @@ public class SiteViewModel extends ViewModel { try { if (!Thread.interrupted()) result.postValue(service.submit(callable).get(15, TimeUnit.SECONDS)); } catch (Exception e) { + if (e instanceof InterruptedException) return; if (!Thread.interrupted()) result.postValue(new Result()); } });