Merge branch 'feat/fq/fq_consult_location_4.4.04' into 'd/v4.4.04'

feat: 咨询师列表页地区

See merge request app_android_lib/YDL-Component!257

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

@@ -240,6 +240,8 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
         fieldsMap["open_chat_agency"] = true
         fieldsMap["service_status"] = true
         fieldsMap["is_free_today"] = true
+        fieldsMap["display_region"] = true
+        fieldsMap["has_servicefree_experience"] = true
         map["fields"] = fieldsMap
 
         val optionsMap = HashMap<String, Any?>()

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

@@ -177,14 +177,14 @@ class ExpertSearchAdapter(
 
 
             //省市
-            if (!TextUtils.isEmpty(itemBean.province)) {
-                holder.tvCity.text = itemBean.province + "·" + itemBean.city
+            if (!TextUtils.isEmpty(itemBean.display_region)) {
+                holder.tvCity.text = itemBean.display_region
             } else {
                 holder.tvCity.text = ""
             }
 
             //公益图标,不与其他图标冲突
-            if (1 == itemBean.has_servicefree_consult) {
+            if (1 == itemBean.has_servicefree_experience) {
                 if (null != itemBean.icons && !TextUtils.isEmpty(itemBean.icons.service_free_icon)) {
                     expertSearchView.showImage(
                         itemBean.icons.service_free_icon,

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

@@ -108,11 +108,11 @@ data class ExpertServiceItem(
 //     */
 //    var listen_status: Int,
 
-    var open_chat_agency:Int,
+    var open_chat_agency: Int,
 
-    var service_status:Int,
+    var service_status: Int,
 
-    var is_free_today:Int,
+    var is_free_today: Int,
 
     /**
      * 私聊人数
@@ -143,26 +143,39 @@ data class ExpertServiceItem(
     /**
      * 是否是头部headView
      */
-    val is_head_view:Boolean=false,
+    val is_head_view: Boolean = false,
     /**
      * 搜索词
      */
-    val search_content:String,
+    val search_content: String,
     /**
      * 联想词
      */
-    val related_word:String
+    val related_word: String,
+    /**
+     * 地区
+     */
+    val display_region: String,
+
+    /**
+     * 是否展示公益图标
+     */
+    val has_servicefree_experience: Int?
+
+
 ) {
-    constructor(is_head_view: Boolean,search_content: String,related_word:String) : this("","","","","",
-        1,1,1,"",false,true,
-        1f,false,0,"","","",1f,1f,
-        null,null,1,1,1,1,
-    "","","","",null,is_head_view,search_content,related_word)
+    constructor(is_head_view: Boolean, search_content: String, related_word: String) : this(
+        "", "", "", "", "",
+        1, 1, 1, "", false, true,
+        1f, false, 0, "", "", "", 1f, 1f,
+        null, null, 1, 1, 1, 1,
+        "", "", "", "", null, is_head_view, search_content, related_word, "", 1
+    )
 }
 
 data class FeatureTag(
-    val tag_id:String,
-    val tag_name:String,
-    val is_highlight:Boolean,   // 是否高亮
-    val type:String             // 标签类型
+    val tag_id: String,
+    val tag_name: String,
+    val is_highlight: Boolean,   // 是否高亮
+    val type: String             // 标签类型
 )
\ No newline at end of file