From 13a95d57e5f7e616795a705a1e123dc195c6c7bf Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 7 Jul 2022 00:00:43 +0800 Subject: [PATCH] Fix loading bug --- .../main/java/com/fongmi/bear/ui/activity/HomeActivity.java | 3 ++- .../main/java/com/fongmi/bear/ui/activity/SettingActivity.java | 1 + app/src/main/java/com/fongmi/bear/utils/Notify.java | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java b/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java index ccb6edee0..ed4758f03 100644 --- a/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java @@ -90,7 +90,8 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi private void getVideo() { if (mAdapter.size() > 4) mAdapter.removeItems(4, mAdapter.size() - 4); - if (!ApiConfig.get().getHome().getKey().isEmpty()) mSiteViewModel.homeContent(); + if (ApiConfig.get().getHome().getKey().isEmpty()) return; + mSiteViewModel.homeContent(); mAdapter.add("progress"); } diff --git a/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java b/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java index abc2a3406..f848f4c5b 100644 --- a/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java +++ b/app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java @@ -75,6 +75,7 @@ public class SettingActivity extends BaseActivity { @Override public void error(String msg) { + Notify.dismiss(); Notify.show(msg); } }); diff --git a/app/src/main/java/com/fongmi/bear/utils/Notify.java b/app/src/main/java/com/fongmi/bear/utils/Notify.java index 537d12d49..13790ae93 100644 --- a/app/src/main/java/com/fongmi/bear/utils/Notify.java +++ b/app/src/main/java/com/fongmi/bear/utils/Notify.java @@ -70,6 +70,5 @@ public class Notify { if (TextUtils.isEmpty(message)) return; mToast = Toast.makeText(App.get(), message, Toast.LENGTH_LONG); mToast.show(); - dismiss(); } }