From 9efb740d28f7d833c98b3d6731a37fef2e592e62 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 25 Mar 2024 12:08:54 +0800
Subject: [PATCH] =?UTF-8?q?[v630]=20fix:=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=93=E6=9D=9F=E6=97=B6=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E9=9F=B3=E4=B9=90=E6=92=AD=E6=94=BE=EF=BC=88?=
 =?UTF-8?q?=E4=B8=8D=E9=87=8D=E5=A4=8D=E6=9A=82=E5=81=9C=EF=BC=8C=E4=B9=9F?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=80=92=E8=AE=A1=E6=97=B6=E4=B8=AD=E9=97=B4?=
 =?UTF-8?q?=E8=A2=AB=E5=8F=96=E6=B6=88=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/model/music/MusicModel.kt    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt
index fa19e1430f..8ebfca820b 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/model/music/MusicModel.kt
@@ -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() {
 
     }