[提交人]：王雪伟

[提交简述] ：1.1.1
[实现方案] ：修改搜索

moduleMain/src/main/java/com/zxbw/modulemain/activity/SearchActivity.kt

@@ -8,8 +8,10 @@ import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.zxbw.modulemain.R
 import com.zxbw.modulemain.adapter.SearchGoodsTopAdapter
+import com.zxbw.modulemain.adapter.SearchReslutAdapter
 import com.zxbw.modulemain.contract.SearchContract
 import com.zxbw.modulemain.presenter.SearchPresenter
 import com.zxbw.modulemain.uitls.SPUtils
@@ -31,7 +33,7 @@ import kotlinx.android.synthetic.main.activity_layout_search.*
 class SearchActivity : BaseActivity(), SearchContract.View,
     OnRecycleItemClickListener<TbGoodsItemEntity> {
     private var mPresenter: SearchPresenter? = null
-    var mGoodsAdapter: SearchGoodsTopAdapter? = null
+    var mGoodsAdapter: SearchReslutAdapter? = null
     override fun before() {
         super.before()
         setStatusBarBackground(resources.getColor(com.zxhl.cms.R.color.transparent))
@@ -46,7 +48,7 @@ class SearchActivity : BaseActivity(), SearchContract.View,
                 id_search_history_view.removeAllViews()
                 SPUtils.getInstance(this).cleanHistory()
             }
-            id_search_btn -> {
+            id_search_btn2 -> {
                 val searchValue = id_edt_input_value.text.toString().trim()
                 if (searchValue.isNullOrEmpty()) {
                     showToast("请输入要搜索的商品")
@@ -67,11 +69,12 @@ class SearchActivity : BaseActivity(), SearchContract.View,
     override fun init() {
 
         id_img_back_search.setOnClickListener(this)
-        id_search_btn.setOnClickListener(this)
+//        id_search_btn.setOnClickListener(this)
+        id_search_btn2.setOnClickListener(this)
         id_img_clean_history.setOnClickListener(this)
 
-        mGoodsAdapter = SearchGoodsTopAdapter(this, this)
-        id_rck_goods_list.layoutManager = GridLayoutManager(this, 3)
+        mGoodsAdapter = SearchReslutAdapter(this, this)
+        id_rck_goods_list.layoutManager = LinearLayoutManager(this)
         id_rck_goods_list.adapter = mGoodsAdapter
 
 
@@ -83,13 +86,21 @@ class SearchActivity : BaseActivity(), SearchContract.View,
         id_edt_input_value.setOnKeyListener { v, keyCode, event ->
             if (keyCode == KeyEvent.KEYCODE_ENTER && event?.action == KeyEvent.ACTION_UP) {
                 hideKeyBoard()
-                id_search_btn.callOnClick()
+//                id_search_btn.callOnClick()
+                id_search_btn2.callOnClick()
             }
             false
         }
         EventUtils.onEvent("SearchPageShow")
     }
 
+    override fun onResume() {
+        super.onResume()
+        id_edt_input_value.setText("")
+        id_edt_input_value.requestFocus()
+        showKeyBoard(id_edt_input_value)
+    }
+
     override fun setSearchHistory() {
         val historyList = SPUtils.getInstance(this).historyList
         if (historyList.size == 1 && historyList[0].isNullOrEmpty()) {
@@ -217,13 +228,13 @@ class SearchActivity : BaseActivity(), SearchContract.View,
 
     override fun onItemClick(view: View?, position: Int, data: TbGoodsItemEntity?) {
         EventUtils.onEvent("SearchGoodsClick", data?.id ?: "-1")
-        if (data?.bannerType.equals("blindBox")){
+        if (data?.bannerType.equals("blindBox")) {
 //            if (!Constant.Switch.isOpenVip) {
 //                JumpUtils.MemberOrderJump()
 //            }else{
 //                JumpUtils.goodsDetailJump(data?.boxId)
 //            }
-        }else{
+        } else {
             var intent = Intent();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             intent.putExtra("goods", data)

moduleMain/src/main/java/com/zxbw/modulemain/activity/SearchResultActivity.kt

 package com.zxbw.modulemain.activity
 
+import android.content.Intent
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
@@ -116,7 +117,19 @@ class SearchResultActivity : BaseActivity(), SearchReslutContract.View,
     }
 
     override fun onItemClick(view: View?, position: Int, data: TbGoodsItemEntity?) {
-
+        if (data?.bannerType.equals("blindBox")){
+//            if (!Constant.Switch.isOpenVip) {
+//                JumpUtils.MemberOrderJump()
+//            }else{
+//                JumpUtils.goodsDetailJump(data?.boxId)
+//            }
+        }else{
+            var intent = Intent();
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            intent.putExtra("goods", data)
+            intent.setClass(this, TbGoodsDetailActivity().javaClass)
+            startActivity(intent)
+        }
     }
 
 

moduleMain/src/main/res/drawable/shape_f7f7f7_r20.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+<!--    <stroke-->
+<!--        android:width="1dp"-->
+<!--        android:color="#ff9a6bf8" />-->
+    <solid android:color="#f7f7f7"/>
+    <corners
+        android:bottomLeftRadius="20dp"
+        android:bottomRightRadius="20dp"
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp" />
+
+</shape>
\ No newline at end of file

moduleMain/src/main/res/layout/activity_layout_search.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:windowSoftInputMode="stateVisible|adjustPan">
 
     <View
         android:id="@+id/id_sys_bar_view"
@@ -14,7 +15,8 @@
         android:layout_height="wrap_content"
         android:adjustViewBounds="true"
         android:scaleType="fitXY"
-        android:src="@drawable/img_search_bg" />
+        android:src="@drawable/img_search_bg"
+        android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/id_ll_search"
@@ -32,12 +34,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
-            android:src="@drawable/box_result_detail_back_icon" />
+            android:src="@drawable/icon_fanhui" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="36dp"
-            android:background="@drawable/shape_white_r20"
+            android:layout_marginRight="14dp"
+            android:layout_weight="1"
+            android:background="@drawable/shape_f7f7f7_r20"
             android:gravity="center_vertical|right"
             android:orientation="horizontal"
             android:paddingLeft="12dp"
@@ -55,14 +59,23 @@
                 android:singleLine="true"
                 android:textCursorDrawable="@drawable/cursor_color2" />
 
+
             <ImageView
                 android:id="@+id/id_search_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_sousuo" />
+                android:src="@drawable/icon_sousuo"
+                android:visibility="gone" />
 
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/id_search_btn2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="搜索"
+            android:textColor="@color/color_333333"
+            android:textSize="16sp" />
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView