1.兼职顶部的搜索

2.兼职的全部工作列表

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/adapter/PartTimeJobAdapter.kt

@@ -1,54 +0,0 @@
-package com.hongyegroup.cpt_parttime.adapter
-
-import android.widget.ImageView
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.guadou.cs_cptservices.binding.BaseMultiDataBindingAdapter
-import com.guadou.lib_baselib.engine.extLoad
-import com.guadou.lib_baselib.ext.dp2px
-import com.hongyegroup.cpt_parttime.R
-import com.hongyegroup.cpt_parttime.bean.PartJobResult
-
-/**
- * 多布局+DataBinding
- * 兼职工作首页的列表适配器
- */
-class PartTimeJobAdapter(br: Int, list: MutableList<PartJobResult>) :
-    BaseMultiDataBindingAdapter<PartJobResult>(br, list) {
-
-    init {
-        // 绑定 layout 对应的 type
-        addItemType(PartJobResult.TYPE_EMPTY, R.layout.item_empty_layout)
-        addItemType(PartJobResult.TYPE_ITEM, R.layout.item_parttime_job_view)
-        addItemType(PartJobResult.TYPE_BANNER, R.layout.item_parttime_banner)
-    }
-
-    override fun onItemViewHolderCreated(viewHolder: BaseViewHolder, viewType: Int) {
-        if (viewType != PartJobResult.TYPE_EMPTY) {
-            // 绑定databinding
-            DataBindingUtil.bind<ViewDataBinding>(viewHolder.itemView)
-        }
-    }
-
-    override fun convert(holder: BaseViewHolder, item: PartJobResult) {
-        if (holder.itemViewType != PartJobResult.TYPE_EMPTY) {
-            // 绑定databinding
-            holder.getBinding<ViewDataBinding>()?.run {
-                setVariable(_br, item)
-                executePendingBindings()
-            }
-        }
-
-        //不方便做DataBinding的操作 ↓
-        if (holder.itemViewType == PartJobResult.TYPE_ITEM) {
-
-        } else if (holder.itemViewType == PartJobResult.TYPE_BANNER) {
-
-            val imageUrl = "http://i03piccdn.sogoucdn.com/dbbea331b73acd7d"
-            holder.getView<ImageView>(R.id.iv_banner).extLoad(imageUrl, roundRadius = dp2px(8f))
-        }
-
-    }
-
-}

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/bean/PartJobResult.java

@@ -1,8 +1,6 @@
 package com.hongyegroup.cpt_parttime.bean;
 
