feat: UI还原

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt

@@ -9,7 +9,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Typeface
-import android.os.Bundle
 import android.os.Handler
 import android.text.TextUtils
 import android.view.View
@@ -1800,7 +1799,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.platform_ic_arrow_drop_down_grey_500_18dp,
+                    R.drawable.consult_ic_arrow_drwn_gray,
                     0
                 )
             }
@@ -1810,7 +1809,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.platform_arrow_drop_down_en,
+                    R.drawable.consult_ic_arrow_drwn_en,
                     0
                 )
             }
@@ -1820,7 +1819,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.platform_arrow_drop_down_en,
+                    R.drawable.consult_ic_arrow_drwn_en,
                     0
                 )
             }
@@ -1836,7 +1835,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.filter_up_grey,
+                    R.drawable.filter_up_gray,
                     0
                 )
             }

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt

@@ -6,9 +6,7 @@ import android.animation.ObjectAnimator
 import android.animation.PropertyValuesHolder
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.Intent
 import android.graphics.Typeface
-import android.net.Uri
 import android.os.Handler
 import android.text.TextUtils
 import android.view.View
@@ -31,9 +29,7 @@ import com.ydl.ydl_image.config.SimpleImageOpConfiger
 import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
 import com.ydl.ydl_image.manager.YDLImageCacheManager
 import com.ydl.ydlcommon.base.BaseMvpFragment
-import com.ydl.ydlcommon.base.config.ChannelConfig
 import com.ydl.ydlcommon.base.config.HttpConfig
-import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.modular.findRouteService
 import com.ydl.ydlcommon.ui.LogoLoadingView
 import com.ydl.ydlcommon.utils.BuryPointUtils
@@ -54,12 +50,8 @@ import com.yidianling.consultant.constants.ConsultBIConstants
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultEvent.Companion.PRICE_TYPE_CLICK
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultantLocationAuth.Companion.REFUSE_ALREADY
 import com.yidianling.consultant.constants.ConsultBIConstants.ConsultantLocationAuth.Companion.WHETHER_LOCATION_AUTH
-import com.yidianling.consultant.listener.*
 import com.yidianling.consultant.dialog.ConsultSubPayDialog
-import com.yidianling.consultant.listener.OnCategoriesSelectedListener
-import com.yidianling.consultant.listener.OnExpertClickListener
-import com.yidianling.consultant.listener.OnFilterConfirmListener
-import com.yidianling.consultant.listener.OnSortItemSelectedListener
+import com.yidianling.consultant.listener.*
 import com.yidianling.consultant.model.SearchApi
 import com.yidianling.consultant.model.bean.*
 import com.yidianling.consultant.modular.singlton.ConsultAssistantDialogUtils
@@ -501,20 +493,20 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
             textView.setOnClickListener {
                 if (textView.isSelected) {
                     dealHotSelect(hot, false)
-                    textView!!.isSelected = false
-                    textView.paint.isFakeBoldText = false
+                    textView.isSelected = false
                 } else {
                     dealHotSelect(hot, true)
                     textView.isSelected = true
-                    textView.paint.isFakeBoldText = true
                     // 埋点
-                    ActionCountUtils.baiDuCountSign3(
-                        ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE,
-                        ConsultBIConstants.ConsultEvent.POSITION_CHOICE_FILTER_CLICK,
-                        hot.value!!,
-                        "app",
-                        ""
-                    )
+                    hot.value?.let { it1 ->
+                        ActionCountUtils.baiDuCountSign3(
+                            ConsultBIConstants.PART_ID_CONSULT_COUNSELOR_LIST_PAGE,
+                            ConsultBIConstants.ConsultEvent.POSITION_CHOICE_FILTER_CLICK,
+                            it1,
+                            "app",
+                            ""
+                        )
+                    }
                 }
                 filterLabelSet()
                 //开始筛选数据
@@ -1611,12 +1603,12 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
     private fun updateFilterTextViewStatus(tv: TextView, status: Int) {
         when (status) {
             FILTER_STATUS_NORMAL -> {
-                tv.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
-                tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_colorTextDefault))
+                tv.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+                tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_242424))
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.platform_ic_arrow_drop_down_grey_500_18dp,
+                    R.drawable.consult_ic_arrow_drwn_gray,
                     0
                 )
             }
