From c3a4b57e18e4732793f757593843e3b9868fb8c2 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 9 Aug 2022 17:44:44 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/SearchRecommendBodyItemViewHolder.java |   8 +++++++-
 .../src/main/res/layout/item_main_home_lives.xml |   8 +++-----
 .../com/yunbao/main/activity/SearchActivity.java |   6 ++++++
 main/src/main/res/layout/activity_search.xml     |  11 ++++++++++-
 main/src/main/res/mipmap-xxhdpi/icon_quxiao.png  | Bin 0 -> 2206 bytes
 5 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 main/src/main/res/mipmap-xxhdpi/icon_quxiao.png

diff --git a/live/src/main/java/com/yunbao/live/views/SearchRecommendBodyItemViewHolder.java b/live/src/main/java/com/yunbao/live/views/SearchRecommendBodyItemViewHolder.java
index 9c8ce5a65..078dd39e5 100644
--- a/live/src/main/java/com/yunbao/live/views/SearchRecommendBodyItemViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/SearchRecommendBodyItemViewHolder.java
@@ -45,7 +45,13 @@ public class SearchRecommendBodyItemViewHolder extends RecyclerView.ViewHolder {
         pkico = (ImageView) itemView.findViewById(R.id.pk_ico);
         drPkIco = (ImageView) itemView.findViewById(R.id.dr_pk_ico);
         pkAvatar = (ImageView) itemView.findViewById(R.id.pk_avatar);
-
+        liveType.setVisibility(View.GONE);
+        mLiveIco.setVisibility(View.GONE);
+        mLiveState.setVisibility(View.GONE);
+        mNum.setVisibility(View.GONE);
+        pkAvatar.setVisibility(View.GONE);
+        pkico.setVisibility(View.GONE);
+        mTitle.setVisibility(View.GONE);
 
     }
 
diff --git a/live/src/main/res/layout/item_main_home_lives.xml b/live/src/main/res/layout/item_main_home_lives.xml
index bc032eab4..a259591ba 100644
--- a/live/src/main/res/layout/item_main_home_lives.xml
+++ b/live/src/main/res/layout/item_main_home_lives.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="9dp"
     android:gravity="center"
     android:orientation="vertical">
 
@@ -16,8 +17,7 @@
         <com.yunbao.common.custom.MyRelativeLayout5
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="9dp"
-            android:paddingLeft="5dp">
+            android:layout_marginBottom="9dp">
 
             <com.makeramen.roundedimageview.RoundedImageView
                 android:id="@+id/cover"
@@ -183,9 +183,7 @@
 
         <com.yunbao.common.custom.MyRelativeLayout5
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="9dp"
-            android:paddingLeft="5dp">
+            android:layout_height="match_parent">
 
             <ViewFlipper
                 android:id="@+id/viewflipper_banner"
diff --git a/main/src/main/java/com/yunbao/main/activity/SearchActivity.java b/main/src/main/java/com/yunbao/main/activity/SearchActivity.java
index 814353eac..47fdf2ea8 100644
--- a/main/src/main/java/com/yunbao/main/activity/SearchActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/SearchActivity.java
@@ -66,6 +66,12 @@ public class SearchActivity extends AbsActivity {
         transaction.replace(R.id.context_layout, searchRecommendFragment);
         transaction.commit();
         mEditText = findViewById(R.id.edit);
+        findViewById(R.id.btn_delete).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mEditText.setText("");
+            }
+        });
         mEditText.setOnEditorActionListener(onEditorActionListener);
         //退出检索页面保存搜索记录
         findViewById(R.id.btn_back).setOnClickListener(new View.OnClickListener() {
diff --git a/main/src/main/res/layout/activity_search.xml b/main/src/main/res/layout/activity_search.xml
index 5ca115f33..4b6f53428 100644
--- a/main/src/main/res/layout/activity_search.xml
+++ b/main/src/main/res/layout/activity_search.xml
@@ -37,8 +37,9 @@
 
                 <EditText
                     android:id="@+id/edit"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:layout_weight="1"
                     android:background="@null"
                     android:hint="@string/search_hint"
                     android:imeActionLabel="@string/search"
@@ -49,6 +50,14 @@
                     android:textColor="@color/textColor"
                     android:textColorHint="@color/gray3"
                     android:textSize="15sp" />
+
+                <ImageView
+                    android:id="@+id/btn_delete"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="10dp"
+                    android:src="@mipmap/icon_quxiao" />
             </LinearLayout>
 
             <TextView
diff --git a/main/src/main/res/mipmap-xxhdpi/icon_quxiao.png b/main/src/main/res/mipmap-xxhdpi/icon_quxiao.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5cd3e92826a8acb3f034a741ae83b9708bde66c
GIT binary patch
literal 2206
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

literal 0
HcmV?d00001