修改搜索和 描杀

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

@@ -58,6 +58,9 @@ class SearchResultActivity : BaseActivity(), SearchReslutContract.View,
         id_refresh_layout?.setOnRefreshListener {
             mPresenter?.getShopSearchList(true, keyword)
         }
+        id_img_clear?.setOnClickListener {
+            finish()
+        }
         getSearchData()
         id_edit_search?.setOnFocusChangeListener(object : View.OnFocusChangeListener {
             override fun onFocusChange(v: View?, hasFocus: Boolean) {

moduleMain/src/main/java/com/zxbw/modulemain/adapter/FlashSaleAdapter.kt

@@ -36,16 +36,16 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         var bean = mList[position]
+        holder.id_tv_status?.text = bean.skillStatusDesc
         if (TextUtils.equals(bean.skillStatus, "1") || TextUtils.equals(bean.skillStatus, "2")) {
             if (!TextUtils.isEmpty(bean.currentStore)) {
                 if (bean.currentStore!!.toInt() > 0) {
                     holder.id_tv_qianggou?.setBackgroundResource(R.drawable.button_qiang)
                 }else{
                     holder.id_tv_qianggou?.setBackgroundResource(R.drawable.button_bukeqiang)
+                    holder.id_tv_status?.text = "已抢光"
                 }
             }
-
-
         } else {
             holder.id_tv_qianggou?.setBackgroundResource(R.drawable.button_bukeqiang)
         }
@@ -53,12 +53,6 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
             holder.goumai_progress?.max = bean.store!!.toInt()
             holder.goumai_progress?.progress = bean.currentStore!!.toInt()
         }
-        holder.id_tv_status?.text = bean.skillStatusDesc
-        if(!TextUtils.isEmpty(bean.currentStore)){
-            if(bean.currentStore!!.toInt()<=0){
-                holder.id_tv_status?.text = "已抢光"
-            }
-        }
         if (!TextUtils.equals(bean.goodsType, "99")) {
 
             holder.id_img_member_bg?.setLoadImageUrl(bean.icon, false)

moduleMain/src/main/res/drawable/shape_9a6bf8_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" />
+<!--    <stroke-->
+<!--        android:width="1dp"-->
+<!--        android:color="#ff9a6bf8" />-->
+    <solid android:color="#fff7f7f7"/>
     <corners
         android:bottomLeftRadius="20dp"
         android:bottomRightRadius="20dp"

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

@@ -38,6 +38,15 @@
                 android:textColor="@color/color_333333"
                 android:textCursorDrawable="@drawable/cursor_color"
                 android:textSize="12sp" />
+            <ImageView
+                android:id="@+id/id_img_clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:paddingRight="10dp"
+                android:paddingLeft="10dp"
+                android:layout_centerVertical="true"
+                android:src="@drawable/icon_search_shanchu"/>
         </RelativeLayout>