@@ -1626,7 +1618,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.platform_arrow_drop_down_en,
+                    R.drawable.consult_ic_arrow_drwn_en,
                     0
                 )
             }
@@ -1636,7 +1628,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.platform_arrow_drop_down_en,
+                    R.drawable.consult_ic_arrow_drwn_en,
                     0
                 )
             }
@@ -1647,12 +1639,12 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
     private fun updateFilterRightTextViewStatus(tv: TextView, status: Int) {
         when (status) {
             FILTER_STATUS_NORMAL -> {
-                tv.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
-                tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_colorTextDefault))
+                tv.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+                tv.setTextColor(ContextCompat.getColor(mContext, R.color.platform_color_242424))
                 tv.setCompoundDrawablesWithIntrinsicBounds(
                     0,
                     0,
-                    R.drawable.filter_up_grey,
+                    R.drawable.filter_up_gray,
                     0
                 )
             }

m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

@@ -130,7 +130,7 @@ class ExpertSearchAdapter(
                 holder.consult_display_status_str.setBackgroundColor(
                     ContextCompat.getColor(
                         context,
-                        R.color.color_b6bece
+                        R.color.color_b6bece_90
                     )
                 )
             }
@@ -138,7 +138,7 @@ class ExpertSearchAdapter(
                 holder.consult_display_status_str.setBackgroundColor(
                     ContextCompat.getColor(
                         context,
-                        R.color.color_f5a082
+                        R.color.color_f5a082_90
                     )
                 )
             }
@@ -146,7 +146,7 @@ class ExpertSearchAdapter(
                 holder.consult_display_status_str.setBackgroundColor(
                     ContextCompat.getColor(
                         context,
-                        R.color.color_6ec8f9
+                        R.color.color_6ec8f9_90
                     )
                 )
             }
