From 5262fffa3074e17d14260274d831101def255da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Fri, 14 Mar 2025 17:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E9=9D=9E=E5=BD=93=E5=89=8D=E9=85=8D=E7=BD=AE=E6=BA=90?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tvbox/osc/cache/RoomDataManger.java       |  4 +--
 .../osc/ui/activity/HistoryActivity.java      | 15 ++++++++++-
 .../tvbox/osc/ui/adapter/HistoryAdapter.java  |  8 +++++-
 .../osc/ui/adapter/HomeHotVodAdapter.java     |  8 +++++-
 .../tvbox/osc/ui/fragment/UserFragment.java   | 27 ++++++++++++-------
 gradle.properties                             |  2 +-
 6 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/cache/RoomDataManger.java b/app/src/main/java/com/github/tvbox/osc/cache/RoomDataManger.java
index c1bb683e..a05689cd 100644
--- a/app/src/main/java/com/github/tvbox/osc/cache/RoomDataManger.java
+++ b/app/src/main/java/com/github/tvbox/osc/cache/RoomDataManger.java
@@ -98,8 +98,8 @@ public class RoomDataManger {
                         info = getVodInfoGson().fromJson(record.dataJson, new TypeToken<VodInfo>() {
                         }.getType());
                         info.sourceKey = record.sourceKey;
-                        SourceBean sourceBean = ApiConfig.get().getSource(info.sourceKey);
-                        if (sourceBean == null || info.name == null)
+//                        SourceBean sourceBean = ApiConfig.get().getSource(info.sourceKey);
+                        if (info.name == null)
                             info = null;
                     }
                 } catch (Exception e) {
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
index 92a234f3..a752be26 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
@@ -8,8 +8,10 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.github.tvbox.osc.R;
+import com.github.tvbox.osc.api.ApiConfig;
 import com.github.tvbox.osc.base.BaseActivity;
 import com.github.tvbox.osc.bean.Movie;
+import com.github.tvbox.osc.bean.SourceBean;
 import com.github.tvbox.osc.bean.VodInfo;
 import com.github.tvbox.osc.cache.RoomDataManger;
 import com.github.tvbox.osc.event.RefreshEvent;
@@ -17,6 +19,7 @@ import com.github.tvbox.osc.ui.adapter.HistoryAdapter;
 import com.github.tvbox.osc.ui.dialog.ConfirmClearDialog;
 import com.github.tvbox.osc.util.FastClickCheckUtil;
 import com.github.tvbox.osc.util.HawkConfig;
+import com.orhanobut.hawk.Hawk;
 import com.owen.tvrecyclerview.widget.TvRecyclerView;
 import com.owen.tvrecyclerview.widget.V7GridLayoutManager;
 
@@ -123,7 +126,17 @@ public class HistoryActivity extends BaseActivity {
                         Bundle bundle = new Bundle();
                         bundle.putString("id", vodInfo.id);
                         bundle.putString("sourceKey", vodInfo.sourceKey);
-                        jumpActivity(DetailActivity.class, bundle);
+                        SourceBean sourceBean = ApiConfig.get().getSource(vodInfo.sourceKey);
+                        if(sourceBean!=null){
+                            jumpActivity(DetailActivity.class, bundle);
+                        }else {
+                            bundle.putString("title", vodInfo.name);
+                            if(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false)){
+                                jumpActivity(FastSearchActivity.class, bundle);
+                            }else {
+                                jumpActivity(SearchActivity.class, bundle);
+                            }
+                        }
                     }
                 }
             }
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 0623d61f..fcf150c3 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
@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.github.tvbox.osc.R;
 import com.github.tvbox.osc.api.ApiConfig;
+import com.github.tvbox.osc.bean.SourceBean;
 import com.github.tvbox.osc.bean.VodInfo;
 import com.github.tvbox.osc.picasso.RoundTransformation;
 import com.github.tvbox.osc.util.DefaultConfig;
@@ -48,7 +49,12 @@ public class HistoryAdapter extends BaseQuickAdapter<VodInfo, BaseViewHolder> {
             tvYear.setText(String.valueOf(item.year));
             tvYear.setVisibility(View.VISIBLE);
         }*/
