Commit cb5eb26f by 范玉宾

fix time off reset fail

parent 33f5c1d9
...@@ -9,12 +9,12 @@ ext { ...@@ -9,12 +9,12 @@ ext {
"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.24", "m-user" : "0.0.62.24",
"m-home" : "0.0.23.76", "m-home" : "0.0.23.77",
"m-im" : "0.0.21.44", "m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73", "m-dynamic" : "0.0.7.73",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
"m-muse" : "0.0.28.58", "m-muse" : "0.0.28.59",
"m-tests" : "0.0.24.18", "m-tests" : "0.0.24.18",
"m-course" : "0.0.43.37", "m-course" : "0.0.43.37",
...@@ -94,12 +94,12 @@ ext { ...@@ -94,12 +94,12 @@ ext {
"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.24", "m-user" : "0.0.62.24",
"m-home" : "0.0.23.76", "m-home" : "0.0.23.77",
"m-im" : "0.0.21.44", "m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73", "m-dynamic" : "0.0.7.73",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
"m-muse" : "0.0.28.58", "m-muse" : "0.0.28.59",
"m-tests" : "0.0.24.18", "m-tests" : "0.0.24.18",
"m-course" : "0.0.43.37", "m-course" : "0.0.43.37",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
......
...@@ -20,7 +20,6 @@ import com.ydl.ydlcommon.modular.ModularServiceManager ...@@ -20,7 +20,6 @@ import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.utils.Utils import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper.Companion.show import com.ydl.ydlcommon.utils.remind.ToastHelper.Companion.show
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil import com.yidianling.common.tools.ToastUtil
import com.yidianling.home.http.MuseHttp import com.yidianling.home.http.MuseHttp
import com.yidianling.muse.R import com.yidianling.muse.R
...@@ -36,8 +35,6 @@ import com.yidianling.user.api.service.IUserService ...@@ -36,8 +35,6 @@ import com.yidianling.user.api.service.IUserService
import de.greenrobot.event.EventBus import de.greenrobot.event.EventBus
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.Scheduler
import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import io.reactivex.functions.Consumer import io.reactivex.functions.Consumer
...@@ -47,7 +44,6 @@ import kotlinx.android.synthetic.main.activity_play_meditation.iv_close ...@@ -47,7 +44,6 @@ import kotlinx.android.synthetic.main.activity_play_meditation.iv_close
import kotlinx.android.synthetic.main.activity_play_meditation.tv_title import kotlinx.android.synthetic.main.activity_play_meditation.tv_title
import kotlinx.android.synthetic.main.layout_meditation_play_float_view.* import kotlinx.android.synthetic.main.layout_meditation_play_float_view.*
import kotlinx.android.synthetic.main.player_control_view.* import kotlinx.android.synthetic.main.player_control_view.*
import org.reactivestreams.Subscription
import java.util.* import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.math.roundToInt import kotlin.math.roundToInt
...@@ -595,7 +591,7 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -595,7 +591,7 @@ class PlayMeditationActivity : BaseActivity() {
val currentPosition = meditation.broadcastTime val currentPosition = meditation.broadcastTime
mStatus = meditation.status mStatus = meditation.status
updateUI() updateUI(needRefresh = false)
initMediaPlayer(mMediaUrl, currentPosition, mMediaIdFromLocal == mMediaId) initMediaPlayer(mMediaUrl, currentPosition, mMediaIdFromLocal == mMediaId)
} else { } else {
...@@ -859,7 +855,7 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -859,7 +855,7 @@ class PlayMeditationActivity : BaseActivity() {
} }
} }
private fun updateUI(){ private fun updateUI(needRefresh:Boolean = true){
tv_title.text = mTitle tv_title.text = mTitle
tv_content.text = mDesc tv_content.text = mDesc
Glide.with(this) Glide.with(this)
...@@ -874,6 +870,7 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -874,6 +870,7 @@ class PlayMeditationActivity : BaseActivity() {
} }
) )
if(needRefresh){
if(MediaPlayerManager.getInstance(this)?.getTimeOffStatus() == true){ if(MediaPlayerManager.getInstance(this)?.getTimeOffStatus() == true){
val timeOff = MediaPlayerManager.getInstance(this)?.getTimeOff() val timeOff = MediaPlayerManager.getInstance(this)?.getTimeOff()
if (timeOff!=null && timeOff>0 && mMeditationType!=null){ if (timeOff!=null && timeOff>0 && mMeditationType!=null){
...@@ -882,6 +879,8 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -882,6 +879,8 @@ class PlayMeditationActivity : BaseActivity() {
} }
} }
}
private fun initRxTimeOff(time: Long, meditationType: Int) { private fun initRxTimeOff(time: Long, meditationType: Int) {
MediaPlayerManager.getInstance(this)?.initRxTimeOff(time) MediaPlayerManager.getInstance(this)?.initRxTimeOff(time)
...@@ -943,7 +942,7 @@ class PlayMeditationActivity : BaseActivity() { ...@@ -943,7 +942,7 @@ class PlayMeditationActivity : BaseActivity() {
mStatus = event.status mStatus = event.status
updateUI() updateUI(needRefresh = false)
if (event.mediaUrl == MediaPlayerManager.getInstance(this)?.getAudioPath()) { if (event.mediaUrl == MediaPlayerManager.getInstance(this)?.getAudioPath()) {
return return
......
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