@@ -223,7 +223,7 @@ class ExpertSearchAdapter(
         //价格
         val price = BigDecimal(itemBean.min_price)
         //             去掉末尾无用的.00
-        val priceStr = "¥" + price.stripTrailingZeros().toPlainString() + "起"
+        val priceStr = "¥" + price.stripTrailingZeros().toPlainString()
         holder.tvPrice.text = priceStr
 
         //服务方式

m-consultant/src/main/res/drawable/consultant_bg_radius_line_eb892c.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="1dp"/>
+    <corners android:radius="4dp" />
     <solid android:color="@color/color_1AEB892C" />
     <stroke android:width="0.5dp" android:color="@color/color_EB892C"/>
 

m-consultant/src/main/res/drawable/consultant_bg_radius_line_gray_1.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="1dp"/>
+    <corners android:radius="4dp" />
     <solid android:color="@color/platform_white" />
     <stroke
         android:width="0.5dp"

m-consultant/src/main/res/drawable/consultant_bg_search_filter_selector_radius11.xml

@@ -4,9 +4,9 @@
         <shape android:shape="rectangle">
             <solid android:color="@color/platform_main_theme_bright" />
             <corners android:radius="11dp"/>
-            <stroke
+            <!--<stroke
                 android:width="0.5dp"
-                android:color="@color/platform_main_theme"/>
+                android:color="@color/platform_main_theme"/>-->
         </shape>
     </item>
     <item android:state_enabled="true">

m-consultant/src/main/res/drawable/consultant_ns_bg.xml

@@ -7,6 +7,6 @@
         android:bottom="2dp"
         android:left="4dp"
         android:right="4dp"
-        android:top="3dp" />
+        android:top="1.5dp" />
 
 </shape>
\ No newline at end of file

m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="@dimen/platform_dp_16"
-    android:paddingTop="@dimen/platform_dp_22"
+    android:paddingTop="@dimen/platform_dp_19"
     android:paddingRight="@dimen/platform_dp_16">
 
 
@@ -13,7 +13,8 @@
         android:id="@+id/cv_head_view"
         android:layout_width="64dp"
         android:layout_height="80dp"
-        app:cardCornerRadius="4dp"
+        android:layout_marginTop="3dp"
+        app:cardCornerRadius="8dp"
         app:cardElevation="0px"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -37,7 +38,7 @@
                 android:layout_alignParentBottom="true"
                 android:background="#6EC8F9"
                 android:gravity="center"
-                android:paddingTop="3dp"
+                android:paddingTop="1dp"
                 android:paddingBottom="2dp"
                 android:textColor="@color/white"
                 android:textSize="9dp"
@@ -57,50 +58,53 @@
         android:textSize="@dimen/platform_dp_16"
         android:textStyle="bold"
         app:layout_constraintLeft_toRightOf="@id/cv_head_view"
-        app:layout_constraintTop_toTopOf="@id/cv_head_view"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="罗静" />
 
     <TextView
         android:id="@+id/audit_tag"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="4dp"
+        android:layout_marginStart="4dp"
         android:background="@drawable/consultant_ns_bg"
         android:textColor="@color/color_62636F"
         android:textSize="10dp"
-        tools:text="2022年审"
-        tools:visibility="visible"
         android:visibility="gone"
-        app:layout_constraintBaseline_toBaselineOf="@id/tvName"
-        app:layout_constraintLeft_toRightOf="@id/tvName" />
+        app:layout_constraintBottom_toBottomOf="@id/tvName"
+        app:layout_constraintLeft_toRightOf="@id/tvName"
+        app:layout_constraintTop_toTopOf="@id/tvName"
+        tools:text="2022年审"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/tvCity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/platform_dp_4"
         android:drawableLeft="@drawable/consult_location_icon"
-        android:drawablePadding="4dp"
+        android:drawablePadding="2dp"
         android:gravity="right"
-        android:textColor="@color/color_62636F"
+        android:textColor="@color/color_1c1f28_40"
         android:textSize="@dimen/platform_dp_11"
-        app:layout_constraintBaseline_toBaselineOf="@id/tvName"
+        app:layout_constraintBottom_toBottomOf="@id/tvName"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@id/tvName"
         tools:text="浙江.杭州" />
 
     <!--咨询师简介-->
     <TextView
         android:id="@+id/tvTeamCertifications"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/platform_dp_4"
         android:ellipsize="end"
         android:lines="1"
         android:textColor="@color/color_1c1f28_60"
         android:textSize="@dimen/platform_dp_13"
+        app:layout_constraintHorizontal_weight="1"
         app:layout_constraintLeft_toLeftOf="@id/tvName"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvName"
-        tools:text="一级婚姻家庭咨询师，二级心理咨询师二级心理咨询师二级心理咨询师" />
+        tools:text="一级婚姻家庭咨询师 | 二级心理咨询师二级心理咨询师二级心理咨询师" />
 
 
     <!--服务时长-->
@@ -157,11 +161,12 @@
         android:id="@+id/ll_tags"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="8dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         app:layout_constraintLeft_toLeftOf="@id/tvName"
-        app:layout_constraintTop_toBottomOf="@id/tvSaleDurationForMonth" />
+        app:layout_constraintTop_toBottomOf="@id/tvSaleDurationForMonth"
+        tools:visibility="gone" />
 
 
     <TextView
@@ -169,13 +174,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/tvName"
+        android:layout_marginTop="8dp"
         android:textColor="@color/color_ef8a4a"
-        android:layout_marginTop="12dp"
-        app:layout_goneMarginTop="10dp"
         android:textSize="@dimen/platform_dp_14"
         app:layout_constraintLeft_toLeftOf="@id/tvName"
         app:layout_constraintTop_toBottomOf="@id/ll_tags"
-        tools:text="¥250起" />
+        app:layout_goneMarginTop="10dp"
+        tools:text="¥250" />
+
+    <TextView
+        android:id="@+id/tvPrice_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/tvName"
+        android:layout_marginTop="12dp"
+        android:text="起"
+        android:textColor="@color/color_ef8a4a"
+        android:textSize="@dimen/platform_dp_12"
+        app:layout_constraintBaseline_toBaselineOf="@id/tvPrice"
+        app:layout_constraintLeft_toRightOf="@id/tvPrice" />
 
     <TextView
         android:id="@+id/attr_combine"
@@ -185,7 +202,7 @@
         android:textColor="@color/color_1c1f28_40"
         android:textSize="12dp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvPrice"
-        app:layout_constraintLeft_toRightOf="@id/tvPrice"
+        app:layout_constraintLeft_toRightOf="@id/tvPrice_unit"
         tools:text="面/视咨询" />
     <!--私聊-->
     <androidx.cardview.widget.CardView
@@ -200,6 +217,7 @@
         android:paddingBottom="4dp"
         app:cardBackgroundColor="@color/color_6ec8f9"
         app:cardCornerRadius="12dp"
+        app:cardElevation="0dp"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@id/tvPrice">
 
@@ -223,7 +241,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:textColor="@color/color_62636F"
+        android:textColor="@color/color_1c1f28_40"
         android:textSize="@dimen/platform_dp_10"
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="parent"
@@ -234,8 +252,8 @@
     <View
         android:layout_width="0dp"
         android:layout_height="1px"
-        android:background="@color/color_EFEFF1"
         android:layout_marginTop="20dp"
+        android:background="@color/color_EFEFF1"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintLeft_toLeftOf="@id/cv_head_view"
         app:layout_constraintRight_toRightOf="parent"

m-consultant/src/main/res/layout/consultant_layout_search_content.xml

@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/platform_white"
     android:orientation="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -29,12 +28,14 @@
                     android:id="@+id/tvSubject"
                     style="@style/consultant_FilterTextViewStyle"
                     android:layout_width="0dp"
+                    android:drawablePadding="4dp"
                     android:layout_weight="1"
                     android:width="0dp"
                     android:ellipsize="end"
+                    android:textStyle="bold"
                     android:singleLine="true"
-                    android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
-                    android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
+                    android:drawableEnd="@drawable/consult_ic_arrow_drwn_gray"
+                    android:drawableRight="@drawable/consult_ic_arrow_drwn_gray"
                     android:text="困扰"
                     android:textColor="@color/platform_color_242424" />
 
@@ -44,8 +45,10 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:width="0dp"
-                    android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
-                    android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
+                    android:textStyle="bold"
+                    android:drawablePadding="4dp"
+                    android:drawableEnd="@drawable/consult_ic_arrow_drwn_gray"
+                    android:drawableRight="@drawable/consult_ic_arrow_drwn_gray"
                     android:text="城市"
                     android:textColor="@color/platform_color_242424" />
 
@@ -55,8 +58,10 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:width="0dp"
-                    android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
-                    android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
+                    android:textStyle="bold"
+                    android:drawablePadding="4dp"
+                    android:drawableEnd="@drawable/consult_ic_arrow_drwn_gray"
+                    android:drawableRight="@drawable/consult_ic_arrow_drwn_gray"
                     android:text="价格"
                     android:textColor="@color/platform_color_242424" />
 
@@ -66,8 +71,10 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:width="0dp"
-                    android:drawableEnd="@drawable/filter_up_grey"
-                    android:drawableRight="@drawable/filter_up_grey"
+                    android:textStyle="bold"
+                    android:drawablePadding="4dp"
+                    android:drawableEnd="@drawable/filter_up_gray"
+                    android:drawableRight="@drawable/filter_up_gray"
                     android:text="@string/platform_filter"
                     android:textColor="@color/platform_color_242424" />
             </LinearLayout>

m-consultant/src/main/res/values/colors.xml

@@ -33,7 +33,10 @@
     <color name="color_ef8a4a">#EF8A4A</color>
     <color name="color_f6f6f7">#f6f6f7</color>
     <color name="color_6ec8f9">#6ec8f9</color>
+    <color name="color_6ec8f9_90">#E66ec8f9</color>
     <color name="color_b6bece">#B6BECE</color>
+    <color name="color_b6bece_90">#E6B6BECE</color>
     <color name="color_f5a082">#F5A082</color>
+    <color name="color_f5a082_90">#E6F5A082</color>
     <color name="color_f28e6b">#F28E6B</color>
 </resources>