feat: confideId url处理

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -623,7 +623,6 @@ class AudioHomeActivity :
                 userCloseCalling()
             }
 
-            ActionCountUtils.record("call_phone_page","call_phone_icon_click",)
             ActionCountUtils.count(
                 "shengwang_popup_layer_page|shengwang_popup_layer_refuse_click",
                 YdlCommonRouterManager.getYdlCommonRoute().getUid().toString(),

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

@@ -28,7 +28,6 @@ import com.ydl.webview.WebModularServiceUtils
 import com.ydl.ydlcommon.modular.findRouteService
 import com.ydl.ydlcommon.utils.TimeUtil
 import com.ydl.ydlnet.YDLHttpUtils
-import com.yidianling.common.tools.RxImageTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.im.api.service.IImService
 import com.yidianling.user.api.service.IUserService
@@ -174,7 +173,7 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
             val bottomSheet =
                 (it as BottomSheetDialog).findViewById<View>(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout?
             val behavior = BottomSheetBehavior.from(bottomSheet!!)
-            behavior.peekHeight = RxImageTool.dp2px(600f)
+            behavior.peekHeight = resources.displayMetrics.heightPixels / 2
             //true是跳过peekHeight，直接滑下去，false是可以滑动到顶部还可以保持peekHeight在滑下去
 //        behavior?.skipCollapsed=true
             behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {

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

@@ -7,13 +7,11 @@ import androidx.databinding.ObservableField
 import androidx.databinding.ObservableInt
 import androidx.recyclerview.widget.RecyclerView
 import com.ydl.confide.R
-import com.ydl.confide.api.ConfideRoute
 import com.ydl.confide.databinding.ItemConfideHomeRecentBinding
 import com.ydl.confide.databinding.ItemVideoShowBinding
 import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.event.IConfideHomeEvent
 import com.ydl.confide.intro.BindingViewHolder
-import com.ydl.ydlcommon.base.config.HttpConfig
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 
 class VideoShowAdapter(private val data: List<ConfideHomeBodyBean>?, private val event: IConfideHomeEvent) :
@@ -69,7 +67,10 @@ class RecentConfideAdapter(val data: List<ItemVideoShowViewModel>, private val e
                 "popupwindows_page_visit",
                 itemVideoShowViewModel.confideId ?: "", "2"
             )
-            event.consultantClick(itemVideoShowViewModel.linkUrl, itemVideoShowViewModel.doctorId)
+            event.consultantClick(
+                itemVideoShowViewModel.doctorId,
+                itemVideoShowViewModel.confideId
+            )
         }
     }
 
@@ -77,7 +78,6 @@ class RecentConfideAdapter(val data: List<ItemVideoShowViewModel>, private val e
 }
 
 class ItemVideoShowViewModel {
-    var linkUrl: String? = null
     val name = ObservableField<String>("")
     val coverUrl = ObservableField<String>("")
     val videoCoverUrl = ObservableField<String>("")
@@ -92,9 +92,6 @@ internal fun ItemVideoShowViewModel.mapOf(bean: ConfideHomeBodyBean): ItemVideoS
     videoCoverUrl.set(bean.coverVideoPicture)
     state.set(bean.confideLine ?: 0)
     doctorId = bean.doctorId
-    doctorId?.let {
-        linkUrl = HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(it)
-    }
     confideId = bean.confidedId
     return this
 }

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

@@ -132,9 +132,15 @@ class ConfideHomeEventImpl(context: Context, var confideHomeView: IConfideHomeCo
      * 最佳倾诉榜单--点我倾诉
      * @param linkUrl 跳转地址
      */
-    override fun consultantClick(linkUrl: String?, doctorId: String?) {
-        ConfideBottomSheetDialogFragment()
-            .showBottomSheetDialog(mContext as FragmentActivity, HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(doctorId.toString()), doctorId!!)
+    override fun consultantClick(doctorId: String?, confideId: String?) {
+        confideId?.let {
+            ConfideBottomSheetDialogFragment()
+                .showBottomSheetDialog(
+                    mContext as FragmentActivity,
+                    HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(it),
+                    doctorId!!
+                )
+        }
     }
 
 

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

@@ -73,7 +73,7 @@ interface IConfideHomeEvent {
      * 咨询师推荐--点我倾诉
      * @param linkUrl 跳转地址
      */
-    fun consultantClick(linkUrl: String?, doctorId: String?)
+    fun consultantClick(doctorId: String?, confideId: String?)
 
     fun videoShowClick(index: Int, data: List<ConfideHomeBodyBean>?)
 

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

@@ -10,13 +10,13 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.ydl.ydl_image.module.GlideApp
-import com.yidianling.common.tools.RxImageTool
 import com.ydl.confide.R
 import com.ydl.confide.home.bean.ConfideHomeBodyBean
 import com.ydl.confide.home.config.IConfideHomeConfig
 import com.ydl.confide.home.event.IConfideHomeEvent
+import com.ydl.ydl_image.module.GlideApp
 import com.ydl.ydlcommon.utils.ScreenUtil
+import com.yidianling.common.tools.RxImageTool
 import kotlinx.android.synthetic.main.confide_recommend_expert_item_view.view.*
 
 /**
@@ -243,7 +243,7 @@ class ConfideHomeRecommendExpertItemView(mContext: Context, private var confideH
     private fun click(bodyBean: ConfideHomeBodyBean) {
         when (bodyBean.confideLine) {//1在线 2离线 3通话中
             1, 3, 4 -> {
-                confideHomeEvent.consultantClick(bodyBean.linkUrl,bodyBean.doctorId)
+                confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId)
             }
             2 -> {
                 //跳转私聊 并发送自定义消息

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

@@ -98,7 +98,7 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
                 "1"
             )
 
-            confideHomeEvent.consultantClick(bodyBean.linkUrl,bodyBean.doctorId)
+            confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId)
         }
         img_head.setOnClickListener {
             ActionCountUtils.record("listen_counselor_list_page", "head_portrait_click", "2")
@@ -355,7 +355,7 @@ class ConfideHomeRecommendView(var view: IConfideHomeContract.View, context: Con
                 if (bodyBean.confideLine == 3) {
                 }
 
-                confideHomeEvent.consultantClick(bodyBean.linkUrl,bodyBean.doctorId)
+                confideHomeEvent.consultantClick(bodyBean.doctorId, bodyBean.confidedId)
             }
             2 -> {
                 //跳转私聊 并发送自定义消息

m-confide/src/main/java/com/ydl/confide/intro/ItemIntroHolder.kt

@@ -77,7 +77,7 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
                 ActionCountUtils.record(
                     "listen_counselor_content_play_page",
                     "listen_counselor_content_play_icon_click",
-                    item.confideId.toString(),
+                    item.confideId ?: "",
                     if (item.isVideo) "1" else "2",
                     "8"
                 )
@@ -140,7 +140,7 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
             ActionCountUtils.record(
                 "listen_counselor_content_play_page",
                 "listen_counselor_content_play_icon_click",
-                item.doctorId.toString(),
+                item.confideId ?: "",
                 if (item.isVideo) "1" else "2",
                 if (item.isVideo) "4" else "2"
             )
@@ -277,9 +277,10 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
     }
 
     private fun showDoctorDetail(item: VideoViewModel) {
-        if (!item.linkUrl.isNullOrBlank()) {
+        item.confideId?.let {
+            val url = HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(it)
             ConfideBottomSheetDialogFragment()
-                .showBottomSheetDialog(itemView.context as FragmentActivity, item.linkUrl!!, item.doctorId!!)
+                .showBottomSheetDialog(itemView.context as FragmentActivity, url, item.doctorId!!)
         }
     }
 }
@@ -300,7 +301,6 @@ class VideoViewModel {
     var uid: String? = null
     var doctorId: String? = null
     var confideId: String? = null
-    var linkUrl: String? = null
 }
 
 private fun genMinProgramPath(url: String): String {
@@ -333,9 +333,6 @@ internal fun VideoViewModel.mapOf(bean: ConfideHomeBodyBean): VideoViewModel {
     uid = bean.uid?.toString()
     doctorId = bean.doctorId
     confideId = bean.confidedId
-    doctorId?.let {
-        linkUrl = HttpConfig.MH5_URL + ConfideRoute.h5ExpertEval(it)
-    }
     return this
 }
 

m-confide/src/main/modular_api/com/ydl/confide/api/Route.kt

@@ -6,5 +6,5 @@ object ConfideRoute {
 
     fun h5ConfideIntro(id: String) = "jy/listenMask?listenerId=${id}"
 
-    fun h5ExpertEval(id: String) = "comment/evaList/${id}?listenerId=${id}"
+    fun h5ExpertEval(id: String) = "comment/evaList/${id}?listenerId=${id}&fromVideo=1"
 }
\ No newline at end of file