Skip to content

Y
YDL-Component-Medical
Commit 9418c1f4 by 范玉宾
Options

remove confide log & fix meditation switch sound err 

Took 1 hour 34 minutes
parent 989bd14e
Showing with 82 additions and 41 deletions
config.gradle
...@@ -5,7 +5,7 @@ ext { ...@@ -5,7 +5,7 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.50.18", "m-confide" : "0.0.50.24",
"m-consultant" : "0.0.60.27", "m-consultant" : "0.0.60.27",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.26", "m-user" : "0.0.62.26",
...@@ -14,7 +14,7 @@ ext { ...@@ -14,7 +14,7 @@ ext {
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
"m-muse" : "0.0.28.75", "m-muse" : "0.0.28.77",
"m-tests" : "0.0.24.18", "m-tests" : "0.0.24.18",
"m-course" : "0.0.43.39", "m-course" : "0.0.43.39",
...@@ -42,7 +42,7 @@ ext { ...@@ -42,7 +42,7 @@ ext {
"ydl-webview" : "0.0.38.92", "ydl-webview" : "0.0.38.92",
"ydl-media" : "0.0.21.52", "ydl-media" : "0.0.21.52",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.11", "m-audioim" : "0.0.49.30.18",
...@@ -94,7 +94,7 @@ ext { ...@@ -94,7 +94,7 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.50.18", "m-confide" : "0.0.50.24",
"m-consultant" : "0.0.60.27", "m-consultant" : "0.0.60.27",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.26", "m-user" : "0.0.62.26",
...@@ -103,7 +103,7 @@ ext { ...@@ -103,7 +103,7 @@ ext {
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
"m-muse" : "0.0.28.75", "m-muse" : "0.0.28.77",
"m-tests" : "0.0.24.18", "m-tests" : "0.0.24.18",
"m-course" : "0.0.43.39", "m-course" : "0.0.43.39",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
...@@ -128,7 +128,7 @@ ext { ...@@ -128,7 +128,7 @@ ext {
"ydl-webview" : "0.0.38.92", "ydl-webview" : "0.0.38.92",
"ydl-media" : "0.0.21.52", "ydl-media" : "0.0.21.52",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.12", "m-audioim" : "0.0.49.30.18",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
......
m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
...@@ -138,40 +138,79 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -138,40 +138,79 @@ class PlayMeditationActivity : BaseActivity() {
if (it.code.equals("200") && it.data != null) { if (it.code.equals("200") && it.data != null) {
val module = it.data val module = it.data
mMediaId = module.mediaId mMediaId = module.mediaId
mediaListLink = module.playDetailUrl?:""
meditations.clear()
val mediaList = module.mediaList
if(!mediaList.isNullOrEmpty()){ module.mediaList?.forEach { meditationPlayBean ->
val meditation = mediaList[0]
currentMeditation = meditation.copy(meditationType = mMeditationType,meditationId = mMeditationId!!) meditations.add(meditationPlayBean)
mTitle = meditation.title
mDesc = meditation.desc?:"" if (meditationPlayBean.mediaId == mMediaId) {
mMediaUrl = meditation.mediaUrl
mMediaCoverUrl = meditation.coverImageUrl currentMeditation =
val currentPosition = meditation.broadcastTime meditationPlayBean.copy(meditationType = mMeditationType,meditationId = mMeditationId!!)
mBusinessType = meditation.businessType
mBuried = meditation.buried mMediaId = module?.mediaId ?: 0L
mStatus = meditation.status mTitle = meditationPlayBean.title
mDesc = meditationPlayBean.desc ?: ""
collected = mStatus == 1
mMediaCoverUrl = meditationPlayBean.coverImageUrl
updateUI()
mMediaUrl = meditationPlayBean.mediaUrl
initMediaPlayer(
mMediaUrl, val currentPosition = meditationPlayBean.broadcastTime
currentPosition,
mMediaIdFromLocal == mMediaId mBusinessType = meditationPlayBean.businessType
)
mStatus = meditationPlayBean.status
//快进点击事件
ActionCountUtils.baiDuCountSign3( mBuried = meditationPlayBean.buried
MuseBIConstants.YDL_MUSE_MEDITATION_MUSIC_PLAY_PAGE,
MuseBIConstants.YDL_MUSE_PLAY_PAGE_VISIT, collected = mStatus == 1
currentMeditation?.title ?: "",
mBuried ?: "", updateUI()
""
) initMediaPlayer(mMediaUrl, currentPosition,mMediaIdFromLocal == mMediaId)
}
} }
// mediaListLink = module.playDetailUrl?:""
//
// val mediaList = module.mediaList
// if(!mediaList.isNullOrEmpty()){
// val meditation = mediaList[0]
//
//
//
// currentMeditation = meditation.copy(meditationType = mMeditationType,meditationId = mMeditationId!!)
// mTitle = meditation.title
// mDesc = meditation.desc?:""
// mMediaUrl = meditation.mediaUrl
// mMediaCoverUrl = meditation.coverImageUrl
// val currentPosition = meditation.broadcastTime
// mBusinessType = meditation.businessType
// mBuried = meditation.buried
// mStatus = meditation.status
//
// collected = mStatus == 1
//
// updateUI()
//
// initMediaPlayer(
// mMediaUrl,
// currentPosition,
// mMediaIdFromLocal == mMediaId
// )
//
// //快进点击事件
// ActionCountUtils.baiDuCountSign3(
// MuseBIConstants.YDL_MUSE_MEDITATION_MUSIC_PLAY_PAGE,
// MuseBIConstants.YDL_MUSE_PLAY_PAGE_VISIT,
// currentMeditation?.title ?: "",
// mBuried ?: "",
// ""
// )
// }
} }
}, object : ThrowableConsumer() { }, object : ThrowableConsumer() {
override fun accept(msg: String) { override fun accept(msg: String) {
...@@ -704,7 +743,8 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -704,7 +743,8 @@ class PlayMeditationActivity : BaseActivity() {
}) })
initPlayCompletionListener() val isLoop = MediaPlayerManager.getInstance(this@PlayMeditationActivity)?.getTimeOffStatus() == true
initPlayCompletionListener(isLoop = isLoop)
MeditationFloatPermissionUtil.checkSuspendedWindowPermission(this){ MeditationFloatPermissionUtil.checkSuspendedWindowPermission(this){
...@@ -732,7 +772,8 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -732,7 +772,8 @@ class PlayMeditationActivity : BaseActivity() {
if (isLoop){ if (isLoop){
if (isSingle || meditations.size == 1){ if (isSingle || meditations.size == 1){
MediaPlayerManager.getInstance(this)?.setAudioPath(mMediaUrl) switchSound()
// MediaPlayerManager.getInstance(this)?.setAudioPath(mMediaUrl)
}else{ }else{
switchSound() switchSound()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment