diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/auditionmanager/Audition.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/auditionmanager/Audition.kt index 28894fe346..e95f6cd498 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/auditionmanager/Audition.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/auditionmanager/Audition.kt @@ -38,12 +38,17 @@ object Audition: MediaPlayer.OnPreparedListener, override fun handleMessage(msg: Message) { super.handleMessage(msg) if (msg.what == 0) { - if (mediaPlayer != null && listener != null) { - val currentPosition = mediaPlayer!!.currentPosition - val duration = mediaPlayer!!.duration - listener!!.onCurrentPosition(currentPosition.toLong(), duration.toLong()) + try { + if (mediaPlayer != null && listener != null) { + val currentPosition = mediaPlayer!!.currentPosition + val duration = mediaPlayer!!.duration + listener!!.onCurrentPosition(currentPosition.toLong(), duration.toLong()) + } + sendEmptyMessageDelayed(0, 500) + }catch (e:Exception){ + e.printStackTrace() } - sendEmptyMessageDelayed(0, 500) + } } } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 84da227d97..5a97fa57ca 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -73,19 +73,36 @@ class TaxiPassengerBaseFragment() : } - private fun initListener() { + private fun settingAndMusicListener() { ck_setting.isChecked = false ck_setting_only.isChecked = false + ck_music.isChecked = false + ck_setting.setOnCheckedChangeListener { _, isChecked -> clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE + ck_setting_only.isChecked = isChecked + if(isChecked){ + ck_music.isChecked = false + } } ck_setting_only.setOnCheckedChangeListener { _, isChecked -> clSettingView.visibility = if(isChecked) View.VISIBLE else View.GONE + ck_setting.isChecked = isChecked + if(isChecked){ + ck_music.isChecked = false + } } - ck_music.isChecked = false ck_music.setOnCheckedChangeListener { _, isChecked -> mv_music_info.visibility = if(isChecked) View.VISIBLE else View.GONE + if(isChecked){ + ck_setting.isChecked = false + ck_setting_only.isChecked = false + } } + } + + private fun initListener() { + settingAndMusicListener() bottom.setOverMapApplyClick(object : BottomBar.ApplyClickLintener{ override fun onApplyClick(selectItem: BottomBar.SelectView) { when (selectItem) { diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml index bff83514c2..55b874ff7e 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml @@ -8,7 +8,7 @@