diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt
index 043c1c71bb..3c7ed4eff3 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/base/BaseViewModel.kt
@@ -20,7 +20,7 @@ abstract class BaseViewModel<UiState : IUiState, UiIntent : IUiIntent> : ViewMod
     val uiStateFlow: StateFlow<UiState> = _uiStateFlow
 
     private val _uiIntentFlow: Channel<UiIntent> = Channel()
-    val uiIntentFlow: Flow<UiIntent> = _uiIntentFlow.receiveAsFlow()
+    private val uiIntentFlow: Flow<UiIntent> = _uiIntentFlow.receiveAsFlow()
 
     init {
         viewModelScope.launch {
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverCarServiceBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverCarServiceBean.kt
index 3f705b6cc8..c0a9853fa9 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverCarServiceBean.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverCarServiceBean.kt
@@ -7,19 +7,29 @@ import com.mogo.eagle.core.data.BaseData
  * @date: 2023/8/2
  */
 
-data class GcjLatLon(var gcjLat: Double, var gcjLon: Double)
+data class GcjLatLon(
+    var gcjLat: Double, var gcjLon: Double
+)
 
 data class UnmannedLoginReqBean(
-    var phone: String?,
-    var captcha: String?,
-    var sn: String,
-    var loc: GcjLatLon?
+    var phone: String?, var captcha: String?, var sn: String, var loc: GcjLatLon?
 )
-data class UnmannedLogoutReqBean(var sn: String, var loc: GcjLatLon?)
 
-data class StartServiceReqBean(var sn: String, var gcjLat: Double, var gcjLon: Double)
+data class UnmannedLogoutReqBean(
+    var sn: String, var loc: GcjLatLon?
+)
 
-data class StartServiceRespBean(var data: Result?): BaseData(){
-    data class Result(var siteId: Long,var siteName: String,var gcjLat: Double, var gcjLon: Double,
-                      var wgs84Lon: Double, var wgs84Lat: Double )
+data class StartServiceReqBean(
+    var sn: String, var gcjLat: Double, var gcjLon: Double
+)
+
+data class StartServiceRespBean(var data: Result?) : BaseData() {
+    data class Result(
+        var siteId: Long,
+        var siteName: String,
+        var gcjLat: Double,
+        var gcjLon: Double,
+        var wgs84Lon: Double,
+        var wgs84Lat: Double
+    )
 }
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt
index a7fbcc2e5a..c05150dd73 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt
@@ -81,9 +81,11 @@ data class QueryCurrentTaskRespBean(var data: Result?) : BaseData() {
         var endSite: Site?,
         var order: OrderDetail?
     ) {
-        //servingStatus = 0 //暂停接单  = 1 //开始接单
-        //taskType = 1 //虚拟任务  = 2 //接驾任务 = 3 //送驾任务
-        //currentStatus 0：空闲  1:获取任务 2:开始任务 3:到达目的地
+        /**
+         * servingStatus: 0 -> 暂停接单  1 -> 开始接单
+         * taskType: 1 -> 虚拟任务   2 -> 接驾任务 3-> 送驾任务
+         * currentStatus: 0-> 空闲  1-> 获取任务 2-> 开始任务 3-> 到达目的地
+         */
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -164,10 +166,18 @@ data class QueryCurrentTaskRespBean(var data: Result?) : BaseData() {
     }
 }
 
-data class StartTaskReqBean(var sn: String, var lineId: Long)
+data class StartTaskReqBean(
+    var sn: String, var lineId: Long
+)
+
+data class ArriveSiteReqBean(
+    var sn: String, var siteId: Long
+)
+
+data class PrepareTaskReqBean(
+    var sn: String, var siteId: Long
+)
 
-data class ArriveSiteReqBean(var sn: String, var siteId: Long)
-data class PrepareTaskReqBean(var sn: String, var siteId: Long)
 data class PrepareTaskRespBean(var data: Result?) : BaseData() { //taskType 1:虚拟任务 2:接驾任务3:送驾任务
     data class Result(
         var lineId: Long,
@@ -178,10 +188,22 @@ data class PrepareTaskRespBean(var data: Result?) : BaseData() { //taskType 1:
     )
 }
 
-data class JumpPassengerCheckReqBean(var sn: String, var orderNo: String)
-data class CancelOrderReqBean(var sn: String, var orderNo: String, var cancelType: Int)
-data class OrderCompletedReqBean(var sn: String, var orderNo: String)
-data class QueryCarOrderByNoReqBean(var sn: String, var orderNo: String)
+data class JumpPassengerCheckReqBean(
+    var sn: String, var orderNo: String
+)
+
+data class CancelOrderReqBean(
+    var sn: String, var orderNo: String, var cancelType: Int
+)
+
+data class OrderCompletedReqBean(
+    var sn: String, var orderNo: String
+)
+
+data class QueryCarOrderByNoReqBean(
+    var sn: String, var orderNo: String
+)
+
 data class QueryCarOrderByNoRespBean(var data: Result) : BaseData() {
     data class Result(
         var sn: String,
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiTaskWithOrderCallback.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiTaskWithOrderCallback.kt
index 59992d55aa..8390764cb6 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiTaskWithOrderCallback.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiTaskWithOrderCallback.kt
@@ -12,6 +12,5 @@ interface ITaxiTaskWithOrderCallback {
     fun onOrderTotalMileAndDurationChanged(mileage: Float, duration: Int)
     fun onOrderJourneyCompleted()
     fun onStartAutopilot()
-
     fun onStartPrepareTask120s(isStart: Boolean)
 }
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt
index 7bbfce05b0..cf3a4e1263 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceApi.kt
@@ -124,7 +124,7 @@ interface TaxiTaskWithOrderServiceApi {
      */
     @Headers("Content-type:application/json;charset=UTF-8")
     @POST("/och-taxi-cabin/api/business/v1/contrail")
-    fun contrailList(
+    fun queryTrajectoryByLindIds(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token,
         @Body data: Array<Long>
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt
index ddc81e46be..de9673a2a6 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/network/TaxiTaskWithOrderServiceManager.kt
@@ -179,9 +179,9 @@ object TaxiTaskWithOrderServiceManager {
         context: Context, linIds: Array<Long>,
         callback: OchCommonServiceCallback<TrajectoryListRespBean>?
     ) {
-        mOCHTaxiServiceApi.contrailList(
+        mOCHTaxiServiceApi.queryTrajectoryByLindIds(
             data = linIds
         ).transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "contrailList"))
+            .subscribe(OchCommonSubscribeImpl(context, callback, "queryTrajectoryByLindIds"))
     }
 }
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
index a9ab0a9ed8..bf8fdec4d9 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
@@ -4,8 +4,6 @@ import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.View
@@ -75,11 +73,9 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
     // 高德地图轨迹展示fragment
     private var taxiRoutingNaviFragment: TaxiRoutingNaviFragment? = null
 
-    // 开发调试时展示信息德panel
+    // 开发调试时展示信息的panel
     private var debugPanelView: View? = null
 
-    private val mHandler = Handler(Looper.getMainLooper())
-
     private val startAutopilotDrawableIds = arrayOf(
         R.drawable.anim_flow_00000, R.drawable.anim_flow_00001, R.drawable.anim_flow_00002,
         R.drawable.anim_flow_00003, R.drawable.anim_flow_00004, R.drawable.anim_flow_00005,
@@ -361,11 +357,7 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
         mPreAutoPilotStatus = parallelDrivingValue
     }
 
-    /**
-     *
-     */
-    // TODO 确认
-    fun updateCtvAutopilotStatusTag(tag: Boolean) {
+    private fun updateCtvAutopilotStatusTag(tag: Boolean) {
         module_mogo_och_autopilot_status.tag = tag
     }
 
@@ -460,7 +452,7 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
             autopilotLoadingAnimator!!.startDelay = 100
             autopilotLoadingAnimator!!.duration = 1000 //设置持续时间
             autopilotLoadingAnimator!!.start() //动画开始
-            startingAutoApilotCountDown()
+            startingAutopilotCountDown()
         } else {
             isStarting = false
             if (autopilotLoadingAnimator != null) {
@@ -496,13 +488,13 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
             )
             module_och_autopilot_iv.setImageResource(R.drawable.taxi_ic_autopilot_failed)
         }
-        mHandler.postDelayed({
+        UiThreadHandler.postDelayed({
             startOrStopLoadingAnim(false)
             onAutopilotStatusChanged(getState())
         }, 1000L)
     }
 
-    private fun startingAutoApilotCountDown() {
+    private fun startingAutopilotCountDown() {
         UiThreadHandler.postDelayed({
             //未启动成功10s后做处理
             if (isStarting) { //判断动画是否在进行
@@ -607,7 +599,8 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
             smallMapView.visibility = View.GONE
         } else {
             taxi_close_navi_icon.visibility = View.GONE
-            module_mogo_och_navi_panel_container.visibility = View.INVISIBLE //2023.9.4高德导航由gone设置成INVISIBLE,保留导航实例,避免导航被挂起
+            module_mogo_och_navi_panel_container.visibility =
+                View.INVISIBLE //2023.9.4高德导航由gone设置成INVISIBLE,保留导航实例,避免导航被挂起
             smallMapView.visibility = View.VISIBLE
         }
     }
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/common/AvoidLeakDialog.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/common/AvoidLeakDialog.kt
index 6896bf0e85..af22409590 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/common/AvoidLeakDialog.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/common/AvoidLeakDialog.kt
@@ -24,8 +24,6 @@ open class AvoidLeakDialog : Dialog {
     override fun setOnShowListener(listener: OnShowListener?) {}
     override fun dismiss() {
         super.dismiss()
-        if (null != hostFragmentReference && null != hostFragmentReference!!.get()) {
-            hostFragmentReference!!.get()!!.dismissAllowingStateLoss()
-        }
+        hostFragmentReference?.get()?.dismissAllowingStateLoss()
     }
 }