fix switch play list

config.gradle

@@ -9,12 +9,12 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.10",
-            "m-home"          : "0.0.23.50",
+            "m-home"          : "0.0.23.52",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.10",
 
-            "m-muse"          : "0.0.28.30",
+            "m-muse"          : "0.0.28.32",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
 
@@ -94,12 +94,12 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.10",
-            "m-home"          : "0.0.23.50",
+            "m-home"          : "0.0.23.52",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.8",
 
-            "m-muse"          : "0.0.28.30",
+            "m-muse"          : "0.0.28.32",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
             //-------------- 业务模块 API 层 --------------

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

@@ -64,6 +64,10 @@ class MeditationTypeAdapter(
 
                 holder.cvLayout?.setOnClickListener {
                     if (meditationType == 0){
+                        if (Utils.isFastClick()) {
+                            //防止连击
+                            return@setOnClickListener
+                        }
                         if (!ModularServiceManager.provide(IUserService::class.java).loginByOneKeyLogin(context,true)) {
                             return@setOnClickListener
                         }
@@ -79,6 +83,9 @@ 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))

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

@@ -18,12 +18,14 @@ 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.*
 
 /**
@@ -67,6 +69,9 @@ 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))
                 }

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

@@ -17,8 +17,10 @@ import com.ydl.ydlcommon.utils.StatusBarUtils.Companion.setTransparentForImageVi
 import com.ydl.ydlcommon.utils.StatusBarUtils.Companion.statusBarLightMode
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.remind.ToastHelper.Companion.show
+import com.yidianling.common.tools.ToastUtil
 import com.yidianling.home.http.MuseHttp
 import com.yidianling.muse.R
+import com.yidianling.muse.bean.MeditationPlayModuleBean
 import com.yidianling.muse.helper.MediaPlayerManager
 import com.yidianling.muse.utils.MediaPlayerTimeUtil
 import com.yidianling.muse.widget.QuitMeditationDialog
@@ -53,8 +55,8 @@ class PlayMeditationActivity : BaseActivity() {
 
     private var mediaListLink: String? = null
     
-    private val newPath =
-        "http://file.diyring.cc/UserRingWorksFile/0/50284096.mp3"
+    private var meditations = mutableListOf<MeditationPlayModuleBean.MeditationDetail>()
+    private var currentMeditation: MeditationPlayModuleBean.MeditationDetail? = null
 
     private var shareTitle = ""
     private var shareUrl = ""
@@ -118,10 +120,10 @@ class PlayMeditationActivity : BaseActivity() {
                 .subscribe(Consumer {
                     if (it.code.equals("200") && it.data != null) {
                         val module = it.data
-                        val currentMediaId = module.mediaId
+                        mediaId = module.mediaId
                         mediaListLink = module.playDetailUrl
                         module.mediaList?.forEach { meditationPlayBean ->
-                            if (meditationPlayBean.mediaId == currentMediaId) {
+                            if (meditationPlayBean.mediaId == mediaId) {
                                 mediaId = module?.mediaId ?: 0L
                                 val title = meditationPlayBean.title ?: "未知标题"
                                 val desc = meditationPlayBean.desc ?: ""
@@ -173,9 +175,18 @@ class PlayMeditationActivity : BaseActivity() {
                     if (it.code.equals("200") && it.data != null) {
 
                         val module = it.data
-                        val currentMediaId = module.mediaId
+                        mediaId = module.mediaId
+                        
+                        meditations.clear()
+                        
                         module.mediaList?.forEach { meditationPlayBean ->
-                            if (meditationPlayBean.mediaId == currentMediaId) {
+                            
+                            meditations.add(meditationPlayBean)
+                            
+                            if (meditationPlayBean.mediaId == mediaId) {
+
+                                currentMeditation = meditationPlayBean
+
                                 mediaId = module?.mediaId ?: 0L
                                 val title = meditationPlayBean.title
                                 val desc = meditationPlayBean.desc ?: ""
@@ -417,56 +428,75 @@ class PlayMeditationActivity : BaseActivity() {
         }
 
         exo_prev.setOnClickListener {
+
+            val currentPosition = meditations.indexOf(currentMeditation)
+            if (currentPosition > 0){
                 if (meditationId == null || mediaId == null) return@setOnClickListener
                 postPlayRecord(isQuit = 0, playTime = 0, isComplete = 0)
 
-            MediaPlayerManager.getInstance(this)?.setAudioPath(newPath)
-            isPlaying = if (MediaPlayerManager
-                    .getInstance(this@PlayMeditationActivity)?.getMediaPlayer()?.isPlaying == true
-            ) {
-                exo_play.setImageResource(R.drawable.icon_pause_play)
-                if (duration != null) {
-                    seekbar_play_progress.max = duration
-                }
-                mTimer.schedule(object : TimerTask() {
-                    override fun run() {
-                        seekbar_play_progress.progress = MediaPlayerManager
-                            .getInstance(this@PlayMeditationActivity)
-                            ?.getMediaPlayer()?.currentPosition ?: 0
-                    }
-                }, 0, 50)
-                true
+                val meditation = meditations[currentPosition - 1]
+                currentMeditation = meditation
+
+                mediaId = meditation.mediaId
+                val mediaCoverUrl = meditation.coverImageUrl
+                val mediaUrl = meditation.mediaUrl
+                val currentPosition = meditation.broadcastTime
+                val status = meditation.status
+
+                Glide.with(this)
+                    .load(mediaCoverUrl)
+                    .into(iv_bg)
+
+                tv_title.text = meditation.title
+                tv_content.text = meditation.desc
+
+                iv_collect.setImageResource(
+                    if (status == 0) {
+                        R.drawable.icon_play_meditation_collect
                     } else {
-                exo_play.setImageResource(R.drawable.icon_pause_meditation)
-                false
+                        R.drawable.icon_meditation_collected
+                    }
+                )
+
+                initMediaPlayer(mediaUrl,currentPosition)
+            }else{
+                ToastUtil.toastShort("当前已经是第一首")
             }
         }
 
         exo_next.setOnClickListener {
+            val currentPosition = meditations.indexOf(currentMeditation)
+            if (currentPosition < meditations.size - 1){
                 if (meditationId == null || mediaId == null) return@setOnClickListener
                 postPlayRecord(isQuit = 0, playTime = 0, isComplete = 0)
 
-            MediaPlayerManager.getInstance(this)?.setAudioPath(newPath)
-            isPlaying = if (MediaPlayerManager
-                    .getInstance(this@PlayMeditationActivity)?.getMediaPlayer()?.isPlaying == true
-            ) {
-                exo_play.setImageResource(R.drawable.icon_pause_play)
-                if (duration != null) {
-                    seekbar_play_progress.max = duration
-                }
-                mTimer.schedule(object : TimerTask() {
-                    override fun run() {
-                        if (!isSeekbarChanging) {
-                            seekbar_play_progress.progress = MediaPlayerManager
-                                .getInstance(this@PlayMeditationActivity)
-                                ?.getMediaPlayer()?.currentPosition ?: 0
-                        }
-                    }
-                }, 0, 50)
-                true
+                val meditation = meditations[currentPosition + 1]
+                currentMeditation = meditation
+
+                mediaId = meditation.mediaId
+                val mediaCoverUrl = meditation.coverImageUrl
+                val mediaUrl = meditation.mediaUrl
+                val currentPosition = meditation.broadcastTime
+                val status = meditation.status
+
+                Glide.with(this)
+                    .load(mediaCoverUrl)
+                    .into(iv_bg)
+
+                tv_title.text = meditation.title
+                tv_content.text = meditation.desc
+
+                iv_collect.setImageResource(
+                    if (status == 0) {
+                        R.drawable.icon_play_meditation_collect
                     } else {
-                exo_play.setImageResource(R.drawable.icon_pause_meditation)
-                false
+                        R.drawable.icon_meditation_collected
+                    }
+                )
+
+                initMediaPlayer(mediaUrl,currentPosition)
+            }else{
+                ToastUtil.toastShort("当前已经是最后一首")
             }
         }
 
@@ -565,10 +595,8 @@ class PlayMeditationActivity : BaseActivity() {
 
             if (mMediaPlayer?.isPlaying == true) {
                 exo_play.setImageResource(R.drawable.icon_pause_play)
-                true
             } else {
                 exo_play.setImageResource(R.drawable.icon_pause_meditation)
-                false
             }
 
             val currentPosition = mMediaPlayer?.currentPosition
@@ -753,7 +781,7 @@ class PlayMeditationActivity : BaseActivity() {
     }
 
     private fun stopPlay() {
-
+        MediaPlayerManager.getInstance(this)?.stop()
     }
 
     companion object {

m-muse/src/main/java/com/yidianling/muse/helper/MediaPlayerManager.kt

 package com.yidianling.muse.helper
 
 import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioManager
 import android.media.MediaPlayer
-import android.net.Uri
 import kotlin.properties.Delegates
 
 class MediaPlayerManager private constructor() {
@@ -10,9 +11,17 @@ class MediaPlayerManager private constructor() {
     private var listener:OnMediaPlayerManagerListener?=null
 
     fun setAudioPath(path: String){
+
+        val attrs = AudioAttributes.Builder()
+            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+            .setUsage(AudioAttributes.USAGE_MEDIA)
+            .setLegacyStreamType(AudioManager.STREAM_MUSIC)
+            .build()
+
         mPath = path
         mMediaPlayer?.reset()
-        mMediaPlayer?.setDataSource(mContext, Uri.parse(path))
+        mMediaPlayer?.setAudioAttributes(attrs)
+        mMediaPlayer?.setDataSource(path)
         mMediaPlayer?.prepareAsync()
         mMediaPlayer?.setOnPreparedListener {
             listener?.onPrepared(it)
@@ -39,10 +48,8 @@ class MediaPlayerManager private constructor() {
     }
 
     fun stop() {
-        if (mMediaPlayer?.isPlaying == true) {
         mMediaPlayer?.reset()
     }
-    }
 
     fun release() {
         mMediaPlayer?.reset()