feat: 私聊消息跳转倾诉列表问题修复

config.gradle

@@ -5,12 +5,12 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.49.94",
+            "m-confide"       : "0.0.49.95",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.18",
             "m-home"          : "0.0.23.74",
-            "m-im"            : "0.0.21.46",
+            "m-im"            : "0.0.21.47",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
 
@@ -35,7 +35,7 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.23",
             //第一步
-            "ydl-platform"    : "0.0.41.18",
+            "ydl-platform"    : "0.0.41.21",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.80",
@@ -90,12 +90,12 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.49.94",
+            "m-confide"       : "0.0.49.95",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.18",
             "m-home"          : "0.0.23.74",
-            "m-im"            : "0.0.21.46",
+            "m-im"            : "0.0.21.47",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.8",
 
@@ -118,7 +118,7 @@ ext {
             //mdt组件
             "ydl-tuicore"   : "0.0.23",
             //第一步
-            "ydl-platform"    : "0.0.41.18",
+            "ydl-platform"    : "0.0.41.21",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.80",

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

 package com.ydl.confide.home
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
 import android.graphics.Color
 import android.os.Build
@@ -25,9 +26,11 @@ 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.modular.service.ConfideWebServiceImpl
 import com.ydl.confide.home.presenter.ConfideHomePresenterImpl
 import com.ydl.confide.home.util.ConfideHomeUtils
 import com.ydl.confide.home.widget.FilterItemDecoration
+import com.ydl.confide.intro.VideoViewModel
 import com.ydl.confide.router.PhoneCallIn
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
@@ -182,6 +185,8 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
     override fun initDataAndEvent() {
         //来自首页倾诉红包入口
         val isFromRed = intent.getBooleanExtra(IYDLRouterConstant.EXTRA_RED_PACKET,false)
+        val confidedId = intent.getStringExtra(IYDLRouterConstant.EXTRA_CONFIDEDID)
+        val doctorId = intent.getStringExtra(IYDLRouterConstant.EXTRA_DOCTORID)
 
         isSplash = intent.getBooleanExtra("isSplash", false)
         //初始化View
@@ -206,6 +211,18 @@ class ConfideHomeActivity : BaseLceActivity<IConfideHomeContract.View,IConfideHo
         if (isFromRed){
             ToastUtil.toastLong(this@ConfideHomeActivity,"红包已领取成功 可立即点击拨打")
         }
+
+        if (!confidedId.isNullOrBlank() && !doctorId.isNullOrBlank()){
+            ConfideWebServiceImpl().connectionJava(confidedId.toInt(), 3, this@ConfideHomeActivity, null) {
+                showDoctorDetail(confidedId,doctorId)
+            }
+        }
+    }
+
+    private fun showDoctorDetail(confideId: String,doctorId:String) {
+            val url = HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(confideId)
+            ConfideBottomSheetDialogFragment()
+                .showBottomSheetDialog(this@ConfideHomeActivity, url, doctorId)
     }
 
     override fun onResume() {

m-im/src/main/java/com/yidianling/im/session/extension/CustomAttachmentShareMsg.java

@@ -21,27 +21,29 @@ public class CustomAttachmentShareMsg extends CustomAttachment {
     private final String KEY_SHAREPOPULAR="sharePopular";// 分享的人气
     private final String KEY_SHARE_JUMP_URL="url";// 分享的跳转链接
 
+    private final String KEY_CONFIDEDID="confidedId";//倾诉id
+    private final String KEY_DOCTORID="doctorId";
+
     private String shareUrl;
     private String sharePrice;
     //分享类型，0：测试；1，课程；2，文章；3：倾诉
     private int shareType;
 
+    private String confidedId;
+    private String doctorId;
+
     public CustomAttachmentShareMsg() {
         super(CustomAttachmentType.TYPE_PUSH_SHARE);
     }
 
-    public CustomAttachmentShareMsg(String url, String money, ShareMsgTypeEnum typeEnum) {
-        super(CustomAttachmentType.TYPE_PUSH_SHARE);
-        this.shareUrl = url;
-        this.sharePrice = money;
-        this.shareType = typeEnum.value();
-    }
 
     @Override
     protected void parseData(JSONObject data) {
         this.shareUrl=data.getString(KEY_SHARE_JUMP_URL);
         this.sharePrice =data.getString(KEY_PRICE);
         this.shareType = data.getInteger(KEY_SHARETYPE);
+        this.confidedId = data.getString(KEY_CONFIDEDID);
+        this.doctorId = data.getString(KEY_DOCTORID);
     }
 
     @Override
@@ -50,6 +52,8 @@ public class CustomAttachmentShareMsg extends CustomAttachment {
         data.put(KEY_SHARE_JUMP_URL, shareUrl);
         data.put(KEY_PRICE, sharePrice);
         data.put(KEY_SHARETYPE, shareType);
+        data.put(KEY_CONFIDEDID, confidedId);
+        data.put(KEY_DOCTORID, doctorId);
         return data;
     }
 
@@ -64,4 +68,11 @@ public class CustomAttachmentShareMsg extends CustomAttachment {
     public int getShareType() {
         return shareType;
     }
+    public String getConfidedId() {
+        return confidedId;
+    }
+
+    public String getDoctorId() {
+        return doctorId;
+    }
 }

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderReceivedMoney.java

@@ -59,7 +59,9 @@ public class MsgViewHolderReceivedMoney extends MsgViewHolderBase {
         num = customAttachReceivedMoney.getNum();
         isNewOrder = customAttachReceivedMoney.getNewOrder();
 
-        if (title != null) tit.setText(title);
+        if (title != null) {
+            tit.setText(title);
+        }
         if (orPay == 1) {
             //支付成功
             if (num != null) {

ydl-platform/src/main/java/com/ydl/ydlcommon/router/IYDLRouterConstant.kt

@@ -78,6 +78,8 @@ interface IYDLRouterConstant{
         const val EXTRA_SHOWTYPE  = "showType"
         const val EXTRA_KEYWORD   = "keyword"
         const val EXTRA_RED_PACKET = "by_red_packet"
+        const val EXTRA_CONFIDEDID = "confidedId"
+        const val EXTRA_DOCTORID = "doctorId"
 
         /**
          * 冥想模块额外参数