From 25aa7c8a04572d92cd39136d47ad0806b54d1f31 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 14 Jan 2025 22:44:30 +0800
Subject: [PATCH] Clean code

---
 .../tv/ui/activity/CollectActivity.java        | 11 +++++++++++
 .../android/tv/ui/adapter/RecordAdapter.java   | 18 ++++--------------
 .../android/tv/ui/adapter/RecordAdapter.java   | 17 ++++-------------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
index f9317116e..d9f352c0f 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
@@ -22,6 +22,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Constant;
 import com.fongmi.android.tv.R;
+import com.fongmi.android.tv.Setting;
 import com.fongmi.android.tv.api.config.VodConfig;
 import com.fongmi.android.tv.bean.Collect;
 import com.fongmi.android.tv.bean.Site;
@@ -32,6 +33,7 @@ import com.fongmi.android.tv.ui.fragment.CollectFragment;
 import com.fongmi.android.tv.ui.presenter.CollectPresenter;
 import com.fongmi.android.tv.utils.PauseExecutor;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.google.gson.reflect.TypeToken;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -73,6 +75,7 @@ public class CollectActivity extends BaseActivity {
     protected void initView() {
         setRecyclerView();
         setViewModel();
+        saveKeyword();
         setPager();
         setSite();
         search();
@@ -137,6 +140,14 @@ public class CollectActivity extends BaseActivity {
         }
     }
 
+    private void saveKeyword() {
+        List<String> items = Setting.getKeyword().isEmpty() ? new ArrayList<>() : App.gson().fromJson(Setting.getKeyword(), new TypeToken<List<String>>() {}.getType());
+        items.remove(getKeyword());
+        items.add(0, getKeyword());
+        if (items.size() > 8) items.remove(8);
+        Setting.putKeyword(App.gson().toJson(items));
+    }
+
     private void stop() {
         if (mExecutor == null) return;
         mExecutor.shutdownNow();
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java
index 578039c52..0edf694d4 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java
@@ -39,25 +39,15 @@ public class RecordAdapter extends RecyclerView.Adapter<RecordAdapter.ViewHolder
     }
 
     private void checkToAdd(String item) {
-        int index = mItems.indexOf(item);
-        if (index == -1) {
-            mItems.add(0, item);
-            notifyItemInserted(0);
-        } else {
-            mItems.remove(index);
-            mItems.add(0, item);
-            notifyItemRangeChanged(0, mItems.size());
-        }
-        if (mItems.size() > 8) {
-            mItems.remove(8);
-            notifyItemRemoved(8);
-        }
+        mItems.remove(item);
+        mItems.add(0, item);
+        if (mItems.size() > 8) mItems.remove(8);
     }
 
     public void add(String item) {
         checkToAdd(item);
+        notifyDataSetChanged();
         mListener.onDataChanged(getItemCount());
-        Setting.putKeyword(App.gson().toJson(mItems));
     }
 
     @Override
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java
index 2ee084f0f..2594e9813 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java
@@ -39,23 +39,14 @@ public class RecordAdapter extends RecyclerView.Adapter<RecordAdapter.ViewHolder
     }
 
     private void checkToAdd(String item) {
-        int index = mItems.indexOf(item);
-        if (index == -1) {
-            mItems.add(0, item);
-            notifyItemInserted(0);
-        } else {
-            mItems.remove(index);
-            mItems.add(0, item);
-            notifyItemRangeChanged(0, mItems.size());
-        }
-        if (mItems.size() > 8) {
-            mItems.remove(8);
-            notifyItemRemoved(8);
-        }
+        mItems.remove(item);
+        mItems.add(0, item);
+        if (mItems.size() > 8) mItems.remove(8);
     }
 
     public void add(String item) {
         checkToAdd(item);
+        notifyDataSetChanged();
         mListener.onDataChanged(getItemCount());
         Setting.putKeyword(App.gson().toJson(mItems));
     }