[6.3.0]

[设置和播放器]

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)
+
                 }
             }
         }

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) {

OCH/taxi/passenger/src/main/res/layout/taxi_p_music_list.xml

@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/tv_music_title"
-        tools:text="音乐列表"
+        android:text="音乐列表"
         android:textColor="@color/taxi_p_253A5A"
         android:textSize="@dimen/dp_32"
         app:layout_constraintTop_toTopOf="parent"