yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v630] fix:乘客屏订单结束时取消一次音乐播放（不重复暂停，也避免倒计时中间被取消）；

Browse Source
This commit is contained in:
aibingbing
2024-03-25 12:08:54 +08:00
parent 374c289ad4
commit 9efb740d28
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt
View File

@@ -29,25 +29,25 @@ object MusicModel : OrderListener, IMoGoAutopilotStatusListener {
order?.orderStatus?.let {
when (TaxiPassengerOrderStatusEnum.valueOf(it)) {
TaxiPassengerOrderStatusEnum.None -> {
RxUtils.disposeSubscribe(stopMusicDisposable)
cancelStopMusicDisposable()
}
TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
RxUtils.disposeSubscribe(stopMusicDisposable)
cancelStopMusicDisposable()
}
TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
RxUtils.disposeSubscribe(stopMusicDisposable)
cancelStopMusicDisposable()
}
TaxiPassengerOrderStatusEnum.UserArriveAtStart -> {}
TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> {}
TaxiPassengerOrderStatusEnum.ArriveAtEnd -> {}
TaxiPassengerOrderStatusEnum.JourneyCompleted -> {
RxUtils.disposeSubscribe(stopMusicDisposable)
cancelStopMusicDisposable()
stopMusicDisposable = RxUtils.createSubscribe(60_000) {
AuditionManager.stop()
}
}
TaxiPassengerOrderStatusEnum.Cancel -> {
RxUtils.disposeSubscribe(stopMusicDisposable)
cancelStopMusicDisposable()
stopMusicDisposable = RxUtils.createSubscribe(60_000) {
AuditionManager.stop()
}
@@ -60,14 +60,14 @@ object MusicModel : OrderListener, IMoGoAutopilotStatusListener {
val string = SharedPrefsMgr.getInstance().getString(startMusicWithOrderKey)
if (string == null) {
orderInfo?.let {
RxUtils.disposeSubscribe(stopMusicDisposable)
cancelStopMusicDisposable()
SharedPrefsMgr.getInstance().putString(startMusicWithOrderKey, it.orderNo)
AuditionManager.playFirst()
}
} else {
orderInfo?.let {
if (it.orderNo != string) {
RxUtils.disposeSubscribe(stopMusicDisposable)
cancelStopMusicDisposable()
SharedPrefsMgr.getInstance().putString(startMusicWithOrderKey, it.orderNo)
AuditionManager.playFirst()
}
@@ -76,6 +76,14 @@ object MusicModel : OrderListener, IMoGoAutopilotStatusListener {
}
}
private fun cancelStopMusicDisposable() {
if (stopMusicDisposable != null) {
AuditionManager.stop()
}
RxUtils.disposeSubscribe(stopMusicDisposable)
stopMusicDisposable = null
}
fun load() {
}