-        tvYear.setText(ApiConfig.get().getSource(item.sourceKey).getName());
+        SourceBean bean =  ApiConfig.get().getSource(item.sourceKey);
+        if(bean!=null){
+            tvYear.setText(bean.getName());
+        }else {
+            tvYear.setVisibility(View.GONE);
+        }
         /*TextView tvLang = helper.getView(R.id.tvLang);
         if (TextUtils.isEmpty(item.lang)) {
             tvLang.setVisibility(View.GONE);
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 e94b10e0..f31d8911 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
@@ -11,6 +11,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.github.tvbox.osc.R;
 import com.github.tvbox.osc.api.ApiConfig;
 import com.github.tvbox.osc.bean.Movie;
+import com.github.tvbox.osc.bean.SourceBean;
 import com.github.tvbox.osc.picasso.RoundTransformation;
 import com.github.tvbox.osc.util.DefaultConfig;
 import com.github.tvbox.osc.util.HawkConfig;
@@ -41,7 +42,12 @@ public class HomeHotVodAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
 
         TextView tvRate = helper.getView(R.id.tvRate);
         if (Hawk.get(HawkConfig.HOME_REC, 0) == 2){
-            tvRate.setText(ApiConfig.get().getSource(item.sourceKey).getName());
+            SourceBean bean =  ApiConfig.get().getSource(item.sourceKey);
+            if(bean!=null){
+                tvRate.setText(bean.getName());
+            }else {
+                tvRate.setVisibility(View.GONE);
+            }
         }else if(Hawk.get(HawkConfig.HOME_REC, 0) == 0){
             tvRate.setText("豆瓣热播");
         }else {
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
index 060836c7..d76d324e 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
@@ -12,6 +12,7 @@ import com.github.tvbox.osc.R;
 import com.github.tvbox.osc.api.ApiConfig;
 import com.github.tvbox.osc.base.BaseLazyFragment;
 import com.github.tvbox.osc.bean.Movie;
+import com.github.tvbox.osc.bean.SourceBean;
 import com.github.tvbox.osc.bean.VodInfo;
 import com.github.tvbox.osc.cache.RoomDataManger;
 import com.github.tvbox.osc.event.ServerEvent;
@@ -111,6 +112,17 @@ public class UserFragment extends BaseLazyFragment implements View.OnClickListen
         return R.layout.fragment_user;
     }
 
+    private void jumpSearch(Movie.Video vod){
+        Intent newIntent;
+        if(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false)){
+            newIntent = new Intent(mContext, FastSearchActivity.class);
+        }else {
+            newIntent = new Intent(mContext, SearchActivity.class);
+        }
+        newIntent.putExtra("title", vod.name);
+        newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        mActivity.startActivity(newIntent);
+    }
     @Override
     protected void init() {
         EventBus.getDefault().register(this);
@@ -152,17 +164,14 @@ public class UserFragment extends BaseLazyFragment implements View.OnClickListen
                     Bundle bundle = new Bundle();
                     bundle.putString("id", vod.id);
                     bundle.putString("sourceKey", vod.sourceKey);
-                    jumpActivity(DetailActivity.class, bundle);
-                } else {
-                    Intent newIntent;
-                    if(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false)){
-                        newIntent = new Intent(mContext, FastSearchActivity.class);
+                    SourceBean sourceBean = ApiConfig.get().getSource(vod.sourceKey);
+                    if(sourceBean!=null){
+                        jumpActivity(DetailActivity.class, bundle);
                     }else {
-                        newIntent = new Intent(mContext, SearchActivity.class);
+                        jumpSearch(vod);
                     }
-                    newIntent.putExtra("title", vod.name);
-                    newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    mActivity.startActivity(newIntent);
+                } else {
+                    jumpSearch(vod);
                 }
             }
         });
diff --git a/gradle.properties b/gradle.properties
index 2b801b14..8e1f9a6b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,4 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 IsDebug=true
-org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED
+#org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED