feat: 情绪训练营代码提交

config.gradle

@@ -6,7 +6,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.50.32",
-            "m-consultant"    : "0.0.60.68",
+            "m-consultant"    : "0.0.60.69",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.54",
             "m-home"          : "0.0.23.90",
@@ -93,7 +93,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
             "m-confide"       : "0.0.50.32",
-            "m-consultant"    : "0.0.60.68",
+            "m-consultant"    : "0.0.60.69",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.54",
             "m-home"          : "0.0.23.90",

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

@@ -406,6 +406,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
         }
 
         getPresenter().fetchListHead()
+        recommendListView.requestData(initCategory)
         if (isRefresh) {
             refresh(false)
         }
@@ -1471,7 +1472,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
 
     override fun onRefresh() {
         refresh(false)
-        recommendListView.requestData()
+        recommendListView.requestData(initCategory)
     }
 
     //刷新列表

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

@@ -344,6 +344,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
         allFilter.showType.key = initShowType
 
         getPresenter().fetchListHead()
+        recommendListView.requestData("")
 
         v_loading.visibility = View.VISIBLE
         v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
@@ -1342,8 +1343,7 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
 
     override fun onRefresh() {
         refresh(false)
-        recommendListView.requestData()
-
+        recommendListView.requestData("")
     }
 
     /**

m-consultant/src/main/java/com/yidianling/consultant/http/ExpertSearchHttpImpl.kt

@@ -44,17 +44,12 @@ class ExpertSearchHttpImpl : IExpertSearchHttp {
         return searchApi!!
     }
 
-//    override fun searchDoctor(params: String?): Observable<BaseAPIResponse<ExpertSearchBean>> {
-//        return getSearchApi().searchDoctorService(HttpConfig.JAVA_BASE_URL+ "doctor/nlist?"+params)
-//
-//    }
-
     override fun getExpertList(map: Map<String, Any>): Observable<BaseAPIResponse<ExpertBean>> {
         return  getSearchApi().getExpertList(map)
     }
 
-    override fun getBigShotData(): Observable<BaseAPIResponse<ExpertSearchTopShowBean>> {
-        return getSearchApi().getBigShotData()
+    override fun getBigShotData(map:Map<String,Any>): Observable<BaseAPIResponse<ExpertSearchTopShowBean>> {
+        return getSearchApi().getBigShotData(map)
     }
 
 

m-consultant/src/main/java/com/yidianling/consultant/http/IExpertSearchHttp.kt

@@ -37,6 +37,6 @@ interface IExpertSearchHttp{
     /**
      * 获取大咖专区和顶部推荐数据数据
      */
-    fun getBigShotData(): Observable<BaseAPIResponse<ExpertSearchTopShowBean>>
+    fun getBigShotData(map:Map<String,Any>): Observable<BaseAPIResponse<ExpertSearchTopShowBean>>
 
 }
\ No newline at end of file

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

@@ -77,7 +77,7 @@ interface SearchApi {
     //获取咨询助理uid
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA, "Content-Type:application/json")
     @POST("doctor/querySpecialTopic")
-    fun getBigShotData(): Observable<BaseAPIResponse<ExpertSearchTopShowBean>>
+    fun getBigShotData(@Body map: Map<String,@JvmSuppressWildcards Any>): Observable<BaseAPIResponse<ExpertSearchTopShowBean>>
 
 
     @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)

m-consultant/src/main/java/com/yidianling/consultant/ui/view/topView/RecommendListView.kt

@@ -2,6 +2,7 @@ package com.yidianling.consultant.ui.view.topView
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.text.TextUtils
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import android.util.AttributeSet
@@ -71,12 +72,16 @@ class RecommendListView : LinearLayout {
         recommendViewPagerIndicator.visibility = View.GONE
         itemListView.visibility = View.GONE
 
-        requestData()
+//        requestData()
     }
 
     @SuppressLint("CheckResult")
-    fun requestData() {
-        ExpertSearchHttpImpl.getInstance().getBigShotData()
+    fun requestData(cateId:String) {
+        val map = HashMap<String, Any>()
+        if (!TextUtils.isEmpty(cateId)){
+            map["entrance"] = cateId
+        }
+        ExpertSearchHttpImpl.getInstance().getBigShotData(map)
             .subscribeOn(Schedulers.io())
             .compose(RxUtils.resultJavaData())
             .map { it }
@@ -114,7 +119,7 @@ class RecommendListView : LinearLayout {
     /**
      * 设置数据
      */
-    fun setData() {
+    private fun setData() {
         // 顶部viewpager数据
         if (mSceneSpecialTopicList.isNotEmpty()) {
 

ydl-tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ErrorMessageConverter.java

@@ -690,7 +690,7 @@ public class ErrorMessageConverter {
                     return getLocalizedString(R.string.TUIKitErrorSVRNoSuccessResult); // @"批量操作无成功结果";
                 case BaseConstants.ERR_TO_USER_INVALID:
                     return getLocalizedString(R.string.TUIKitErrorSVRToUserInvalid); // @"IM: 无效接收方";
-                case BaseConstants.ERR_REQUEST_TIMEOUT:
+                case BaseConstants.ERR_REQUEST_TIME_OUT:
                     return getLocalizedString(R.string.TUIKitErrorSVRRequestTimeout); // @"请求超时";
                 case BaseConstants.ERR_INIT_CORE_FAIL:
                     return getLocalizedString(R.string.TUIKitErrorSVRInitCoreFail); // @"INIT CORE模块失败";