-import com.chad.library.adapter.base.entity.MultiItemEntity;
-
-public class PartJobResult implements MultiItemEntity {
+public class PartJobResult{
 
     public String id;
     public String title;
@@ -12,19 +10,4 @@ public class PartJobResult implements MultiItemEntity {
     public String imgs;
     public String groupDate;
 
-
-    public static int TYPE_EMPTY = 0;
-    public static int TYPE_ITEM = 1;
-    public static int TYPE_BANNER = 2;
-
-    @Override
-    public int getItemType() {
-        if (type == 1) {
-            return TYPE_ITEM;
-        } else if (type == 2) {
-            return TYPE_BANNER;
-        } else {
-            return TYPE_EMPTY;
-        }
-    }
 }

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/mvvm/PartJobDetailChildViewModel.kt

@@ -4,10 +4,11 @@ import android.annotation.SuppressLint
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.SavedStateHandle
+import com.guadou.cs_cptservices.binding.BaseDataBindingAdapter
 import com.guadou.lib_baselib.base.vm.BaseViewModel
 import com.guadou.lib_baselib.ext.checkEmpty
 import com.hongyegroup.cpt_parttime.BR
-import com.hongyegroup.cpt_parttime.adapter.PartTimeJobAdapter
+import com.hongyegroup.cpt_parttime.R
 import com.hongyegroup.cpt_parttime.bean.PartJobResult
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -21,7 +22,7 @@ class PartJobDetailChildViewModel @Inject constructor(
 ) : BaseViewModel() {
 
     var mDatas = mutableListOf<PartJobResult>()
-    val mAdapter by lazy { PartTimeJobAdapter(BR.item, mDatas) }
+    val mAdapter by lazy { BaseDataBindingAdapter(R.layout.item_part_time_jobs, BR.item, mDatas) }
 
     /**
      * 获取推荐的工作

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/mvvm/PartTimeMainViewModel.kt

@@ -9,7 +9,6 @@ import com.guadou.lib_baselib.base.vm.BaseViewModel
 import com.guadou.lib_baselib.ext.checkEmpty
 import com.hongyegroup.cpt_parttime.BR
 import com.hongyegroup.cpt_parttime.R
-import com.hongyegroup.cpt_parttime.adapter.PartTimeJobAdapter
 import com.hongyegroup.cpt_parttime.bean.PartJobResult
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -33,7 +32,7 @@ class PartTimeMainViewModel @Inject constructor(
     val mNewJobAdapter by lazy { BaseDataBindingAdapter(R.layout.item_part_time_new_job, BR.item, mNewsJobDataes) }
 
     var mAllJobDataes = mutableListOf<PartJobResult>()
-    val mAllJobAdapter by lazy { PartTimeJobAdapter(BR.item, mAllJobDataes) }
+    val mAllJobAdapter by lazy { BaseDataBindingAdapter(R.layout.item_part_time_jobs, BR.item, mAllJobDataes) }
 
     /**
      * 获取兼职工作列表

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/ui/PartJobDetailFragment.kt

@@ -45,8 +45,7 @@ class PartJobDetailFragment : YYBaseVDBFragment<PartJobDetailChildViewModel, Fra
         mViewModel.mAdapter.loadMoreModule.isEnableLoadMore = false
 
         //Item点击
-        mViewModel.mAdapter.addChildClickViewIds(R.id.ll_job_root)
-        mViewModel.mAdapter.setOnItemChildClickListener { _, view, position ->
+        mViewModel.mAdapter.setOnItemClickListener { _, view, position ->
             val item = mViewModel.mDatas[position]
             mClickProxy.gotoJobDetailPage()
         }

cpt_parttime/src/main/java/com/hongyegroup/cpt_parttime/ui/PartTimeMainFragment.kt

@@ -10,7 +10,6 @@ import com.gavin.com.library.listener.PowerGroupListener
 import com.guadou.cs_cptservices.base.fragment.YYBaseVDBFragment
 import com.guadou.cs_cptservices.interfaces.IFragmentRefresh
 import com.guadou.lib_baselib.bean.DataBindingConfig
-import com.guadou.lib_baselib.engine.toast
 import com.guadou.lib_baselib.ext.dp2px
 import com.guadou.lib_baselib.ext.horizontal
 import com.guadou.lib_baselib.ext.vertical
@@ -112,18 +111,10 @@ class PartTimeMainFragment : YYBaseVDBFragment<PartTimeMainViewModel, FragmentPa
         mBinding.refreshLayout.setEnableRefresh(true)
         mBinding.refreshLayout.setOnRefreshListener(this)
 
-        //Item点击
-        mViewModel.mAllJobAdapter.addChildClickViewIds(R.id.ll_job_root, R.id.cl_banner_root)
-        mViewModel.mAllJobAdapter.setOnItemChildClickListener { _, view, position ->
+        //Item点击-进入详情
+        mViewModel.mAllJobAdapter.setOnItemClickListener { _, view, position ->
             val item = mViewModel.mAllJobDataes[position]
-            when (view.id) {
-                R.id.ll_job_root -> {
-                    mClickProxy.gotoJobDetailPage()
-                }
-                R.id.cl_banner_root -> {
-                    toast("点击banner")
-                }
-            }
+            mClickProxy.gotoJobDetailPage()
         }
 
         //新工作的点击-进入详情
@@ -175,6 +166,13 @@ class PartTimeMainFragment : YYBaseVDBFragment<PartTimeMainViewModel, FragmentPa
             doSearch()
         }
 
+        //重置筛选的条件
+        fun searchReset() {
+            filterIndex.value = -1
+            mViewModel.mKeywordLiveData.value = ""
+            doSearch()
+        }
+
         //跳转页面-兼职工作详情
         fun gotoJobDetailPage() {
             PartTimeJobDetailActivity.startInstance()
@@ -191,6 +189,7 @@ class PartTimeMainFragment : YYBaseVDBFragment<PartTimeMainViewModel, FragmentPa
         fun filterOption() {
             filterIndex.value = 2
         }
+
     }
 
 }

cpt_parttime/src/main/res/drawable/shape_job_img_full_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+
+    <solid android:color="#99EEEEEE"/>
+    <size android:width="@dimen/d_50dp" android:height="@dimen/d_50dp"/>
+
+</shape>

cpt_parttime/src/main/res/drawable/shape_job_location_bg_yellow.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="2dp"/>
+
+    <solid android:color="#F8E3C7"/>
+
+</shape>

cpt_parttime/src/main/res/drawable/shape_part_time_tips_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/d_2dp"/>
+
+    <solid android:color="#FFD8D3"/>
+
+</shape>

cpt_parttime/src/main/res/layout/fragment_parttime_main.xml

@@ -40,10 +40,11 @@
             android:paddingRight="@dimen/d_15dp">
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="32dp"
                 android:layout_marginLeft="@dimen/d_15dp"
-                android:background="@drawable/shape_search_gray_bg_corners20"
+                android:layout_weight="1"
+                android:background="@drawable/shape_search_gray_bg_corners3"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -81,6 +82,14 @@
 
             </LinearLayout>
 
+            <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_12dp"
+                android:text="重置"
+                android:textColor="@color/app_blue"
+                android:textSize="@dimen/d_15sp"
+                binding:clicks="@{click.searchReset}" />
 
         </LinearLayout>
 
@@ -164,6 +173,11 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_0.5dp"
+            android:background="@color/divider_color_ee" />
+
         <!--   刷新+列表   -->
         <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/refresh_layout"

cpt_parttime/src/main/res/layout/item_part_time_jobs.xml

@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="item"
+            type="com.hongyegroup.cpt_parttime.bean.PartJobResult" />
+
+        <import type="android.text.TextUtils" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/selector_white_item_click_bg"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <com.guadou.lib_baselib.font_text_view.TextViewBold
+                android:id="@+id/text_view_job_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_10dp"
+                android:layout_marginTop="@dimen/d_13dp"
+                android:layout_marginRight="@dimen/d_6dp"
+                android:layout_marginBottom="@dimen/d_5dp"
+                android:layout_toLeftOf="@id/iv_toping"
+                android:gravity="start"
+                android:text="香格里拉大酒店需要大量经验丰富的员工，至少10人"
+                android:textAllCaps="true"
+                android:textColor="@color/notify_dark_blue"
+                android:textSize="@dimen/d_17sp" />
+
+            <ImageView
+                android:id="@+id/iv_toping"
+                android:layout_width="43dp"
+                android:layout_height="37.5dp"
+                android:layout_alignParentRight="true"
+                android:layout_gravity="center_vertical"
+                android:scaleType="centerCrop"
+                android:src="@drawable/job_featured"
+                android:visibility="visible" />
+
+        </RelativeLayout>
+
+        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+            android:id="@+id/tv_item_job_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/d_10dp"
+            android:layout_marginTop="@dimen/d_8dp"
+            android:layout_marginRight="@dimen/d_10dp"
+            android:background="@drawable/shape_part_time_tips_bg"
+            android:includeFontPadding="false"
+            android:paddingLeft="@dimen/d_13dp"
+            android:paddingTop="@dimen/d_4dp"
+            android:paddingRight="@dimen/d_12dp"
+            android:paddingBottom="@dimen/d_4dp"
+            android:text="你已经申请了这份工作。"
+            android:textColor="@color/text_dark_red_f26"
+            android:textSize="@dimen/d_13sp"
+            android:visibility="visible" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/d_10dp"
+            android:paddingTop="@dimen/d_8dp"
+            android:paddingRight="@dimen/d_10dp"
+            android:paddingBottom="@dimen/d_7dp">
+
+            <!--       工作图片     -->
+            <ImageView
+                android:id="@+id/iv_job_img"
+                android:layout_width="93.5dp"
+                android:layout_height="68dp"
+                android:background="@drawable/placeholder_img_job_img"
+                android:scaleType="centerCrop" />
+
+            <!--   工作已经满了的视图     -->
+            <FrameLayout
+                android:id="@+id/tv_full_view"
+                android:layout_width="93.5dp"
+                android:layout_height="68dp"
+                android:background="#66000000"
+                android:visibility="gone">
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/shape_job_img_full_bg"
+                    android:gravity="center"
+                    android:text="FULL"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/d_13dp" />
+
+            </FrameLayout>
+
+            <!--   start date   -->
+            <LinearLayout
+                android:id="@+id/ll_start_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/d_12dp"
+                android:layout_marginTop="@dimen/d_2dp"
+                android:layout_toRightOf="@id/iv_job_img"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="日期："
+                    android:textColor="@color/gray_76"
+                    android:textSize="@dimen/d_15sp" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_start_date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2022/06/29 周三"
+                    android:textColor="@color/text_orange_ff9300"
+                    android:textSize="@dimen/d_14sp" />
+
+            </LinearLayout>
+
+            <!--       start time     -->
+            <LinearLayout
+                android:id="@+id/ll_start_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/ll_start_date"
+                android:layout_marginLeft="@dimen/d_12dp"
+                android:layout_marginTop="@dimen/d_5dp"
+                android:layout_toRightOf="@id/iv_job_img"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="时间："
+                    android:textColor="@color/gray_76"
+                    android:textSize="@dimen/d_15sp" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_start_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="06:00-23:30"
+                    android:textColor="@color/text_orange_ff9300"
+                    android:textSize="@dimen/d_14sp" />
+
+            </LinearLayout>
+
+            <!-- 工作时薪 -->
+            <LinearLayout
+                android:id="@+id/ll_hourly"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="@dimen/d_5dp"
+                android:layout_marginRight="@dimen/d_5dp"
+                android:orientation="horizontal">
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/up_to"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="¥10"
+                    android:textColor="@color/app_blue"
+                    android:textSize="@dimen/d_15sp" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                    android:id="@+id/tv_hr"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="/时"
+                    android:textColor="@color/gray_76"
+                    android:textSize="@dimen/d_15sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <!-- 价格总计 -->
+            <LinearLayout
+                android:id="@+id/ll_total"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/ll_hourly"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="@dimen/d_15dp"
+                android:layout_marginRight="@dimen/d_5dp"
+                android:orientation="horizontal">
+
+                <com.guadou.lib_baselib.font_text_view.TextViewRegular
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dp"
+                    android:text="总计"
+                    android:textColor="@color/gray_76"
+                    android:textSize="@dimen/d_15sp" />
+
+                <com.guadou.lib_baselib.font_text_view.TextViewMedium
+                    android:id="@+id/tv_item_job_total_money"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="¥80"
+                    android:textColor="@color/profile_red"
+                    android:textSize="@dimen/d_22sp" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+
+        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/d_24dp"
+            android:layout_marginTop="@dimen/d_5dp"
+            android:layout_marginLeft="@dimen/d_10dp"
+            android:background="@drawable/shape_job_location_bg_yellow"
+            android:drawableLeft="@drawable/part_time_job_type_icon"
+            android:drawablePadding="@dimen/d_13dp"
+            android:gravity="center_vertical"
+            android:paddingLeft="@dimen/d_13dp"
+            android:paddingRight="@dimen/d_19dp"
+            android:text="食品宴席"
+            android:textColor="@color/dark_yellow_9f5f09"
+            android:textSize="@dimen/d_13sp" />
+
+        <com.guadou.lib_baselib.font_text_view.TextViewRegular
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/d_24dp"
+            android:layout_marginLeft="@dimen/d_10dp"
+            android:layout_marginTop="@dimen/d_10dp"
+            android:background="@drawable/shape_job_location_bg_yellow"
+            android:drawableLeft="@drawable/part_time_job_address_icon"
+            android:drawablePadding="@dimen/d_13dp"
+            android:gravity="center_vertical"
+            android:paddingLeft="@dimen/d_13dp"
+            android:paddingRight="@dimen/d_19dp"
+            android:text="湖北省武汉市武昌区光谷软件园J栋1212室"
+            android:textColor="@color/dark_yellow_9f5f09"
+            android:textSize="@dimen/d_13sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d_0.7dp"
+            android:layout_marginTop="@dimen/d_20dp"
+            android:background="@color/divider_color_e5" />
+
+
+    </LinearLayout>
+
+</layout>

cpt_parttime/src/main/res/layout/item_parttime_banner.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:binding="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="item"
-            type="com.hongyegroup.cpt_parttime.bean.PartJobResult" />
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_banner_root"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/d_15dp"
-        android:paddingTop="@dimen/d_10dp"
-        android:paddingRight="@dimen/d_15dp"
-        android:paddingBottom="@dimen/d_10dp">
-
-        <ImageView
-            android:id="@+id/iv_banner"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="centerCrop"
-            android:src="@color/gray"
-            app:layout_constraintDimensionRatio="345:153"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>

cpt_parttime/src/main/res/layout/item_parttime_job_view.xml

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:binding="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="item"
-            type="com.hongyegroup.cpt_parttime.bean.PartJobResult" />
-
-    </data>
-
-    <LinearLayout
-        android:id="@+id/ll_job_root"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:layout_marginTop="@dimen/d_12dp"
-            android:layout_marginRight="@dimen/d_15dp"
-            android:orientation="horizontal">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="斗鱼教学主播招聘待遇优厚"
-                android:textColor="@color/black_33"
-                android:textSize="@dimen/d_16sp" />
-
-
-            <com.guadou.lib_baselib.font_text_view.TextViewBold
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="100元/小时"
-                android:textColor="@color/text_orange"
-                android:textSize="@dimen/d_16sp" />
-
-        </LinearLayout>
-
-        <com.guadou.lib_baselib.font_text_view.TextViewMedium
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:layout_marginTop="@dimen/d_10dp"
-            android:text="06:00~23:00"
-            android:textColor="@color/app_blue"
-            android:textSize="@dimen/d_14sp" />
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:layout_marginTop="@dimen/d_12dp"
-            android:layout_marginRight="@dimen/d_15dp"
-            android:orientation="horizontal">
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_tab_category_blue"
-                android:paddingLeft="@dimen/d_8dp"
-                android:paddingTop="@dimen/d_7dp"
-                android:paddingRight="@dimen/d_8dp"
-                android:paddingBottom="@dimen/d_7dp"
-                android:text="日结"
-                android:textColor="@color/text_blue"
-                android:textSize="@dimen/d_12sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_5dp"
-                android:background="@drawable/shape_tab_category_blue"
-                android:paddingLeft="@dimen/d_8dp"
-                android:paddingTop="@dimen/d_7dp"
-                android:paddingRight="@dimen/d_8dp"
-                android:paddingBottom="@dimen/d_7dp"
-                android:text="主播讲师"
-                android:textColor="@color/text_blue"
-                android:textSize="@dimen/d_12sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_5dp"
-                android:background="@drawable/shape_tab_category_blue"
-                android:paddingLeft="@dimen/d_8dp"
-                android:paddingTop="@dimen/d_7dp"
-                android:paddingRight="@dimen/d_8dp"
-                android:paddingBottom="@dimen/d_7dp"
-                android:text="线上岗位"
-                android:textColor="@color/text_blue"
-                android:textSize="@dimen/d_12sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_5dp"
-                android:background="@drawable/shape_tab_category_blue"
-                android:paddingLeft="@dimen/d_8dp"
-                android:paddingTop="@dimen/d_7dp"
-                android:paddingRight="@dimen/d_8dp"
-                android:paddingBottom="@dimen/d_7dp"
-                android:text="品牌推荐"
-                android:textColor="@color/text_blue"
-                android:textSize="@dimen/d_12sp" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/d_15dp"
-            android:layout_marginTop="@dimen/d_8dp"
-            android:layout_marginRight="@dimen/d_15dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <com.guadou.lib_baselib.view.CircleImageView
-                android:layout_width="@dimen/d_25dp"
-                android:layout_height="@dimen/d_25dp"
-                android:src="@mipmap/ic_launcher_round" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_9dp"
-                android:text="武汉斗鱼网络科技有限公司"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_14sp" />
-
-            <com.guadou.lib_baselib.font_text_view.TextViewMedium
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/d_5dp"
-                android:text="江岸/9.3km"
-                android:textColor="@color/gray_66"
-                android:textSize="@dimen/d_14sp" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.7dp"
-            android:layout_marginTop="@dimen/d_7dp"
-            android:background="@color/main_divider" />
-
-    </LinearLayout>
-
-</layout>

cs_cptServices/src/main/res/drawable/shape_search_gray_bg_corners3.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#F6F7FA" />
+
+    <corners android:radius="@dimen/d_3dp" />
+
+</shape>

cs_cptServices/src/main/res/values/colors.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <color name="page_bg">#f1f1f1</color>
     <color name="page_bg_f4">#f4f4f4</color>
@@ -14,12 +14,15 @@
     <color name="main_divider">#ECECEC</color>
     <color name="text_orange">#FD4C00</color>
     <color name="text_orange_ff9300">#FF9300</color>
+
     <color name="text_blue">#008CFF</color>
     <color name="text_blue_3779ff">#3779FF</color>
     <color name="profile_red">#FF5E75</color>
+    <color name="text_dark_red_f26">#FF2626</color>
     <color name="part_share_btn_bg">#f2f2f2</color>
     <color name="dark_blue">#175285</color>
     <color name="divider_color_ee">#eeeeee</color>
+    <color name="divider_color_e5">#e5e5e5</color>
     <color name="notify_dark_blue">#2956B7</color>
     <color name="white_pressed">#33888888</color>
     <color name="divider_gray_c5">#C5C5C5</color>
@@ -28,5 +31,6 @@
     <color name="light_gray_divider">#EDF0F3</color>
     <color name="text_black_37">#373737</color>
     <color name="text_yellow_ff9300">#FF9300</color>
+    <color name="dark_yellow_9f5f09">#9F5F09</color>
 
 </resources>