salute yxl && 18713 18714

config.gradle

@@ -5,11 +5,11 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.27",
+            "m-confide"       : "0.0.50.35",
             "m-consultant"    : "0.0.60.68",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.54",
-            "m-home"          : "0.0.23.90",
+            "m-home"          : "0.0.23.93",
             "m-im"            : "0.0.21.58",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
@@ -92,11 +92,11 @@ ext {
     ydlCompileVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.50.27",
+            "m-confide"       : "0.0.50.35",
             "m-consultant"    : "0.0.60.68",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.54",
-            "m-home"          : "0.0.23.90",
+            "m-home"          : "0.0.23.93",
             "m-im"            : "0.0.21.58",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",

m-confide/src/main/java/com/ydl/confide/home/ConfideHomeActivity.kt

@@ -8,6 +8,11 @@ import android.os.Build
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.Animation
+import android.view.animation.DecelerateInterpolator
+import android.view.animation.TranslateAnimation
+import android.widget.RelativeLayout
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
@@ -29,6 +34,7 @@ import com.ydl.confide.home.event.ConfideHomeEventImpl
 import com.ydl.confide.home.event.IConfideHomeEvent
 import com.ydl.confide.home.listener.ConfideHomeRecycleViewListener
 import com.ydl.confide.home.listener.ConfideHomeRecyleSuspendListener
+import com.ydl.confide.home.listener.HideScrollListener
 import com.ydl.confide.home.modular.service.ConfideWebServiceImpl
 import com.ydl.confide.home.presenter.ConfideHomePresenterImpl
 import com.ydl.confide.home.util.ConfideHomeUtils
@@ -63,7 +69,7 @@ import kotlinx.android.synthetic.main.confide_title_bar.*
 @Route(path = ConfideRoute.R_CONFIDE_HOME)
 class ConfideHomeActivity :
     BaseLceActivity<IConfideHomeContract.View, IConfideHomeContract.Presenter>(),
-    IConfideHomeContract.View, XRecyclerView.LoadingListener {
+    IConfideHomeContract.View, XRecyclerView.LoadingListener,HideScrollListener {
 
     private var listenFree = false
 
@@ -218,7 +224,6 @@ class ConfideHomeActivity :
 //        mPresenter.loadLocalData(this)
         rv_list.refresh()
         initClick()
-        initQuickConsultDialog()
         initStatusBar()
 //        ModularServiceManager.provide(IConsultantService::class.java).showConfideListDialog(this)
 //        ActionCountUtils.count("daoyi_advertisement_page|daoyi_advertisement_visit","17")
@@ -287,41 +292,6 @@ class ConfideHomeActivity :
     }
 
     /**
-     * 监听控制一键倾诉浮层的显示与隐藏
-     */
-    private fun initQuickConsultDialog() {
-        rv_list.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                super.onScrollStateChanged(recyclerView, newState)
-                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    quick_consult_card.visibility = View.VISIBLE
-                }
-//                val layoutManager: RecyclerView.LayoutManager = recyclerView?.layoutManager!!
-//                val linearManager = layoutManager as LinearLayoutManager
-//                if (linearManager is LinearLayoutManager) {
-//                    val firstItemPosition = linearManager.findFirstCompletelyVisibleItemPosition()
-//                    if (firstItemPosition > 3) {
-//                        quick_consult_card.visibility = View.VISIBLE
-//                    }else {
-//                        quick_consult_card.visibility = View.GONE
-//                    }
-//                }
-            }
-
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                super.onScrolled(recyclerView, dx, dy)
-                if (dy <= 0) {
-                    //向上滚动恢复显示
-                    quick_consult_card.visibility = View.VISIBLE
-                } else {
-                    //向下滚动隐藏
-                    quick_consult_card.visibility = View.GONE
-                }
-            }
-        })
-    }
-
-    /**
      * 初始化一键倾诉浮层的点击事件
      */
     private fun initClick() {
@@ -371,7 +341,7 @@ class ConfideHomeActivity :
         }
         //用于滑动筛选模块置顶
         if (null == listScrollListener) {
-            listScrollListener = ConfideHomeRecycleViewListener()
+            listScrollListener = ConfideHomeRecycleViewListener(this)
         }
         rv_list.addOnScrollListener(listScrollListener!!)
         //用于显示筛选悬浮按钮
@@ -655,4 +625,19 @@ class ConfideHomeActivity :
         }
         super.onBackPressed()
     }
+
+    override fun onHide() {
+        val lp =  quick_consult_card.layoutParams as RelativeLayout.LayoutParams
+        quick_consult_card.animate().translationY(
+            (quick_consult_card.height + lp.bottomMargin).toFloat()
+        ).setDuration(1000)
+            .interpolator = AccelerateInterpolator(3f)
+    }
+
+    override fun onShow() {
+        quick_consult_card.animate().translationY(0F).setDuration(1000)
+            .interpolator = DecelerateInterpolator(3f)
+    }
+
+
 }
\ No newline at end of file

m-confide/src/main/java/com/ydl/confide/home/listener/ConfideHomeRecycleViewListener.kt

