remove uid & glide crossFade

config.gradle

@@ -9,7 +9,7 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.10",
-            "m-home"          : "0.0.23.52",
+            "m-home"          : "0.0.23.53",
             "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.10",
-            "m-home"          : "0.0.23.52",
+            "m-home"          : "0.0.23.53",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.8",

m-home/src/main/java/com/yidianling/home/MeditationTypeAdapter.kt

@@ -11,13 +11,11 @@ import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.launcher.ARouter
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
-import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.Utils
 import com.yidianling.home.model.bean.MeditationModuleBean
-import com.yidianling.home.router.HomeIn
-import com.yidianling.user.api.service.IUserService
 import kotlinx.android.synthetic.ydl.home_fragment.*
 
 class MeditationTypeAdapter(
@@ -55,6 +53,7 @@ class MeditationTypeAdapter(
                 holder.ivType?.let {
                     Glide.with(context)
                         .load(data[position].coverImageUrl)
+                        .transition(DrawableTransitionOptions.withCrossFade())
                         .into(it)
                 }
 
@@ -68,9 +67,6 @@ class MeditationTypeAdapter(
                             //防止连击
                             return@setOnClickListener
                         }
-                        if (!ModularServiceManager.provide(IUserService::class.java).loginByOneKeyLogin(context,true)) {
-                            return@setOnClickListener
-                        }
                         ARouter.getInstance().build("/muse/play")
                             .withLong("MEDITATION_ID", data[position].meditationId)
                             .withInt("MEDITATION_TYPE", meditationType)
@@ -83,9 +79,6 @@ class MeditationTypeAdapter(
                             //防止连击
                             return@setOnClickListener
                         }
-                        if (!ModularServiceManager.provide(IUserService::class.java).loginByOneKeyLogin(context,true)) {
-                            return@setOnClickListener
-                        }
                         val homeLink = "${homeLink}mark=$mark&cateId=$cateId&meditationId=${data[position].meditationId}"
                         if (!homeLink.isNullOrBlank()) {
                             NewH5Activity.start(context, H5Params(homeLink, null))
@@ -99,9 +92,6 @@ class MeditationTypeAdapter(
                         //防止连击
                         return@setOnClickListener
                     }
-                    if (!ModularServiceManager.provide(IUserService::class.java).loginByOneKeyLogin(context,true)) {
-                        return@setOnClickListener
-                    }
                     val moreLink = "${moreLink}mark=$mark&cateId=$cateId"
                     if (!moreLink.isNullOrBlank()) {
                         NewH5Activity.start(context, H5Params(moreLink, null))

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeMuseView.kt

@@ -2,11 +2,9 @@ package com.yidianling.home.ui.view
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.Color
 import android.graphics.SurfaceTexture
 import android.graphics.Typeface
 import android.media.MediaPlayer
-import android.os.Handler
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.StyleSpan
@@ -17,19 +15,18 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydl_image.module.GlideApp
-import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.Utils
 import com.yidianling.home.MeditationViewPagerAdapter
 import com.yidianling.home.R
 import com.yidianling.home.constract.HomeViewConfig
 import com.yidianling.home.event.IHomeEvent
 import com.yidianling.home.model.bean.MeditationModuleBean
-import com.yidianling.user.api.service.IUserService
 import kotlinx.android.synthetic.ydl.home_muse_view.view.*
 import java.util.concurrent.Executors
 
@@ -79,9 +76,6 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
                     //防止连击
                     return@setOnClickListener
                 }
-                if (!ModularServiceManager.provide(IUserService::class.java).loginByOneKeyLogin(context,true)) {
-                    return@setOnClickListener
-                }
                 if (!moreLink.isNullOrBlank()) {
                     NewH5Activity.start(context, H5Params(moreLink, null))
                 }
@@ -230,6 +224,7 @@ class HomeMuseView(private val mContext: Context, private var homeEvent: IHomeEv
             mMediaPlayer?.setOnErrorListener { mp, what, extra ->
                 Glide.with(this@HomeMuseView)
                     .load(videoUrl)
+                    .transition(withCrossFade())
                     .into(iv_video_background)
                 true
             }

m-muse/build.gradle

@@ -63,7 +63,7 @@ dependencies {
 //    solve build problem
 //    cannot access 'androidx.lifecycle.hasdefaultviewmodelproviderfactory'
 //    Comment out when compiling
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+//    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
     implementation "com.alibaba:arouter-api:$arouter_api"
 //    注意此处的依赖方式：kotlin中使用和java中使用方式有不同

m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.SeekBar
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.base.BaseActivity
@@ -195,6 +196,7 @@ class PlayMeditationActivity : BaseActivity() {
 
                                 Glide.with(this)
                                     .load(bgImageUrl)
+                                    .transition(DrawableTransitionOptions.withCrossFade())
                                     .into(iv_bg)
 
                                 val mediaUrl = meditationPlayBean.mediaUrl
@@ -320,6 +322,7 @@ class PlayMeditationActivity : BaseActivity() {
 
         Glide.with(this)
             .load(mediaCoverUrl)
+            .transition(DrawableTransitionOptions.withCrossFade())
             .into(iv_bg)
 
         iv_close.setOnClickListener {
@@ -445,6 +448,7 @@ class PlayMeditationActivity : BaseActivity() {
 
                 Glide.with(this)
                     .load(mediaCoverUrl)
+                    .transition(DrawableTransitionOptions.withCrossFade())
                     .into(iv_bg)
 
                 tv_title.text = meditation.title
@@ -481,6 +485,7 @@ class PlayMeditationActivity : BaseActivity() {
 
                 Glide.with(this)
                     .load(mediaCoverUrl)
+                    .transition(DrawableTransitionOptions.withCrossFade())
                     .into(iv_bg)
 
                 tv_title.text = meditation.title
@@ -552,6 +557,9 @@ class PlayMeditationActivity : BaseActivity() {
         })
 
         mMediaPlayer?.setOnCompletionListener {
+            postPlayRecord(isQuit = 0,
+                playTime = mMediaPlayer?.duration?:0,
+                isComplete = 1)
             isPlaying = if (it.isPlaying) {
                 exo_play.setImageResource(R.drawable.icon_pause_play)
                 true
@@ -592,7 +600,6 @@ class PlayMeditationActivity : BaseActivity() {
             && MediaPlayerManager.getInstance(this)?.getAudioPath() == path
         ) {
             MediaPlayerManager.getInstance(this)?.play()
-
             if (mMediaPlayer?.isPlaying == true) {
                 exo_play.setImageResource(R.drawable.icon_pause_play)
             } else {
@@ -741,6 +748,7 @@ class PlayMeditationActivity : BaseActivity() {
         if (event != null) {
             Glide.with(this)
                 .load(event.mediaCoverUrl)
+                .transition(DrawableTransitionOptions.withCrossFade())
                 .into(iv_bg)
 
             tv_title.text = event.title