diff --git a/app/build.gradle b/app/build.gradle index eea7b500a..a70bf71f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,12 @@ android { leanback { dimension "mode" versionCode 200 - versionName "20230629#1" + versionName "20230629#2" } mobile { dimension "mode" versionCode 200 - versionName "20230629#1" + versionName "20230629#2" } java { dimension "api" diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Config.java b/app/src/main/java/com/fongmi/android/tv/bean/Config.java index a5ac0e2df..cacdfd3cd 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Config.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Config.java @@ -37,8 +37,7 @@ public class Config { private String parse; public static List arrayFrom(String str) { - Type listType = new TypeToken>() { - }.getType(); + Type listType = new TypeToken>() {}.getType(); List items = new Gson().fromJson(str, listType); return items == null ? Collections.emptyList() : items; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/service/PlaybackService.java b/app/src/mobile/java/com/fongmi/android/tv/service/PlaybackService.java index ccb02cdb0..c19f55473 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/service/PlaybackService.java +++ b/app/src/mobile/java/com/fongmi/android/tv/service/PlaybackService.java @@ -23,10 +23,10 @@ public class PlaybackService extends Service { } @Override - public void onCreate() { - super.onCreate(); + public int onStartCommand(Intent intent, int flags, int startId) { NotificationCompat.Builder builder = new NotificationCompat.Builder(this, Notify.DEFAULT).setVisibility(NotificationCompat.VISIBILITY_PUBLIC).setSmallIcon(R.drawable.ic_logo); startForeground(9527, builder.build()); + return START_STICKY; } @Nullable diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 67e4955a3..faf6a4515 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -1341,6 +1341,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust mPlayers.release(); Clock.get().release(); RefreshEvent.history(); + PlaybackService.stop(); App.removeCallbacks(mR1, mR2, mR3); mViewModel.result.removeObserver(mObserveDetail); mViewModel.player.removeObserver(mObservePlayer); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 1134b1dae..eb4934672 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -918,6 +918,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List Force.get().stop(); ZLive.get().stop(); TVBus.get().stop(); + PlaybackService.stop(); App.removeCallbacks(mR1, mR2, mR3); } }