From 0643209e8e1a39e614a80b4ada2ab7fa2fb18618 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 10 Aug 2022 18:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,shouye=20ytuijian?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/views/LiveEndViewHolder.java  |  5 ++--
 .../yunbao/main/activity/MainActivity.java    |  2 +-
 .../views/SearchRecommendHeardViewHolder.java |  2 +-
 .../res/drawable/tablayout_indicator_bg.xml   |  2 +-
 ...view_anchor_search_results_item_holder.xml | 24 ++++++++-----------
 .../res/layout/view_search_recommend_body.xml |  2 +-
 .../main/res/layout/view_search_results.xml   |  4 ++--
 .../view_search_results_item_holder.xml       |  6 ++---
 .../view_user_search_results_item_holder.xml  | 22 +++++++----------
 9 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
index be2b6a43e..dc104115e 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
@@ -117,10 +117,11 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
                         }
                         if (data.getList().size()>2){
                             listShow.setVisibility(View.VISIBLE);
-                        }else {
-                            listShow.setVisibility(View.GONE);
                             //组装搜索历史数据
                             adapter.showData(data.getList());
+                        }else {
+                            listShow.setVisibility(View.GONE);
+
                         }
 
 
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index 953a5192a..80f233bdb 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -669,7 +669,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         //获取指导员引导逻辑
         NoviceInstructorManager.get(mContext).getNoviceInstructor();
         NoviceInstructorManager.get(mContext).checktHomeZdyPop();
-
+        initAnchorRecommendBanner();
 
     }
 
diff --git a/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java b/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java
index 3a4b22404..fd056391e 100644
--- a/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java
@@ -37,7 +37,7 @@ public class SearchRecommendHeardViewHolder extends RecyclerView.ViewHolder {
         searchHistory.removeAllViews();
         LinearLayout.LayoutParams layoutParams =
                 new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.setMargins(17, 10, 0, 7);
+        layoutParams.setMargins(15, 10, 15, 7);
         int i = 0;
         for (String key : historyMap.keySet()) {
             i = i + 1;
diff --git a/main/src/main/res/drawable/tablayout_indicator_bg.xml b/main/src/main/res/drawable/tablayout_indicator_bg.xml
index 66677ed6b..b51f91a8a 100644
--- a/main/src/main/res/drawable/tablayout_indicator_bg.xml
+++ b/main/src/main/res/drawable/tablayout_indicator_bg.xml
@@ -2,7 +2,7 @@
     <item android:gravity="center_horizontal">
         <shape>
             <corners android:radius="5dp" />
-            <size android:width="20dp"
+            <size android:width="14dp"
                 android:height="4dp"/>
         </shape>
     </item>
diff --git a/main/src/main/res/layout/view_anchor_search_results_item_holder.xml b/main/src/main/res/layout/view_anchor_search_results_item_holder.xml
index c59684010..af1b5f8d0 100644
--- a/main/src/main/res/layout/view_anchor_search_results_item_holder.xml
+++ b/main/src/main/res/layout/view_anchor_search_results_item_holder.xml
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
-
     <FrameLayout
         android:id="@+id/type_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp">
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="-7dp">
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -33,27 +28,28 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text="@string/anchor" />
+                android:text="@string/anchor"
+                android:textSize="16sp" />
 
         </LinearLayout>
 
         <TextView
             android:id="@+id/anchor_more"
             android:layout_width="wrap_content"
-            android:gravity="center_vertical"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:drawableRight="@mipmap/icon_more"
             android:drawablePadding="5dp"
+            android:gravity="center_vertical"
             android:text="@string/anchor_more" />
     </FrameLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/anchor_list"
+        android:layout_below="@id/type_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
-        android:layout_marginTop="10dp"
         android:layout_marginRight="20dp"
         android:fadingEdge="none" />
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/main/src/main/res/layout/view_search_recommend_body.xml b/main/src/main/res/layout/view_search_recommend_body.xml
index 8a1a856ca..2fb77eb71 100644
--- a/main/src/main/res/layout/view_search_recommend_body.xml
+++ b/main/src/main/res/layout/view_search_recommend_body.xml
@@ -36,7 +36,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/live_list"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="6dp"
         android:layout_marginBottom="15dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/main/src/main/res/layout/view_search_results.xml b/main/src/main/res/layout/view_search_results.xml
index 82e2d4856..912272ec8 100644
--- a/main/src/main/res/layout/view_search_results.xml
+++ b/main/src/main/res/layout/view_search_results.xml
@@ -19,8 +19,8 @@
         app:tabIndicatorColor="#FFFF8D41"
         app:tabIndicatorHeight="4dp"
         app:tabMode="fixed"
-        app:tabPaddingEnd="20dp"
-        app:tabPaddingStart="20dp"
+        app:tabPaddingEnd="35dp"
+        app:tabPaddingStart="35dp"
         app:tabSelectedTextColor="#FFFF8D41"
         app:tabTextAppearance="@style/TabLayoutTextStyle"
         app:tabTextColor="#FF000000">
diff --git a/main/src/main/res/layout/view_search_results_item_holder.xml b/main/src/main/res/layout/view_search_results_item_holder.xml
index a0f71819d..8f4378e8f 100644
--- a/main/src/main/res/layout/view_search_results_item_holder.xml
+++ b/main/src/main/res/layout/view_search_results_item_holder.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="65dp"
+    android:layout_height="80dp"
     android:orientation="horizontal"
-    android:paddingTop="10dp">
+    android:paddingTop="25dp">
 
     <RelativeLayout
         android:id="@+id/avatar_layout"
@@ -55,7 +55,7 @@
             <ImageView
                 android:id="@+id/contribute"
                 android:layout_width="55dp"
-                android:layout_height="20dp" />
+                android:layout_height="19dp" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/main/src/main/res/layout/view_user_search_results_item_holder.xml b/main/src/main/res/layout/view_user_search_results_item_holder.xml
index 660ea6d3b..94d7bf3d2 100644
--- a/main/src/main/res/layout/view_user_search_results_item_holder.xml
+++ b/main/src/main/res/layout/view_user_search_results_item_holder.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
-
     <FrameLayout
         android:id="@+id/type_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="20dp">
+        android:layout_marginTop="30dp"
+        android:layout_marginBottom="-7dp"
+        android:layout_marginRight="20dp">
 
         <LinearLayout
             android:layout_width="wrap_content"
+            android:gravity="center_vertical"
             android:layout_height="wrap_content">
 
             <ImageView
@@ -33,6 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:textSize="16sp"
                 android:text="@string/user" />
 
         </LinearLayout>
@@ -40,11 +36,11 @@
         <TextView
             android:id="@+id/anchor_more"
             android:layout_width="wrap_content"
-            android:gravity="center_vertical"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|right"
             android:drawableRight="@mipmap/icon_more"
             android:drawablePadding="5dp"
+            android:gravity="center_vertical"
             android:text="@string/anchor_more" />
     </FrameLayout>
 
@@ -52,8 +48,8 @@
         android:id="@+id/anchor_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_below="@id/type_title"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:fadingEdge="none" />
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file