fix conflict

config.gradle

@@ -9,7 +9,7 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.12",
-            "m-home"          : "0.0.23.58",
+            "m-home"          : "0.0.23.63",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.10",
@@ -94,7 +94,7 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.12",
-            "m-home"          : "0.0.23.58",
+            "m-home"          : "0.0.23.63",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.8",

m-home/src/ydl/java/com/yidianling/home/adapter/YdlHomeAdapter.kt

@@ -229,10 +229,8 @@ class YdlHomeAdapter(private val mContext: Context,
             //壹点*冥想模块
             is HomeMuseViewHolder -> {
 
-                holder.museViewView.iv_video_background?.visibility = View.VISIBLE
                 holder.museViewView.video_view?.setOnInfoListener { mp, what, extra ->
                     if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START){
-                        holder.museViewView.video_view?.iv_video_background?.visibility = View.GONE
                         holder.museViewView.video_view?.setBackgroundColor(Color.TRANSPARENT)
                     }
                     true

m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

@@ -529,10 +529,8 @@ open class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterIm
             ActionCountUtils.count("daoyi_advertisement_page|daoyi_advertisement_visit","1")
             showConsultAssistantDialog()
 
-            iv_video_background?.visibility = View.VISIBLE
             video_view?.setOnInfoListener { mp, what, extra ->
                 if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START){
-                    iv_video_background?.visibility = View.GONE
                     video_view?.setBackgroundColor(Color.TRANSPARENT)
                 }
                 true

m-muse/src/main/res/layout/activity_play_meditation.xml

@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/_8c">
+    android:background="#282E3F20">
 
     <ImageView
         android:id="@+id/iv_bg"