Merge branch 'feature/yk_release' into 'release'

Feature/yk release

See merge request app_android_lib/YDL-Component!150

config.gradle

@@ -7,6 +7,8 @@ ext {
             //第三步 若干
             "m-confide"       : "0.0.50.21",
             "m-consultant"    : "0.0.60.63",
+            "m-confide"       : "0.0.50.20",
+            "m-consultant"    : "0.0.60.64",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.48",
             "m-home"          : "0.0.23.90",
@@ -93,6 +95,8 @@ ext {
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
+            "m-confide"       : "0.0.50.20",
+            "m-consultant"    : "0.0.60.64",
             "m-confide"       : "0.0.50.21",
             "m-consultant"    : "0.0.60.63",
             "m-fm"            : "0.0.30.09",

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

@@ -141,7 +141,7 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
                 specialityCrowd.add(it.key)
             }
             val specialityCrowdMap = HashMap<String, Any>()
-            specialityCrowdMap["in"] = specialityCrowdMap
+            specialityCrowdMap["in"] = specialityCrowd
             filterMap["doctor_tag_list.list.tag_id"] = specialityCrowdMap
         }
         // 学历
@@ -157,16 +157,11 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
         // 其它
         if (allFilter.others.isNotEmpty()) {
             val gender = ArrayList<String?>()
-//            val bookIngStatusList = ArrayList<String>()
             allFilter.others.forEach {
                 when (it.key1) {
                     "gender" -> {
                         gender.add(it.value1)
                     }
-//                    "booking_status" -> {
-//                        bookIngStatusList.add("1")
-//                        bookIngStatusList.add("2")
-//                    }
                     else -> {
                         filterMap[it.key1] = it.value1
                     }
@@ -177,11 +172,6 @@ class ExpertSearchPresenter : SimplePresenter<IExpertSearchView>() {
                 genderMap["in"] = gender
                 filterMap["gender"] = genderMap
             }
-//            if (bookIngStatusList.size>0){
-//                val bookStatusMap = HashMap<String, Any>()
-//                bookStatusMap["in"] = bookIngStatusList
-//                filterMap["booking_status"] = bookStatusMap
-//            }
         }
         map["filter"] = filterMap