From 387572900b7fe8df274e3df3d24f57f7aac14ede Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 27 Feb 2023 10:52:56 +0800
Subject: [PATCH] =?UTF-8?q?[shuttle]=20m2=E4=B9=98=E5=AE=A2=E5=B1=8Fauto?=
 =?UTF-8?q?=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/model/PM2DrivingModel.kt    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 1da862dc25..0af825eb00 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -145,7 +145,7 @@ class PM2DrivingModel private constructor() {
             override fun onReceivedMsg(type: Int, byteArray: ByteArray) {//接收司机端发来的信息
                 if (TelematicConstant.BUSINESS_STRING == type){
                     val msg = GsonUtils.fromJson(String(byteArray),AppConnectMsg::class.java) as AppConnectMsg
-                    Logger.d(TAG,"onReceivedMsg = "+GsonUtils.toJson(msg))
+                    Logger.d(SceneConstant.M_BUS_P+TAG,"onReceivedMsg = "+GsonUtils.toJson(msg))
                     if (msg.isPlay){ //播报
                         speakTTS(msg.msg)
                     }
@@ -227,7 +227,7 @@ class PM2DrivingModel private constructor() {
                 super.onAutopilotStatusResponse(autoPilotStatusInfo)
                 val status = autoPilotStatusInfo.state
                 if (mCurrentAutoStatus == status) return
-
+                d(SceneConstant.M_BUS_P+TAG, "onAutopilotStatusResponse ===== $status")
                 if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status){
                     //美化模式下且行程中
                     if (FunctionBuildConfig.isDemoMode &&
@@ -241,6 +241,7 @@ class PM2DrivingModel private constructor() {
                 }else{//自驾状态 2
                     mAutoStatusCallback?.updateAutoStatus(true)
                 }
+                mCurrentAutoStatus = status
             }
 
         }
@@ -260,7 +261,7 @@ class PM2DrivingModel private constructor() {
                         if (data?.data == null) return
                         if (data.data.driverStatus != operationStatus?.driverStatus
                             || data.data.plateNumber != operationStatus?.plateNumber){
-                            d(TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更")
+                            d(SceneConstant.M_BUS_P+TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更")
                             mDrivingInfoCallback?.changeOperationStatus(data.data.driverStatus == 1)
                         }
                         operationStatus = data.data as PM2OperationStatusResponse.Result
@@ -294,7 +295,7 @@ class PM2DrivingModel private constructor() {
                         }
 
                         if (data?.result?.sites === null) {
-                            d(TAG, "queryDriverSiteByCoordinate ===== 没有路线")
+                            d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate ===== 没有路线")
                             routesResult = null
                             mNextStationIndex = 0
                             isGoingToNextStation = false
@@ -314,7 +315,7 @@ class PM2DrivingModel private constructor() {
                             queryDriverOperationDelay()
                             return
                         }
-                        d(TAG, "queryDriverSiteByCoordinate = %s", msg)
+                        d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
                     }
 
                 })
@@ -335,7 +336,7 @@ class PM2DrivingModel private constructor() {
                         && station.isLeaving && i + 1 < stations.size) {
                         mDrivingInfoCallback?.updateStationsInfo(stations as MutableList<PM2Station>, i + 1, false)
                         if (mNextStationIndex != i + 1) {
-                            d(TAG,"轨迹排查--开始行程")
+                            d(SceneConstant.M_BUS_P+TAG,"轨迹排查--开始行程")
                             mTwoStationsRouts.clear()
                             startRemainRouteInfo()
                         }
@@ -467,7 +468,7 @@ class PM2DrivingModel private constructor() {
      * @param isStart
      */
     fun startOrStopCalculateRouteInfo(isStart: Boolean) {
-        d(TAG, "startOrStopCalculateRouteInfo() $isStart")
+        d(SceneConstant.M_BUS_P+TAG, "startOrStopCalculateRouteInfo() $isStart")
         if (isStart) {
             PM2ModelLoopManager.startCalculateRouteInfoLoop()
         } else {