Merge branch 'dev_robotaxi-d_230809_6.0.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230809_6.0.0

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt

@@ -540,6 +540,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     fun updateCurrentTaskTripInfo(meters: Long, timeInSecond: Long) {
         val currentTaskWithOrder = TaxiTaskModel.getCurrentTaskWithOrder() ?: return
         if (currentTaskWithOrder.endSite == null && currentTaskWithOrder == null) return
+        d("NaviToDestinationModel", "taskUitl, ${TaskUtils.getCurrentTaskTripHtml(meters, timeInSecond)}")
         taskOtherInfo.text = TaskUtils.getCurrentTaskTripHtml(meters, timeInSecond)
     }
 

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt

@@ -233,7 +233,6 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
     override fun onStartAutopilot() {
         UiThreadHandler.postDelayed({
             startTask() //状态流转
-            TaxiTaskModel.startAutoPilot() //自驾开启
             VoiceNotice.showNotice("车辆正在自动开启自动驾驶")
         }, TaxiUnmannedConst.START_AUTOPILOT_COUNTDOWN_INTERVAL) // 10s后开启自驾, 状态流转
     }

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt

@@ -841,6 +841,7 @@ object TaxiTaskModel {
             lineId,
             object : OchCommonServiceCallback<BaseData> {
                 override fun onSuccess(data: BaseData?) {
+                    startAutoPilot() //自驾开启
                     d(TAG, "startTask onSuccess: data=${GsonUtil.jsonFromObject(data)}")
                 }