Merge remote-tracking branch 'origin/release' into feature/yk_release

# Conflicts:
#	config.gradle

config.gradle

@@ -5,6 +5,8 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
+            "m-confide"       : "0.0.50.21",
+            "m-consultant"    : "0.0.60.63",
             "m-confide"       : "0.0.50.20",
             "m-consultant"    : "0.0.60.64",
             "m-fm"            : "0.0.30.09",
@@ -95,6 +97,8 @@ ext {
             //第三步 若干
             "m-confide"       : "0.0.50.20",
             "m-consultant"    : "0.0.60.64",
+            "m-confide"       : "0.0.50.21",
+            "m-consultant"    : "0.0.60.63",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.48",
             "m-home"          : "0.0.23.90",

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

@@ -59,6 +59,11 @@ internal class ItemIntroHolder(binding: ItemExpertIntroBinding) :
 
     fun onBind(item: VideoViewModel) {
         vm = item
+        if (vm?.isVideo == true) {
+            binding.ivCover.visibility = View.GONE
+        } else {
+            binding.ivCover.visibility = View.VISIBLE
+        }
         binding.layoutCall.setOnClickListener {
             if (!PhoneCallIn.loginByOneKeyLogin(itemView.context, true)) {
                 return@setOnClickListener

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

@@ -28,8 +28,6 @@
             android:src="@drawable/confide_back"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:shape="@{1}"
-            app:shapeBg="@{0x33000000}"
             tools:ignore="ContentDescription" />
 
 

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

@@ -28,7 +28,7 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!--<ImageView
+        <ImageView
             android:id="@+id/ivCover"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -36,7 +36,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/videoView"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />-->
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/ivPlay"