From 84ba3148350c4668db6b670ee6de486d5985fb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Thu, 13 Mar 2025 10:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E8=AF=8D=E5=8F=AA=E5=9C=A8=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=89=93=E5=BC=80=E6=97=B6=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tvbox/osc/ui/activity/SearchActivity.java     |  8 +++++++-
 app/src/main/res/layout/activity_fast_search.xml  | 15 ++++++++-------
 app/src/main/res/layout/activity_search.xml       |  8 +++++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
index b23191a7..89718c6e 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java
@@ -394,6 +394,7 @@ public class SearchActivity extends BaseActivity {
                 });
     }
 
+    private static ArrayList<String> hots;
     private void initData() {
         initCheckedSourcesForSearch();
         Intent intent = getIntent();
@@ -408,6 +409,11 @@ public class SearchActivity extends BaseActivity {
                 search(title);
             }
         }
+
+        if(hots!=null && !hots.isEmpty()){
+            wordAdapter.setNewData(hots);
+            return;
+        }
         // 加载热词
         OkGo.<String>get("https://node.video.qq.com/x/api/hot_search")
 //        OkGo.<String>get("https://api.web.360kan.com/v1/rank")
@@ -418,7 +424,7 @@ public class SearchActivity extends BaseActivity {
                     @Override
                     public void onSuccess(Response<String> response) {
                         try {
-                            ArrayList<String> hots = new ArrayList<>();
+                            hots = new ArrayList<String>();
                             JsonArray itemList = JsonParser.parseString(response.body()).getAsJsonObject().get("data").getAsJsonObject().get("mapResult").getAsJsonObject().get("0").getAsJsonObject().get("listInfo").getAsJsonArray();
 //                            JsonArray itemList = JsonParser.parseString(response.body()).getAsJsonObject().get("data").getAsJsonArray();
                             for (JsonElement ele : itemList) {
diff --git a/app/src/main/res/layout/activity_fast_search.xml b/app/src/main/res/layout/activity_fast_search.xml
index 5b106eb5..398d9c48 100644
--- a/app/src/main/res/layout/activity_fast_search.xml
+++ b/app/src/main/res/layout/activity_fast_search.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -9,14 +10,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/vs_50"
-                android:layout_marginTop="@dimen/vs_10"
-                android:layout_marginBottom="@dimen/vs_10"
-        android:paddingLeft="20mm"
-       >
+        android:layout_marginTop="@dimen/vs_10"
+        android:layout_marginBottom="@dimen/vs_10"
+        android:paddingLeft="20mm">
 
         <TextView
             android:id="@+id/mSearchTitle"
-            android:layout_width="@dimen/vs_180"
+            android:layout_width="@dimen/vs_200"
             android:layout_height="match_parent"
             android:text="搜索(0/0)"
             android:layout_gravity="center_horizontal"
@@ -44,7 +44,7 @@
 
         <LinearLayout
             android:id="@+id/llWord"
-            android:layout_width="@dimen/vs_180"
+            android:layout_width="@dimen/vs_200"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:paddingLeft="20mm"
@@ -69,7 +69,8 @@
             android:orientation="vertical"
             android:paddingLeft="20mm"
             android:paddingBottom="@dimen/vs_20"
-            android:paddingRight="20mm" >
+            android:paddingRight="20mm"
+            tools:ignore="InOrMmUsage">
 
 
             <com.owen.tvrecyclerview.widget.TvRecyclerView
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 1c0bec8e..af0ed53d 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
@@ -21,7 +22,7 @@
             <TextView
                 android:id="@+id/tvSearchCheckboxBtn"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/vs_50"
+                android:layout_height="0dp"
                 android:layout_weight="1"
                 android:background="@drawable/shape_user_focus"
                 android:focusable="true"
@@ -109,13 +110,14 @@
                 android:layout_width="300mm"
                 android:layout_height="300mm"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="20mm" />
+                android:layout_marginTop="20mm"
+                tools:ignore="InOrMmUsage" />
         </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/llWord"
-        android:layout_width="@dimen/vs_160"
+        android:layout_width="@dimen/vs_200"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:paddingTop="@dimen/vs_20"