Merge branch 'feat/yk_sort_2' into 'release'

feat: 修改筛选框价格文案，价格筛选传值字段使用后端返回的字段

See merge request app_android_lib/YDL-Component!237

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

@@ -116,15 +116,15 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
             filterMap["product_specs.spec_id"] = wayMap
         }
         // 服务均价
-        if (allFilter.priceRanges != null) {
+        allFilter.priceRanges?.let {
             val avgPriceMap = HashMap<String, Any?>()
-            if (!TextUtils.isEmpty(allFilter.priceRanges?.min_price)){
-                avgPriceMap["gte"] = allFilter.priceRanges?.min_price
+            if (!TextUtils.isEmpty(it.min_price)){
+                avgPriceMap["gte"] = it.min_price
             }
-            if (!TextUtils.isEmpty(allFilter.priceRanges?.max_price)) {
-                avgPriceMap["lte"] = allFilter.priceRanges?.max_price
+            if (!TextUtils.isEmpty(it.max_price)) {
+                avgPriceMap["lte"] = it.max_price
             }
-            filterMap["avg_price"] = avgPriceMap
+            filterMap[it.key1] = avgPriceMap
         }
         // 年龄
         if (allFilter.ages.isNotEmpty()) {

m-consultant/src/main/java/com/yidianling/consultant/model/bean/PriceRangesItem.kt

 package com.yidianling.consultant.model.bean
 
-import com.google.gson.annotations.SerializedName
 
 data class PriceRangesItem(
-
-        @field:SerializedName("min_price")
-        var min_price: String? = null,
-
-        @field:SerializedName("max_price")
-        var max_price: String? = null,
-
-        @SerializedName("recommend_percent")
-        var recommend_percent: String? = null,
-
-        var display_range:String? = null
+    var min_price: String? = null,
+    var max_price: String? = null,
+    var recommend_percent: String? = null,
+    var display_range: String? = null,
+    var key1: String = "avg_price"
 )
\ No newline at end of file

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

@@ -59,7 +59,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/platform_dp_28"
-                android:text="服务均价"
+                android:text="价格"
                 android:textColor="@color/platform_color_242424"
                 android:textSize="@dimen/platform_dp_16"
                 android:textStyle="bold" />