From 627757409c356e4e030bbd060877909bb175c10c Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 10 Nov 2022 00:10:39 +0800 Subject: [PATCH] Fix bug --- .../com/fongmi/android/tv/ui/activity/HomeActivity.java | 6 ++---- app/src/leanback/res/layout/view_controller_live.xml | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 66a64fe7a..0c3453fa9 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -71,7 +71,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen LiveConfig.get().init(); ApiConfig.get().init().load(getCallback()); Updater.create(this).start(); - Notify.progress(this); Server.get().start(); setRecyclerView(); setViewModel(); @@ -125,7 +124,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen return new Callback() { @Override public void success() { - Notify.dismiss(); getHistory(); getVideo(); } @@ -133,7 +131,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void error(int resId) { Notify.show(resId); - Notify.dismiss(); } }; } @@ -324,7 +321,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen Notify.show(R.string.app_exit); App.post(() -> mConfirmExit = false, 1000); } else { - super.onBackPressed(); + finish(); } } @@ -335,5 +332,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen LiveConfig.get().clear(); ApiConfig.get().clear(); Server.get().stop(); + System.exit(0); } } \ No newline at end of file diff --git a/app/src/leanback/res/layout/view_controller_live.xml b/app/src/leanback/res/layout/view_controller_live.xml index c7540c375..c787a8aeb 100644 --- a/app/src/leanback/res/layout/view_controller_live.xml +++ b/app/src/leanback/res/layout/view_controller_live.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" - android:textColor="@color/grey_700" + android:textColor="@color/grey_800" android:textSize="18sp" tools:text="005" /> @@ -39,7 +39,7 @@ android:marqueeRepeatLimit="marquee_forever" android:scrollHorizontally="true" android:singleLine="true" - android:textColor="@color/grey_700" + android:textColor="@color/grey_800" android:textSize="18sp" tools:text="民視" /> @@ -51,7 +51,7 @@ android:layout_marginEnd="12dp" android:layout_weight="1" android:singleLine="true" - android:textColor="@color/grey_700" + android:textColor="@color/grey_800" android:textSize="18sp" tools:text="正在播放:食神" />