Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

config.gradle

@@ -42,8 +42,8 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.48.7.16",
-            "m-consultant"    : "0.0.57.4",
+            "m-confide"       : "0.0.48.7.18",
+            "m-consultant"    : "0.0.57.6",
             "m-fm"            : "0.0.29.3",
             "m-user"          : "0.0.60.1",
             "m-home"          : "0.0.19.1",
@@ -75,7 +75,7 @@ ext {
             "ydl-webview"     : "0.0.38.27",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.48.3.5",
+            "m-audioim"       : "0.0.48.3.7",
             "ydl-flutter-base": "0.0.10.9",
 
             //以下 几乎不会动
@@ -121,7 +121,7 @@ ext {
             "ydl-webview"     : "0.0.38.24",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.48.3.5",
+            "m-audioim"       : "0.0.48.3.7",
             "ydl-flutter-base": "0.0.10.9",
 
             //以下 几乎不会动

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

@@ -172,8 +172,8 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
     private var headData: HeadData? = null //筛选数据
     private var isFromSplash = false
     private val props1 = JSONObject() //筛选标题埋点参数
-    private var fromPageType: Int = 0 //从哪个页面跳转过来的
-    private val fromPages = arrayOf("首页搜索", "找专家", "在线专家")
+    private var fromPageType: Int = 1 //从哪个页面跳转过来的
+    private val fromPages = arrayOf("首页", "搜索页面", "在线专家")
     private var isRecommend = false //埋点数据
     private var keyWord: String? = null //埋点数据
     private var isDoSearch: Boolean = false //埋点判断是否通过搜索进入埋点的
@@ -380,7 +380,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
 
         if (fromPageType != -1) {
-            doctorAdapter.setEntrance(fromPages[fromPageType])
+            doctorAdapter.setEntrance(fromPages[fromPageType],1)
         }
     }
 
@@ -1454,7 +1454,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
 
     override fun onResume() {
         super.onResume()
-        ActionCountUtils.count(ConsultBIConstants.ConsultEvent.APP_CONSULT_LIST_PAGE_VISIT)
+        ActionCountUtils.count(ConsultBIConstants.ConsultSearchListEvent.APP_CONSULT_SEARCH_LIST_PAGE_VISIT)
 
     }
 

m-consultant/src/main/java/com/yidianling/consultant/constants/ConsultBIConstants.kt

@@ -32,6 +32,19 @@ class ConsultBIConstants {
             const val APP_CONSULT_LIST_CHAT_CLICK: String = APP_CONSULT_LIST_PAGE + "app_consult_list_chat_click"//每个咨询师私聊
         }
     }
+
+    class ConsultSearchListEvent {
+        companion object {
+            private const val CONSULT_SEARCH_LIST_PAGE: String = "consul_search_list_page|"//APP咨询搜索列表页  partId
+
+            const val APP_CONSULT_SEARCH_LIST_PAGE_VISIT: String = CONSULT_SEARCH_LIST_PAGE + "consul_search_list_page_visit"//列表页浏览事件
+            const val APP_CONSULT_SEARCH_LIST_CONSULT_ITEM_CLICK: String = CONSULT_SEARCH_LIST_PAGE + "consult_search_list_doctor_click "//每个咨询师页面点击
+            const val APP_CONSULT_SEARCH_LIST_CHAT_CLICK: String = CONSULT_SEARCH_LIST_PAGE + "consult__search_list_chat_click"//每个咨询师私聊
+        }
+    }
+
+
+
     class UserMainEvent {
         companion object {