Merge branch 'dev_robotaxi-d_241105_6.7.4'

2024-11-21 10:37:02 +08:00
parent 4c80e30796 032714276e
commit 7c447af064
1 changed files with 3 additions and 3 deletions
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
@@ -623,8 +623,6 @@ object TaxiTaskModel {
                    if (isArriveAtEndSite) {
                        // 取消自驾,D档位会溜车 map3.6.0 修改
                        cancelAutopilot()
-                        // 语音送宾
-                        VoiceNotice.showNotice("感谢您使用蘑菇智行,再见~");
                    }
                    mLastArrivedSiteId = siteId
                    mIsSubmitArrivedSiteRequesting = false
@@ -908,6 +906,8 @@ object TaxiTaskModel {
                        }

                        TaxiOrderStatusEnum.ArriveAtEnd.code -> {
+                            // 语音送宾
+                            VoiceNotice.showNotice("感谢您使用蘑菇智行,再见~");
                            OrderModel.invokeListener(data.data)
                            mTaxiTaskWithOrderCallbackMap.forEach {
                                val listener = it.value
@@ -919,7 +919,7 @@ object TaxiTaskModel {
                        }

                        TaxiOrderStatusEnum.JourneyCompleted.code -> {
-                            //更新本地标志位
+                            // 更新本地标志位
                            mCurrentTaskWithOrder = null
                            OrderModel.invokeListener(data.data)
                            mTaxiTaskWithOrderCallbackMap.forEach {