From a12e10f88cb3c302cbdc6c3b40ab6d9842fe04b1 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 11 Mar 2024 13:59:47 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[=E8=AE=BE=E7=BD=AE=E5=92=8C=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E5=99=A8]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/auditionmanager/Audition.kt       | 15 ++++++++-----
 .../passenger/ui/TaxiPassengerBaseFragment.kt | 21 +++++++++++++++++--
 .../src/main/res/layout/taxi_p_music_list.xml |  2 +-
 3 files changed, 30 insertions(+), 8 deletions(-)

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 @@
 
     <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"