@@ -13,7 +13,7 @@ import com.yidianling.common.tools.RxImageTool
  * @Company 壹点灵
  * @date 2018/9/25
  */
-class ConfideHomeRecycleViewListener : RecyclerView.OnScrollListener() {
+class ConfideHomeRecycleViewListener() : RecyclerView.OnScrollListener() {
     /**
      * 筛选模块位置
      */
@@ -23,6 +23,15 @@ class ConfideHomeRecycleViewListener : RecyclerView.OnScrollListener() {
      */
     private var move = false
 
+    private lateinit var listener: HideScrollListener
+
+    private var visible = true
+
+    constructor(listener: HideScrollListener):this(){
+        this.listener = listener
+    }
+
+
     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
         super.onScrolled(recyclerView, dx, dy)
         //在这里进行第二次滚动（最后的距离）
@@ -37,6 +46,15 @@ class ConfideHomeRecycleViewListener : RecyclerView.OnScrollListener() {
                 recyclerView.scrollBy(0, top)
             }
         }
+
+        if (dy>0 && visible){
+            visible = false
+            listener.onHide()
+        }else if (dy<0 && !visible){
+            visible = true
+            listener.onShow()
+        }
+
     }
 
     /**
@@ -82,4 +100,6 @@ class ConfideHomeRecycleViewListener : RecyclerView.OnScrollListener() {
 //            move = true
 //        }
     }
+
+
 }
\ No newline at end of file

m-confide/src/main/java/com/ydl/confide/home/listener/HideScrollListener.kt

 package com.ydl.confide.home.listener
 
 interface HideScrollListener {
+    fun onHide()
+    fun onShow()
 }
\ No newline at end of file

m-confide/src/main/res/layout/confide_home_activity.xml

@@ -33,8 +33,7 @@
             android:elevation="2dp"
             android:paddingBottom="1dp"
             android:paddingRight="@dimen/platform_dp_8"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:visibility="visible">
 
             <ImageView
                 android:id="@+id/confide_logo"

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -325,7 +325,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
 
         boolean isExpert = null!=ActionHandlerStorage.getL(sessionId)&&ActionHandlerStorage.getL(sessionId).getUserType() == 2;
 
-        ServiceImpl.Companion.getInstance().canViewConsult("")
+        ServiceImpl.Companion.getInstance().canViewConsult(ActionHandlerStorage.getL(sessionId).getInfo().doctorId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(response -> {

m-im/src/main/java/com/yidianling/uikit/custom/widget/ConfideOrderInfoView.java

@@ -3,6 +3,7 @@ package com.yidianling.uikit.custom.widget;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -20,6 +21,7 @@ import com.netease.nimlib.sdk.msg.model.IMMessage;
 import com.ydl.confide.api.ConfideRoute;
 import com.ydl.confide.api.IConfideService;
 import com.ydl.ydlcommon.base.config.HttpConfig;
+import com.ydl.ydlcommon.router.IYDLRouterConstant;
 import com.ydl.ydlcommon.utils.Utils;
 import com.yidianling.common.tools.RxImageTool;
 import com.yidianling.common.tools.ToastUtil;
@@ -34,8 +36,12 @@ import com.ydl.ydlcommon.utils.StringUtils;
 import com.ydl.ydlcommon.utils.YDLCacheUtils;
 
 
+import java.util.HashMap;
+
+import kotlin.Pair;
 
 import static com.ydl.ydlcommon.modular.ModularServiceManagerKt.findRouteService;
+import static com.ydl.ydlcommon.modular.ModularServiceManagerKt.route;
 
 /**
  * Created by haorui on 2019/5/22.
@@ -137,6 +143,9 @@ public class ConfideOrderInfoView extends RelativeLayout {
             }
         });
 
+        String R_CONFIDE_HOME = "/confide/home";
+
+
         //点击整个view，跳转订单详情页面
         setOnClickListener(view -> {
 
@@ -147,10 +156,11 @@ public class ConfideOrderInfoView extends RelativeLayout {
             String remainTime = ActionHandlerStorage.getL(mSessionId).getInfo().listenOrderRemainTime;
 
             if(TextUtils.isEmpty(remainTime)){
-                if (!TextUtils.isEmpty(info.listenOrderUrl)) {//订单详情
-                    H5Params h5Params = new H5Params(info.listenOrderUrl, "订单详情");
-                    NewH5Activity.start(mContext, h5Params);
-                }
+                Pair<String,String> confideId = new Pair<>(IYDLRouterConstant.EXTRA_CONFIDEDID,
+                            info.listenerId);
+                Pair<String,String> doctorId = new Pair<>(IYDLRouterConstant.EXTRA_DOCTORID,
+                            info.doctorId);
+                route(getContext(),R_CONFIDE_HOME,confideId,doctorId);
             }else {
                 if (info!=null){
                     String confideId = info.listenerId;
@@ -209,4 +219,7 @@ public class ConfideOrderInfoView extends RelativeLayout {
         });
         MessageListPanelHelper.getInstance().notifyAddMessage(message);
     }
+
+
+
 }

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模块失败";