From d4257bd01cbe499444621cea97fdb50f74114b09 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 22 Nov 2023 19:26:54 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[charter]=20[=E5=8C=85=E8=BD=A6?= =?UTF-8?q?=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charter/view/autopilot/AutopilotStatusViewModel.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt index 9594084458..ba394af975 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt @@ -1,10 +1,12 @@ package com.magic.mogo.och.charter.view.autopilot import androidx.lifecycle.ViewModel +import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVED import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVING import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback import com.magic.mogo.och.charter.constant.CharterConst import com.magic.mogo.och.charter.model.DriverM1Model +import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -117,25 +119,30 @@ class AutopilotStatusViewModel: ViewModel(), IDriverM1ControllerStatusCallback, } fun setUIMode(state:Int){ + CallerLogger.d(M_BUS_P + TAG, "新的状态：${state}") if (FunctionBuildConfig.isDemoMode) {// 美化模式 viewCallback?.inAutopilot() val busOrderResult = DriverM1Model.get().getBusOrderResult() if(busOrderResult==null){//无订单车闲置|车辆不闲置 //是否强制绘制引导线 FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false + CallerLogger.d(M_BUS_P + TAG, "美化模式-无订单车闲置|车辆不闲置") }else{ if(busOrderResult.lineId==0||busOrderResult.siteId==0){//有订单无线路 //是否强制绘制引导线 FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false + CallerLogger.d(M_BUS_P + TAG, "美化模式-有订单-无线路") }else{ - if (busOrderResult.arriveStatus==ARRIVING) { + if (busOrderResult.arriveStatus==ARRIVED) { // 到站不绘制引导线 FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false + CallerLogger.d(M_BUS_P + TAG, "美化模式-有订单-到站") return } if (StopSideManager.stopSiteStatus== StopSideStatus.EndingSuccess) { // 靠边停车成功不绘制引导线 FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false + CallerLogger.d(M_BUS_P + TAG, "美化模式-有订单-靠边停车") return } FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true