From bebaad75d169461afcb1d132448041cffa28f5ae Mon Sep 17 00:00:00 2001
From: 21561 <215613905@qq.com>
Date: Sat, 15 Mar 2025 12:14:44 +0800
Subject: [PATCH] fix bug;

---
 .../com/github/tvbox/osc/ui/adapter/HistoryAdapter.java   | 8 +++++---
 .../github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java    | 2 +-
 .../com/github/tvbox/osc/ui/fragment/GridFragment.java    | 2 +-
 .../com/github/tvbox/osc/viewmodel/SourceViewModel.java   | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
index fcf150c3..8a89451c 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HistoryAdapter.java
@@ -15,6 +15,7 @@ import com.github.tvbox.osc.bean.VodInfo;
 import com.github.tvbox.osc.picasso.RoundTransformation;
 import com.github.tvbox.osc.util.DefaultConfig;
 import com.github.tvbox.osc.util.HawkConfig;
+import com.github.tvbox.osc.util.ImgUtil;
 import com.github.tvbox.osc.util.MD5;
 import com.squareup.picasso.Picasso;
 
@@ -53,7 +54,8 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
         if(bean!=null){
             tvYear.setText(bean.getName());
         }else {
-            tvYear.setVisibility(View.GONE);
+            tvYear.setText("搜");
+//            tvYear.setVisibility(View.GONE);
         }
         /*TextView tvLang = helper.getView(R.id.tvLang);
         if (TextUtils.isEmpty(item.lang)) {
@@ -97,10 +99,10 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
                             .roundRadius(AutoSizeUtils.mm2px(mContext, 10), RoundTransformation.RoundType.ALL))
                     .placeholder(R.drawable.img_loading_placeholder)
                     .noFade()
-                    .error(R.drawable.img_loading_placeholder)
+                    .error(ImgUtil.createTextDrawable(item.name))
                     .into(ivThumb);
         } else {
-            ivThumb.setImageResource(R.drawable.img_loading_placeholder);
+            ivThumb.setImageDrawable(ImgUtil.createTextDrawable(item.name));
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java
index f31d8911..6a439501 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java
@@ -46,7 +46,7 @@ public class HomeHotVodAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
             if(bean!=null){
                 tvRate.setText(bean.getName());
             }else {
-                tvRate.setVisibility(View.GONE);
+                tvRate.setText("搜");
             }
         }else if(Hawk.get(HawkConfig.HOME_REC, 0) == 0){
             tvRate.setText("豆瓣热播");
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
index 91565045..c0b164e3 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
@@ -307,7 +307,7 @@ public class GridFragment extends BaseLazyFragment {
     }
 
     private void toggleFilterColor() {
-        if (sortData.filters != null && !sortData.filters.isEmpty()) {
+        if (sortData!=null && sortData.filters != null && !sortData.filters.isEmpty()) {
             int count = sortData.filterSelectCount();
             EventBus.getDefault().post(new RefreshEvent(RefreshEvent.TYPE_FILTER_CHANGE, count));
         }
diff --git a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java
index e1bc1384..46f64e1d 100644
--- a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java
+++ b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java
@@ -95,7 +95,7 @@ public class SourceViewModel extends ViewModel {
             return;
         }
         SourceBean sourceBean = ApiConfig.get().getSource(sourceKey);
-        if(sourceBean.getName().contains("搜")){
+        if(sourceBean.getName().length()<=3 && sourceBean.getName().endsWith("搜")){
             sortResult.postValue(null);
             return;
         }
@@ -296,7 +296,9 @@ public class SourceViewModel extends ViewModel {
                 public void run() {
                     try {
                         Spider sp = ApiConfig.get().getCSP(homeSourceBean);
-                        json(listResult, sp.categoryContent(sortData.id, page + "", true, sortData.filterSelect), homeSourceBean.getKey());
+                        String json = sp.categoryContent(sortData.id, page + "", true, sortData.filterSelect);
+                        LOG.i("categoryContent:"+json);
+                        json(listResult, json,homeSourceBean.getKey());
                     } catch (Throwable th) {
                         th.printStackTrace();
                     }