From b69b9463e4ae9def20e1b341081e6aac564de640 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 1 Feb 2023 18:45:14 +0800
Subject: [PATCH] Fix bug

---
 .../com/fongmi/android/tv/ui/activity/HomeActivity.java  | 8 ++++----
 app/src/main/java/com/fongmi/android/tv/bean/Result.java | 9 +++++----
 .../java/com/fongmi/android/tv/model/SiteViewModel.java  | 8 --------
 3 files changed, 9 insertions(+), 16 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 f26afc956..bd16f3356 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
@@ -59,6 +59,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     private HistoryPresenter mHistoryPresenter;
     private SiteViewModel mViewModel;
     private boolean confirm;
+    private Result result;
 
     @Override
     protected ViewBinding getBinding() {
@@ -105,8 +106,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         mViewModel = new ViewModelProvider(this).get(SiteViewModel.class);
         mViewModel.result.observe(this, result -> {
             mAdapter.remove("progress");
-            addVideo(result);
-            result.clear();
+            addVideo(this.result = result);
         });
     }
 
@@ -142,8 +142,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     }
 
     private void getVideo() {
+        this.result = Result.empty();
         int index = getRecommendIndex();
-        mViewModel.getResult().setValue(Result.empty());
         String home = ApiConfig.get().getHome().getName();
         mBinding.title.setText(home.isEmpty() ? ResUtil.getString(R.string.app_name) : home);
         if (mAdapter.size() > index) mAdapter.removeItems(index, mAdapter.size() - index);
@@ -205,7 +205,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     public void onItemClick(Func item) {
         switch (item.getResId()) {
             case R.string.home_vod:
-                VodActivity.start(this, mViewModel.getResult().getValue());
+                VodActivity.start(this, result.clear());
                 break;
             case R.string.home_live:
                 LiveActivity.start(this);
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
index e480f3160..56cc06a25 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java
@@ -179,14 +179,15 @@ public class Result {
         return subs == null ? Collections.emptyList() : subs;
     }
 
-    public void clear() {
-        getList().clear();
-    }
-
     public Map<String, String> getHeaders() {
         return Json.toMap(getHeader());
     }
 
+    public Result clear() {
+        getList().clear();
+        return this;
+    }
+
     @NonNull
     @Override
     public String toString() {
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 39a013889..f18f479d5 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
@@ -40,14 +40,6 @@ public class SiteViewModel extends ViewModel {
         this.search = new MutableLiveData<>();
     }
 
-    public MutableLiveData<Result> getResult() {
-        return result;
-    }
-
-    public MutableLiveData<Result> getPlayer() {
-        return player;
-    }
-
     public void homeContent() {
         Site site = ApiConfig.get().getHome();
         execute(result, () -> {