Commit c2c63634 by 范玉宾

fix meditationId set value err

parent 3c51b5b3
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.74", "m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.25", "m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08", "m-fm" : "0.0.30.08",
"m-user" : "0.0.62.18", "m-user" : "0.0.62.20",
"m-home" : "0.0.23.66", "m-home" : "0.0.23.66",
"m-im" : "0.0.21.44", "m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73", "m-dynamic" : "0.0.7.73",
...@@ -93,7 +93,7 @@ ext { ...@@ -93,7 +93,7 @@ ext {
"m-confide" : "0.0.49.74", "m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.25", "m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08", "m-fm" : "0.0.30.08",
"m-user" : "0.0.62.18", "m-user" : "0.0.62.20",
"m-home" : "0.0.23.66", "m-home" : "0.0.23.66",
"m-im" : "0.0.21.44", "m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73", "m-dynamic" : "0.0.7.73",
......
...@@ -398,7 +398,8 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -398,7 +398,8 @@ class PlayMeditationActivity : BaseActivity() {
"" ""
) )
val event = MeditationFloatEvent(true, val event = MeditationFloatEvent(true,
meditation = currentMeditation?.copy(meditationType = mMeditationType)) meditation = currentMeditation?.copy(meditationType = mMeditationType,meditationId =
mMeditationId?:0))
EventBus.getDefault().post(event) EventBus.getDefault().post(event)
Handler().postDelayed({ Handler().postDelayed({
...@@ -741,8 +742,8 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -741,8 +742,8 @@ class PlayMeditationActivity : BaseActivity() {
private fun initMediaPlayer(path: String, current: Int) { private fun initMediaPlayer(path: String, current: Int) {
val event = MeditationFloatEvent(show = false,stop = false,meditation = currentMeditation) // val event = MeditationFloatEvent(show = false,stop = false,meditation = currentMeditation)
EventBus.getDefault().post(event) // EventBus.getDefault().post(event)
if (MediaPlayerManager.getInstance(this)?.getAudioPath() != null if (MediaPlayerManager.getInstance(this)?.getAudioPath() != null
&& MediaPlayerManager.getInstance(this)?.getAudioPath() == path && MediaPlayerManager.getInstance(this)?.getAudioPath() == path
......
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