[6.8.4]

[fea] [add bridge module]
2024-12-12 17:05:08 +08:00
parent 855c06b91c
commit ed30fe2694
160 changed files with 593 additions and 425 deletions
--- a/OCH/charter/driver/build.gradle
+++ b/OCH/charter/driver/build.gradle
@@ -62,6 +62,8 @@ dependencies {
    compileOnly rootProject.ext.dependencies.recyclerviewadapterhelper

    implementation project(":OCH:common:common")
+    implementation project(":OCH:common:data")
+    implementation project(":OCH:common:bridge")
    compileOnly project(":libraries:mogo-map")

    androidTestImplementation rootProject.ext.dependencies.androidxjunit
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterDriverProvider.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterDriverProvider.kt
@@ -1,6 +1,7 @@
 package com.magic.mogo.och.charter

 import android.content.Context
+import android.view.View
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.magic.mogo.och.charter.fragment.DriverM1Fragment
@@ -11,7 +12,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.provider.CommonService
 import com.mogo.och.common.module.biz.provider.CommonServiceImpl
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.ui.autopilot.AutopilotState


 /**
@@ -40,6 +42,12 @@ class CharterDriverProvider : CommonServiceImpl() {
        OchAutopilotAnalytics.ochEventKey = null
    }

+    override fun createStartAutopilotView(context: Context?): View? {
+        return context?.let {
+            AutopilotState(it)
+        }
+    }
+
    override fun init(context: Context) {
        CallerLogger.d(SceneConstant.M_TAXI + tag, "init")
    }
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java
@@ -2,7 +2,7 @@ package com.magic.mogo.och.charter.manager;

 import androidx.annotation.NonNull;

-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchEventKey;
+import com.mogo.och.bridge.autopilot.autopilot.IOchEventKey;

 public class CharterAnalyticsManager implements IOchEventKey {

--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt
@@ -14,17 +14,15 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.och.bridge.autopilot.trajectory.ITrajectoryListListener
+import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.manager.autopilot.trajectory.ITrajectoryListListener
-import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.SoundPoolHelper
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import io.reactivex.functions.Function
 import io.reactivex.schedulers.Schedulers
-import mogo_msg.MogoReportMsg.MogoReportMessage
 import java.util.concurrent.TimeUnit

 /**
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -35,15 +35,16 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
+import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback
 import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager
+import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.autopilot.line.LineManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.device.LightAirconditionDoorManager
+import com.mogo.och.bridge.device.LightAirconditionDoorStatusManager
+import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.startLoopAbnormalFactors
 import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.stopLoopAbnormalFactors
@@ -66,7 +67,7 @@ import com.mogo.och.common.module.manager.stopside.StopSideManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.*
 import com.mogo.och.common.module.voice.VoiceNotice
-import com.mogo.och.data.bean.*
+import com.mogo.och.data.bean.LineInfo

 /**
 * @author: wangmingjun
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -18,16 +18,15 @@ import com.mogo.och.common.module.biz.login.ILoginCallback
 import com.mogo.och.common.module.biz.login.LoginStatusEnum
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.OPERATION_ROAD_SIDE_TYPE
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager
+import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.stopside.OCHPlanningActionsCallback
 import com.mogo.och.common.module.manager.stopside.StopSideStatus
 import com.mogo.och.common.module.manager.stopside.StopSideManager
 import com.mogo.och.common.module.utils.DateTimeUtil
-import mogo_msg.MogoReportMsg

 /**
 * @author: wangmingjun
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt
@@ -8,7 +8,7 @@ import com.magic.mogo.och.charter.R
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.och.common.module.manager.DriverMoFangFunctionManager
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
+import com.mogo.och.bridge.device.LightAirconditionDoorManager
 import com.mogo.och.common.module.utils.SoundPoolHelper
 import kotlinx.android.synthetic.main.driver_mofang_function_view.view.*

--- 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
@@ -14,8 +14,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.beautifymode.IBeautifyModeCallback
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/carstatus/CarStatusViewModel.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/carstatus/CarStatusViewModel.kt
@@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import kotlin.math.abs

 class CarStatusViewModel: ViewModel(), IMoGoAutopilotStatusListener,
--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -82,21 +82,21 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_71"
-        app:layout_constraintEnd_toEndOf="@+id/viewLimitingVelocity"
+        app:layout_constraintEnd_toEndOf="parent"
        app:layout_goneMarginEnd="40dp"
        app:layout_goneMarginTop="@dimen/dp_236"
        android:visibility="invisible"
-        app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
+        app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"/>

    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_71"
-        app:layout_constraintEnd_toEndOf="@+id/viewLimitingVelocity"
+        app:layout_constraintEnd_toEndOf="@+id/viewTrafficLightVr"
+        app:layout_constraintTop_toBottomOf="@+id/viewTrafficLightVr"
        app:layout_goneMarginEnd="40dp"
        app:layout_goneMarginTop="@dimen/dp_236"
-        android:visibility="invisible"
-        app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
+        android:visibility="invisible"/>


    <!--红绿灯-->
@@ -197,7 +197,7 @@
        android:layout_width="@dimen/dp_142"
        android:layout_height="@dimen/dp_142"/>

-    <com.mogo.och.common.module.wigets.map.drawline.LineView
+    <com.mogo.och.bridge.ui.drawline.LineView
        android:id="@+id/lineView"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toRightOf="@id/reportworkorderview"
--- a/OCH/charter/passenger/build.gradle
+++ b/OCH/charter/passenger/build.gradle
@@ -55,6 +55,7 @@ dependencies {
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
    implementation rootProject.ext.dependencies.material
+    implementation project(':OCH:common:bridge')
    kapt rootProject.ext.dependencies.aroutercompiler
    implementation rootProject.ext.dependencies.rxandroid
    implementation rootProject.ext.dependencies.androidxconstraintlayout
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/CharterPassengerProvider.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/CharterPassengerProvider.kt
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.och.bridge.ui.autopilot.AutopilotState
 import com.mogo.och.charter.passenger.ui.MainFragment
 import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView
 import com.mogo.och.common.module.constant.OchCommonConst
@@ -47,4 +48,10 @@ class CharterPassengerProvider : CommonServiceImpl() {
        CallerLogger.d(SceneConstant.M_TAXI_P + tag, "init")
    }

+    override fun createStartAutopilotView(context: Context?): View? {
+        return context?.let {
+            AutopilotState(it)
+        }
+    }
+
 }
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt
@@ -2,7 +2,7 @@ package com.mogo.och.charter.passenger.bean.response

 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.BaseData
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.utils.DateTimeUtil

 /**
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -41,17 +41,17 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.biz.login.ILoginCallback
 import com.mogo.och.common.module.biz.login.LoginStatusEnum
 import com.mogo.och.common.module.network.OchCommonServiceCallback
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
-import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
+import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.manager.socket.lan.LedScreenManager
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.PinYinUtil
 import com.mogo.och.common.module.voice.VoiceNotice
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt
@@ -2,12 +2,11 @@ package com.mogo.och.charter.passenger.model

 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.utilcode.util.TAG
 import com.mogo.och.common.module.manager.audition.AuditionManager
 import com.mogo.och.common.module.manager.audition.PlayState
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable

--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
@@ -32,13 +32,13 @@ import com.mogo.och.charter.passenger.ui.MainFragment
 import com.mogo.och.charter.passenger.ui.overmapview.MakerWithSiteName
 import com.mogo.och.charter.passenger.ui.overmapview.MakerWithSiteNamewithCheck
 import com.mogo.och.common.module.network.OchCommonServiceCallback
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.stopside.StopSideManager
-import com.mogo.och.common.module.manager.device.callback.LightAirconditionDoorCallback
+import com.mogo.och.bridge.device.callback.LightAirconditionDoorCallback
 import com.mogo.och.common.module.manager.stopside.OCHPlanningActionsCallback
 import com.mogo.och.common.module.manager.stopside.StopSideStatus
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import me.jessyan.autosize.utils.AutoSizeUtils
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
@@ -13,8 +13,8 @@ import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
 import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager
+import com.mogo.och.bridge.device.LightAirconditionDoorManager
+import com.mogo.och.bridge.device.LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt
@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
+import com.mogo.och.bridge.device.LightAirconditionDoorManager
 import com.mogo.och.common.module.utils.SoundPoolHelper

 class CloseDoorView @JvmOverloads constructor(
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
@@ -19,7 +19,7 @@ import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.callback.ICharterPassengerAutoStatusChangeCallback
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager
+import com.mogo.och.bridge.device.LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.manager.stopside.StopSideManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.utils.SoundPoolHelper
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt
@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
+import com.mogo.och.bridge.device.LightAirconditionDoorManager
 import com.mogo.och.common.module.utils.SoundPoolHelper

 class OpenDoorView @JvmOverloads constructor(
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
@@ -18,7 +18,7 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter
 import com.mogo.och.charter.passenger.utils.CharterVoiceManager
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager
+import com.mogo.och.bridge.device.LightAirconditionDoorManager
 import kotlinx.android.synthetic.main.charter_p_order_end.iv_end_order_closedoor
 import kotlinx.android.synthetic.main.charter_p_order_end.iv_end_order_opendoor

--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
@@ -10,7 +10,7 @@ import com.mogo.och.charter.passenger.callback.IDistanceCallback
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener
 import com.mogo.och.charter.passenger.model.OrderStatusEnum
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.NumberFormatUtil
 import kotlin.math.abs
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
@@ -25,7 +25,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.manager.socket.lan.bean.LineSite
 import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.stopside.StopSideManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt
@@ -6,11 +6,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
-import com.mogo.och.common.module.manager.device.callback.LightAirconditionDoorCallback
-import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager
-import com.mogo.och.common.module.manager.device.data.AirconditionStatus
-import com.mogo.och.common.module.manager.device.data.HeaterStatue
-import com.mogo.och.common.module.manager.device.data.LightStatus
+import com.mogo.och.bridge.device.callback.LightAirconditionDoorCallback
+import com.mogo.och.bridge.device.LightAirconditionDoorStatusManager
+import com.mogo.och.bridge.device.data.AirconditionStatus
+import com.mogo.och.bridge.device.data.HeaterStatue
+import com.mogo.och.bridge.device.data.LightStatus
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable

--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
@@ -25,8 +25,8 @@ import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.model.OrderStatusEnum
 import com.mogo.och.charter.passenger.ui.debugview.DebugEvent
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.beautifymode.IBeautifyModeCallback
 import com.mogo.och.common.module.manager.loop.BizLoopManager
--- a/OCH/charter/passenger/src/test/java/passenger/ExampleUnitTest.kt
+++ b/OCH/charter/passenger/src/test/java/passenger/ExampleUnitTest.kt
@@ -4,8 +4,7 @@ import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.util.CoordinateTransform
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
-import com.mogo.och.common.module.utils.DateTimeUtil
+import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Test
--- a/OCH/common/biz/build.gradle
+++ b/OCH/common/biz/build.gradle
@@ -53,6 +53,8 @@ dependencies {
    implementation project(':OCH:common:common')

    implementation rootProject.ext.dependencies.arouter
+    implementation project(':OCH:common:data')
+    implementation project(':OCH:common:bridge')
    kapt rootProject.ext.dependencies.aroutercompiler

    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/bean/TaxiLogoutReqBean.java
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/bean/TaxiLogoutReqBean.java
@@ -1,7 +1,7 @@
 package com.mogo.och.biz.login.bean;

 import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager;
+import com.mogo.och.bridge.autopilot.location.OchLocationManager;

 /**
 * Created by yyk on 2021/8/19
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt
@@ -17,7 +17,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
-import com.mogo.eagle.core.utilcode.util.Utils
 import com.mogo.och.biz.R
 import com.mogo.och.biz.login.bean.DriverStatusQueryRespBean
 import com.mogo.och.biz.login.bean.TaxiLoginReqBean
@@ -25,11 +24,11 @@ import com.mogo.och.biz.login.bean.TaxiLoginRespBean
 import com.mogo.och.biz.login.bean.TaxiLogoutReqBean
 import com.mogo.och.biz.login.callback.ITaxiLoginCallback
 import com.mogo.och.biz.login.net.OchCommonServiceManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.biz.login.BusinessEnum
 import com.mogo.och.common.module.biz.login.LoginStatusEnum
 import com.mogo.och.common.module.biz.login.LoginStatusEnum.Companion.valueOf
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.cache.OchSPManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey
@@ -186,16 +185,16 @@ object LoginModel {
        Log.d("登录","设置源:queryCarStatus")
        mContext?.let {
            if(readCatche){
-            val logingInfoJson = OchSPManager.getString(loginInfoKey)
-            val timeText = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd)
-            logingInfoJson?.let {logininfo->
-                if(logininfo.startsWith(timeText)){
-                    val json = logingInfoJson.replace(timeText,"" )
-                    val oldLoginInfo = GsonUtils.fromJson(json, DriverStatusQueryRespBean::class.java)
-                    go2LoginInfo(oldLoginInfo,"缓存获取")
+                val logingInfoJson = OchSPManager.getString(loginInfoKey)
+                val timeText = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd)
+                logingInfoJson?.let {logininfo->
+                    if(logininfo.startsWith(timeText)){
+                        val json = logingInfoJson.replace(timeText,"" )
+                        val oldLoginInfo = GsonUtils.fromJson(json, DriverStatusQueryRespBean::class.java)
+                        go2LoginInfo(oldLoginInfo,"缓存获取")
+                    }
                }
            }
-                }
            OchCommonServiceManager.queryDriverServiceStatus(it, object : OchCommonServiceCallback<DriverStatusQueryRespBean> {
                    override fun onSuccess(data: DriverStatusQueryRespBean?) {
                        val map: MutableMap<String, Any> = HashMap()
--- a/OCH/common/bridge/.gitignore
+++ b/OCH/common/bridge/.gitignore
@@ -0,0 +1 @@
+/build
--- a/OCH/common/bridge/build.gradle
+++ b/OCH/common/bridge/build.gradle
@@ -0,0 +1,58 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-android-extensions'
+}
+
+android {
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation rootProject.ext.dependencies.kotlinstdlib
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.material
+    implementation rootProject.ext.dependencies.rxandroid
+    implementation project(':libraries:mogo-adas-data')
+    implementation project(':core:mogo-core-data')
+    implementation project(':foudations:mogo-commons')
+    implementation project(':OCH:common:common')
+    implementation project(':OCH:common:data')
+
+    implementation rootProject.ext.dependencies.amapnavi3dmap
+
+
+    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
+        implementation rootProject.ext.dependencies.mogo_core_function_call
+        api rootProject.ext.dependencies.mogo_core_function_map
+    }else {
+        implementation project(':core:mogo-core-function-call')
+        api project(':core:function-impl:mogo-core-function-map')
+    }
+}
--- a/OCH/common/bridge/consumer-rules.pro
+++ b/OCH/common/bridge/consumer-rules.pro
--- a/OCH/common/bridge/proguard-rules.pro
+++ b/OCH/common/bridge/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/OCH/common/bridge/src/main/AndroidManifest.xml
+++ b/OCH/common/bridge/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.och.bridge">
+
+</manifest>
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot;
+package com.mogo.och.bridge.autopilot;

 import android.content.Context;

@@ -14,8 +14,8 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.util.ParseVersionUtils;
-import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
-import com.mogo.och.common.module.manager.autopilot.line.LineManager;
+import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback;
+import com.mogo.och.bridge.autopilot.line.LineManager;
 import com.zhjt.mogo.adas.data.bean.AutopilotStatistics;
 import com.zhjt.mogo.adas.data.bean.LaunchConditionData;
 import com.zhjt.mogo.adas.data.bean.UnableLaunchReason;
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java
@@ -1,7 +1,7 @@
-package com.mogo.och.common.module.manager.autopilot.autopilot;
+package com.mogo.och.bridge.autopilot.autopilot;

 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation;
+import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation;
 import com.zhjt.mogo.adas.data.AdasConstants;

 import mogo.telematics.pad.MessagePad;
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchEventKey.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchEventKey.java
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.autopilot;
+package com.mogo.och.bridge.autopilot.autopilot;

 public interface IOchEventKey {
    // 无人化taxi   event_key_unmanned_taxi_start_service *
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.autopilot
+package com.mogo.och.bridge.autopilot.autopilot

 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -8,10 +8,10 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.SessionWithTime
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
-import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager
+import com.mogo.och.bridge.autopilot.autopilot.bean.SessionWithTime
+import com.mogo.och.bridge.autopilot.line.LineManager
+import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import java.util.concurrent.atomic.AtomicReference

@@ -48,7 +48,7 @@ object OchAutoPilotManager {
        if(sessionInfo==null){
            return true
        }else{
-            if(currentTimeMillis-sessionInfo.setTime>=OchAutopilotAnalytics.LOOP_PERIOD_16S){
+            if(currentTimeMillis-sessionInfo.setTime>= OchAutopilotAnalytics.LOOP_PERIOD_16S){
                clearGlobalSessionId("检测session 自带的时间 ${currentTimeMillis}_${sessionInfo.setTime}_${sessionInfo.sessionId}")
                return true
            }else{
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.autopilot
+package com.mogo.och.bridge.autopilot.autopilot

 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -13,14 +13,13 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.R
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
-import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager
+import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation
+import com.mogo.och.bridge.autopilot.line.LineManager
+import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.CallerBase
 import com.zhjt.mogo.adas.common.MessageType
 import com.zhjt.mogo.adas.data.AdasConstants
-import com.zhjt.mogo.adas.data.bean.MogoReport
 import com.zhjt.mogo.adas.data.bean.ReceivedAck
 import com.zhjt.mogo.adas.data.bean.ReceivedAck.Status
 import fsm.Fsm2024
@@ -201,7 +200,7 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene
    }

    override fun invoke(canStartAutopilot: Boolean) {
-        this.canStartAutopilot = canStartAutopilot
+        OchAutoPilotStatusListenerManager.canStartAutopilot = canStartAutopilot
    }

    override fun onAutopilotStatusResponseFromCan(state: Int) {
@@ -257,7 +256,10 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene

    override fun onReceiveReceivedAck(receivedAck: ReceivedAck) {
        if (receivedAck.messageType == MessageType.TYPE_SEND_SET_AUTOPILOT_MODE_REQ) {
-            OchAutopilotAnalytics.triggerStartAutopilotParametersAck(receivedAck.toString(),receivedAck.status == Status.NORMAL)
+            OchAutopilotAnalytics.triggerStartAutopilotParametersAck(
+                receivedAck.toString(),
+                receivedAck.status == Status.NORMAL
+            )
            if(receivedAck.status==Status.NORMAL){
                // 底盘接受成功
                LineManager.invokeStartAutopilotAckSuccess(receivedAck)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt
@@ -1,7 +1,6 @@
-package com.mogo.och.common.module.manager.autopilot.autopilot
+package com.mogo.och.bridge.autopilot.autopilot

 import android.text.TextUtils
-import com.alibaba.android.arouter.exception.InitException
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.utils.MogoAnalyticUtils
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
@@ -10,11 +9,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.SessionWithTime
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager
+import com.mogo.och.bridge.autopilot.autopilot.bean.SessionWithTime
+import com.mogo.och.bridge.autopilot.line.LineManager
+import com.mogo.och.common.module.exception.InitException
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
-import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable

@@ -273,7 +272,7 @@ object OchAutopilotAnalytics {
    // taxi        event_key_och_taxi_start_service *
    // 无人化taxiPa event_key_unmanned_taxi_start_service
    fun getEventKeyStartService(): String{
-        if(ochEventKey==null){
+        if(ochEventKey ==null){
            throw InitException("请设置启动自驾埋点key")
        }
        return ochEventKey!!.getEventKeyStartService()
@@ -286,7 +285,7 @@ object OchAutopilotAnalytics {
    // taxi        event_key_och_taxi_restart_autopilot *
    // 无人化taxiPa event_key_unmanned_taxi_restart_autopilot
    fun getEventKeyRestartService(): String{
-        if(ochEventKey==null){
+        if(ochEventKey ==null){
            throw InitException("请设置启动自驾埋点key")
        }
        return ochEventKey!!.getEventKeyRestartService()
@@ -299,7 +298,7 @@ object OchAutopilotAnalytics {
    // taxi        event_key_och_taxi_ap_unable_start_reason *
    // 无人化taxiPa event_key_och_taxi_ap_unable_start_reason
    fun getEventKeyApUnableStartReason(): String{
-        if(ochEventKey==null){
+        if(ochEventKey ==null){
            throw InitException("请设置启动自驾埋点key")
        }
        return ochEventKey!!.getEventKeyApUnableStartReason()
@@ -312,7 +311,7 @@ object OchAutopilotAnalytics {
    // taxi        event_key_och_taxi_click_start_autopilot
    // 无人化taxiPa event_key_och_taxi_passenger_click_start_autopilot
    fun getEventKeyClickStartAutopilot(): String{
-        if(ochEventKey==null){
+        if(ochEventKey ==null){
            throw InitException("请设置启动自驾埋点key")
        }
        return ochEventKey!!.getEventKeyClickStartAutopilot()
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/ArrivedStation.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/ArrivedStation.java
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.autopilot.bean;
+package com.mogo.och.bridge.autopilot.autopilot.bean;

 import com.mogo.eagle.core.data.map.MogoLocation;

--- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/bean/SessionWithTime.kt
+++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/bean/SessionWithTime.kt
@@ -0,0 +1,3 @@
+package com.mogo.och.bridge.autopilot.autopilot.bean
+
+data class SessionWithTime(val sessionId:Long,val setTime:Long)
--- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/callback/OchAdasStartFailureCallback.kt
+++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/callback/OchAdasStartFailureCallback.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.callback
+package com.mogo.och.bridge.autopilot.callback

 /**
 * @author: wangmingjun
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/ILineCallback.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/ILineCallback.java
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.line;
+package com.mogo.och.bridge.autopilot.line;


 public interface ILineCallback {
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.line
+package com.mogo.och.bridge.autopilot.line

 import android.text.TextUtils
 import com.elegant.network.utils.GsonUtil
@@ -23,12 +23,12 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.startAutoPilot
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
-import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager.startAutoPilot
+import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.CallerBase
 import com.mogo.och.common.module.voice.VoiceNotice
@@ -81,6 +81,7 @@ object LineManager : CallerBase<ILineCallback>() {
    private var autopilotId: String by Delegates.observable("") { _, oldValue, newValue ->
        if (oldValue != newValue) {
            CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(newValue)
+            isFirstStartAutopilot = true
            if(!AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)&&!AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
                val (start, end) = getStations()
                if(start!=null&&end!=null){
@@ -164,9 +165,9 @@ object LineManager : CallerBase<ILineCallback>() {
            clearGlobalTrajectory(true)
            CallerEagleBaseFunctionCall4OchManager.updateOrderLine("")
        }
-        this._lineInfos = lineInfo
+        _lineInfos = lineInfo
        setAutopilotControlParameters()
-        this._lineInfos?.let { line ->
+        _lineInfos?.let { line ->
            if (ProjectUtils.isSaas()) {
                val sb = StringBuilder()
                sb.append(line.lineName)
@@ -176,7 +177,7 @@ object LineManager : CallerBase<ILineCallback>() {
                CallerEagleBaseFunctionCall4OchManager.updateOrderLine(sb.toString())
            }
        }
-        OchChainLogManager.writeChainLogAutopilot("自驾参数", "线路信息:${contraiInfo}")
+        OchChainLogManager.writeChainLogAutopilot("自驾参数", "线路信息:$contraiInfo")
    }

    fun getStations(): Pair<BusStationBean?, BusStationBean?> {
@@ -190,7 +191,7 @@ object LineManager : CallerBase<ILineCallback>() {
                return
            }
        }
-        OchChainLogManager.writeChainLog("异常情况","startStation:${startStation}__endStation:${endStation}")
+        OchChainLogManager.writeChainLog("异常情况","startStation:${startStation}__endStation:$endStation")
    }

    fun getStationsWithLine(function: (start: BusStationBean, end: BusStationBean, lineInfo: LineInfo) -> Unit) {
@@ -204,7 +205,7 @@ object LineManager : CallerBase<ILineCallback>() {
        }
        OchChainLogManager.writeChainLog(
            "异常情况",
-            "startStation:${startStation}__endStation:${endStation}__lineInfos:${_lineInfos}"
+            "startStation:${startStation}__endStation:${endStation}__lineInfos:$_lineInfos"
        )
    }

@@ -221,7 +222,7 @@ object LineManager : CallerBase<ILineCallback>() {
        }
        OchChainLogManager.writeChainLog(
            "异常情况",
-            "startStation:${startStation}__endStation:${endStation}__lineInfos:${_lineInfos}__contraiInfo:${_contraiInfo}"
+            "startStation:${startStation}__endStation:${endStation}__lineInfos:${_lineInfos}__contraiInfo:$_contraiInfo"
        )
    }

@@ -230,7 +231,7 @@ object LineManager : CallerBase<ILineCallback>() {
            function.invoke(start)
            return
        }
-        OchChainLogManager.writeChainLog("异常情况", "startStation:${startStation}")
+        OchChainLogManager.writeChainLog("异常情况", "startStation:$startStation")
    }

    fun getLineInfo(function: (lineInfo: LineInfo) -> Unit){
@@ -238,7 +239,7 @@ object LineManager : CallerBase<ILineCallback>() {
            function.invoke(line)
            return
        }
-        OchChainLogManager.writeChainLog("异常情况", "lineInfos:${_lineInfos}")
+        OchChainLogManager.writeChainLog("异常情况", "lineInfos:$_lineInfos")
    }


@@ -253,7 +254,7 @@ object LineManager : CallerBase<ILineCallback>() {

    private fun setAutopilotControlParameters(){
        getStationsWithLineAndContrai { start, end, lineInfo, contrai ->
-            val parameters = LineManager.initAutopilotControlParameters()
+            val parameters = initAutopilotControlParameters()
            if (null == parameters) {
                e(M_BUS + TAG, "AutopilotControlParameters is empty.")
                return@getStationsWithLineAndContrai
@@ -268,7 +269,7 @@ object LineManager : CallerBase<ILineCallback>() {
            endStationLocation.latitude = end.gcjLat
            endStationLocation.longitude = end.gcjLon
            TrajectoryAndDistanceManager.setStationPoint(startStationLocation, endStationLocation, lineInfo.lineId)
-            OchLocationManager.addGCJ02Listener(TAG,1,mMapLocationListener)
+            OchLocationManager.addGCJ02Listener(TAG,1, mMapLocationListener)
            // 恢复启动自驾信息
            searchAutopilotState()
        }
@@ -279,7 +280,7 @@ object LineManager : CallerBase<ILineCallback>() {
    private fun clearAutopilotControlParameters(){
        CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null)
        TrajectoryAndDistanceManager.setStationPoint(null, null, null)
-        this.autopilotId = ""
+        autopilotId = ""
        OchLocationManager.removeGCJ02Listener(TAG)
    }

@@ -324,8 +325,8 @@ object LineManager : CallerBase<ILineCallback>() {
            parameters?.startLatLon = AutoPilotLonLat(start.lat, start.lon)
            parameters?.endLatLon = AutoPilotLonLat(end.lat, end.lon)
            parameters?.vehicleType = 10
-            this.autopilotId =  "${lineInfo.lineId}_${start.siteId}_${end.siteId}_${lineInfo.orderId}"
-            parameters?.orderId = this.autopilotId
+            autopilotId =  "${lineInfo.lineId}_${start.siteId}_${end.siteId}_${lineInfo.orderId}"
+            parameters?.orderId = autopilotId
            parameters?.firstAutopilotFlag = isFirstStartAutopilot

            if (parameters?.autoPilotLine == null) {
@@ -428,7 +429,7 @@ object LineManager : CallerBase<ILineCallback>() {
    // 启动自动驾驶
    fun startAutopilot() {

-        if(startStation==null|| endStation==null){
+        if(startStation ==null|| endStation ==null){
            ToastUtils.showShort("未设置起始或终点站点")
            return
        }
@@ -450,7 +451,7 @@ object LineManager : CallerBase<ILineCallback>() {
        OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis())

        //1、判断轨迹url是否可用
-        if(_contraiInfo==null){
+        if(_contraiInfo ==null){
            ToastUtils.showLong("无发布轨迹, 请发布后重试")
            return
        }else{
@@ -462,7 +463,7 @@ object LineManager : CallerBase<ILineCallback>() {
                e(
                    TAG, "isPassStartAutopilotCommand = " +
                            FunctionBuildConfig.isPassStartAutopilotCommand
-                            + "busRoutesResult.csvFileUrl = " + LineManager._contraiInfo!!.csvFileUrl
+                            + "busRoutesResult.csvFileUrl = " + _contraiInfo!!.csvFileUrl
                )
                return
            }
@@ -501,7 +502,7 @@ object LineManager : CallerBase<ILineCallback>() {
            M_BUS + TAG,
            "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
                    + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName +
-                    "isRestart = " + LineManager.isFirstStartAutopilot
+                    "isRestart = " + isFirstStartAutopilot
        )

        M_LISTENERS.forEach {
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/location/LocationManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/location/LocationManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.location
+package com.mogo.och.bridge.autopilot.location

 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/ITrajectoryListListener.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/ITrajectoryListListener.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.trajectory
+package com.mogo.och.bridge.autopilot.trajectory

 import com.mogo.eagle.core.data.map.MogoLocation

--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryCache.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryCache.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.trajectory
+package com.mogo.och.bridge.autopilot.trajectory

 import com.elegant.network.utils.GsonUtil
 import com.mogo.commons.AbsMogoApplication
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.autopilot.trajectory
+package com.mogo.och.bridge.autopilot.trajectory

 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.map.MogoLocation
@@ -10,7 +10,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog
 import com.mogo.och.common.module.utils.CallerBase
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import com.zhjt.mogo.adas.data.bean.MogoReport
 import mogo.telematics.pad.MessagePad

@@ -57,7 +57,7 @@ object TrajectoryManager :  CallerBase<ITrajectoryListListener>(),IMoGoPlanningR
                        CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "重复轨迹")
                        return
                    }
-                    this.lineId = globalPathResp.lineId
+                    lineId = globalPathResp.lineId
                }
                updateRoutePoints(it)
            }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorManager.kt
@@ -1,7 +1,7 @@
-package com.mogo.och.common.module.manager.device
+package com.mogo.och.bridge.device

 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import io.reactivex.disposables.Disposable
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorStatusManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorStatusManager.kt
@@ -1,13 +1,13 @@
-package com.mogo.och.common.module.manager.device
+package com.mogo.och.bridge.device

 import chassis.VehicleStateOuterClass
 import com.mogo.eagle.core.function.api.autopilot.IMoGoRoboBusJinlvM1StatesListener
 import com.mogo.eagle.core.function.call.autopilot.CallerRoboBusJinlvM1StatesListenerManager
-import com.mogo.och.common.module.manager.device.callback.LightAirconditionDoorCallback
-import com.mogo.och.common.module.manager.device.data.AirconditionStatus
-import com.mogo.och.common.module.manager.device.data.DoorStatus
-import com.mogo.och.common.module.manager.device.data.HeaterStatue
-import com.mogo.och.common.module.manager.device.data.LightStatus
+import com.mogo.och.bridge.device.callback.LightAirconditionDoorCallback
+import com.mogo.och.bridge.device.data.AirconditionStatus
+import com.mogo.och.bridge.device.data.DoorStatus
+import com.mogo.och.bridge.device.data.HeaterStatue
+import com.mogo.och.bridge.device.data.LightStatus
 import java.util.concurrent.ConcurrentHashMap

 object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener {
@@ -37,8 +37,8 @@ object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener {
        listener.onLightTop1Callback(lightStatus,true)
        listener.onLightTop2Callback(lightStatus,true)
        listener.onLightAtmosphereCallback(lightStatus,true)
-        listener.onAirconditionStatusCallback(heaterStatue.isOpen,airconditionStatus,true)
-        listener.onHeaterStatusCallback(airconditionStatus.isOpen,heaterStatue,true)
+        listener.onAirconditionStatusCallback(heaterStatue.isOpen, airconditionStatus,true)
+        listener.onHeaterStatusCallback(airconditionStatus.isOpen, heaterStatue,true)
    }

    fun removeListener(tag: String) {
@@ -78,7 +78,7 @@ object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener {
            M_LISTENERS.forEach {
                val tag = it.key
                val listener = it.value
-                listener.onAirconditionStatusCallback(heaterState.isOn,airconditionStatus,false)
+                listener.onAirconditionStatusCallback(heaterState.isOn, airconditionStatus,false)
            }
        }
        if (heaterState.isOn != heaterStatue.isOpen ||
@@ -89,7 +89,7 @@ object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener {
            M_LISTENERS.forEach {
                val tag = it.key
                val listener = it.value
-                listener.onHeaterStatusCallback(airConditionerState.isOn,heaterStatue,false)
+                listener.onHeaterStatusCallback(airConditionerState.isOn, heaterStatue,false)
            }
        }
        if (states.frontDoorState.isOn != doorStatus.isOpen) {
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/TaxiDoorStateManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/TaxiDoorStateManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.device
+package com.mogo.och.bridge.device

 import chassis.Chassis
 import chassis.VehicleStateOuterClass
@@ -7,9 +7,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListene
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.och.common.module.manager.device.callback.DoorStateCallback
-import com.mogo.och.common.module.manager.device.data.DoorPosition
-import com.mogo.och.common.module.manager.device.data.DoorState
+import com.mogo.och.bridge.device.callback.DoorStateCallback
+import com.mogo.och.bridge.device.data.DoorPosition
+import com.mogo.och.bridge.device.data.DoorState

 object TaxiDoorStateManager : IMoGoChassisDoorStateListener,
    CallerBase<DoorStateCallback>() {
@@ -67,9 +67,14 @@ object TaxiDoorStateManager : IMoGoChassisDoorStateListener,
    override fun onAutopilotSingleDoorState(num: Chassis.DoorNumber, status: Int) {
        CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化：${num}--${status}")
        when (status) {
-            0 -> { exchangeEnum(num, DoorState.CLOSE)}
-            1 -> {exchangeEnum(num, DoorState.OPEN)}
-            2 -> {exchangeEnum(num, DoorState.UNKNOWN)}
+            0 -> { exchangeEnum(num, DoorState.CLOSE)
+            }
+            1 -> {
+                exchangeEnum(num, DoorState.OPEN)
+            }
+            2 -> {
+                exchangeEnum(num, DoorState.UNKNOWN)
+            }
            else -> {}
        }

@@ -118,7 +123,7 @@ object TaxiDoorStateManager : IMoGoChassisDoorStateListener,
     * @param doorState     车门状态
     */
    @Synchronized
-    private fun invokeSingleDoorOpenState(doorPosition: DoorPosition,doorState: DoorState) {
+    private fun invokeSingleDoorOpenState(doorPosition: DoorPosition, doorState: DoorState) {
        M_LISTENERS.forEach {
            val listener = it.value
            listener.doorStateChangeCallback(doorPosition,doorState)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/DoorStateCallback.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/DoorStateCallback.kt
@@ -1,7 +1,7 @@
-package com.mogo.och.common.module.manager.device.callback
+package com.mogo.och.bridge.device.callback

-import com.mogo.och.common.module.manager.device.data.DoorPosition
-import com.mogo.och.common.module.manager.device.data.DoorState
+import com.mogo.och.bridge.device.data.DoorPosition
+import com.mogo.och.bridge.device.data.DoorState

 interface DoorStateCallback {

@@ -15,5 +15,5 @@ interface DoorStateCallback {
     * @param position 车门位置
     * @param state 当前车门状态
     */
-    fun doorStateChangeCallback(position: DoorPosition,state: DoorState){}
+    fun doorStateChangeCallback(position: DoorPosition, state: DoorState){}
 }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/LightAirconditionDoorCallback.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/LightAirconditionDoorCallback.kt
@@ -1,17 +1,17 @@
-package com.mogo.och.common.module.manager.device.callback
+package com.mogo.och.bridge.device.callback

-import com.mogo.och.common.module.manager.device.data.AirconditionStatus
-import com.mogo.och.common.module.manager.device.data.HeaterStatue
-import com.mogo.och.common.module.manager.device.data.LightStatus
+import com.mogo.och.bridge.device.data.AirconditionStatus
+import com.mogo.och.bridge.device.data.HeaterStatue
+import com.mogo.och.bridge.device.data.LightStatus

 interface LightAirconditionDoorCallback {

    fun onAirconditionStatusCallback(heaterIsOpen: Boolean, airconditionStatus: AirconditionStatus,
-        isFirst: Boolean) {
+                                     isFirst: Boolean) {
    }

    fun onHeaterStatusCallback(airconditionIsOpen: Boolean, heaterStatue: HeaterStatue,
-        isFirst: Boolean) {
+                               isFirst: Boolean) {
    }

    fun onDoorStatusCallback(isOpen: Boolean, isFirst: Boolean) {}
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinErrorDialog.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinErrorDialog.kt
@@ -1,10 +1,10 @@
-package com.mogo.och.common.module.manager.device.checkvin
+package com.mogo.och.bridge.device.checkvin

 import android.content.Context
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
 import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.och.common.module.R
+import com.mogo.och.bridge.R
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import kotlinx.android.synthetic.main.common_checkvin_view.actv_see

@@ -19,7 +19,9 @@ class CheckVinErrorDialog(context: Context) : BaseFloatDialog(context), Lifecycl
        setCanceledOnTouchOutside(true)

        actv_see.onClick {
-            OchChainLogManager.writeChainLog("vinCheck","用户点击了 ”我知道了“",true,EVENT_KEY_INFO_CHECK_VIN)
+            OchChainLogManager.writeChainLog("vinCheck","用户点击了 ”我知道了“",true,
+                EVENT_KEY_INFO_CHECK_VIN
+            )
            dismiss()
        }
    }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.device.checkvin
+package com.mogo.och.bridge.device.checkvin

 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
@@ -16,11 +16,11 @@ object CheckVinManager : IMoGoAutopilotCarConfigListener {
    private val TAG = CheckVinManager::class.java.simpleName
    
    init {
-        BizLoopManager.setLoopFunction(TAG, LoopInfo(60*5,::checkVin,scheduler = Schedulers.io()))
+        BizLoopManager.setLoopFunction(TAG, LoopInfo(60*5, CheckVinManager::checkVin,scheduler = Schedulers.io()))
        CallerAutopilotCarConfigListenerManager.addListener(TAG,this)
    }

-    private var checkVinErrorDialog:CheckVinErrorDialog?=null
+    private var checkVinErrorDialog: CheckVinErrorDialog?=null

    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
        checkVin()
@@ -55,7 +55,7 @@ object CheckVinManager : IMoGoAutopilotCarConfigListener {
                val topActivity = ActivityUtils.getTopActivity()
                topActivity?.let {
                    UiThreadHandler.post({
-                        if(checkVinErrorDialog!=null&&checkVinErrorDialog!!.isShowing){
+                        if(checkVinErrorDialog !=null&& checkVinErrorDialog!!.isShowing){
                            return@post
                        }
                        checkVinErrorDialog = CheckVinErrorDialog(it)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/AirconditionStatus.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/AirconditionStatus.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.device.data
+package com.mogo.och.bridge.device.data

 data class AirconditionStatus(
    var isOpen: Boolean,
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/DoorStatus.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/DoorStatus.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.device.data
+package com.mogo.och.bridge.device.data

 data class DoorStatus(var isOpen: Boolean)

--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/HeaterStatue.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/HeaterStatue.kt
@@ -1,3 +1,3 @@
-package com.mogo.och.common.module.manager.device.data
+package com.mogo.och.bridge.device.data

 data class HeaterStatue(var isOpen: Boolean, var windSpeed: Int)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/LightStatus.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/LightStatus.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.device.data
+package com.mogo.och.bridge.device.data

 data class LightStatus(
    var isOpenLight1: Boolean,
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/DistanceDegree.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/DistanceDegree.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.distance
+package com.mogo.och.bridge.distance

 data class DistanceDegree(var distance: Float, var degree: Double?, var isNext: Boolean?) :
    Comparable<DistanceDegree> {
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/IDistanceListener.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/IDistanceListener.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.distance
+package com.mogo.och.bridge.distance

 import com.mogo.eagle.core.data.map.MogoLocation

--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/StationAndIndex.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/StationAndIndex.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.distance
+package com.mogo.och.bridge.distance

 import com.mogo.eagle.core.data.map.MogoLocation

--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager.distance
+package com.mogo.och.bridge.distance

 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.map.MogoLocation
@@ -11,12 +11,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.LocationUtils
 import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
-import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryCache
+import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.autopilot.trajectory.TrajectoryCache
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.manager.loop.LoopInfo
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import io.reactivex.schedulers.Schedulers
 import mogo.telematics.pad.MessagePad
 import java.util.concurrent.ConcurrentHashMap
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt
@@ -1,25 +1,20 @@
-package com.mogo.och.common.module.wigets.autopilot
+package com.mogo.och.bridge.ui.autopilot

-import android.animation.Animator
-import android.animation.Animator.AnimatorListener
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
-import android.animation.ValueAnimator
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
-import android.view.View
 import android.view.animation.LinearInterpolator
 import androidx.annotation.DrawableRes
-import androidx.annotation.IntegerRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.common.module.R
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.bridge.R
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.utils.BigFrameAnimatorContainer
 import com.mogo.och.common.module.utils.ResourcesUtils
 import kotlinx.android.synthetic.main.common_autopilot_view.view.aciv_autopilot_running_ani
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.wigets.autopilot
+package com.mogo.och.bridge.ui.autopilot

 import androidx.lifecycle.ViewModel
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
@@ -6,10 +6,10 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.debug.autopilot.AutopilotStateDebug
 import com.mogo.och.common.module.debug.autopilot.IOchDebugAutopilotStatusListener
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
-import com.mogo.och.common.module.manager.autopilot.line.ILineCallback
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
+import com.mogo.och.bridge.autopilot.line.ILineCallback
+import com.mogo.och.bridge.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.utils.RxUtils
@@ -20,12 +20,14 @@ import java.util.concurrent.atomic.AtomicBoolean
 * @description BadCase录包管理页面
 * @since: 2022/12/15
 */
-class AutopilotStateModel :  ViewModel(), IOchAutopilotStatusListener, ILineCallback,
+class AutopilotStateModel :  ViewModel(),
+    com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener,
+    com.mogo.och.bridge.autopilot.line.ILineCallback,
    IOchDebugAutopilotStatusListener {

    private val TAG = AutopilotStateModel::class.java.simpleName

-    private var viewCallback:AutopilotStateCallback?=null
+    private var viewCallback: AutopilotStateCallback?=null

    private val isPalyStartAni = AtomicBoolean(false)

@@ -33,25 +35,25 @@ class AutopilotStateModel :  ViewModel(), IOchAutopilotStatusListener, ILineCall
    override fun onCleared() {
        this.viewCallback = null
        AutopilotStateDebug.removeListener(TAG)
-        OchAutoPilotStatusListenerManager.removeListener(TAG)
-        LineManager.removeListener(TAG)
+        com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.removeListener(TAG)
+        com.mogo.och.bridge.autopilot.line.LineManager.removeListener(TAG)
    }

-    fun setViewCallback(viewCallback:AutopilotStateCallback){
+    fun setViewCallback(viewCallback: AutopilotStateCallback){
        this.viewCallback = viewCallback
        AutopilotStateDebug.addListener(TAG,this)
-        OchAutoPilotStatusListenerManager.addListener(TAG,this)
-        LineManager.addListener(TAG,this)
+        com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.addListener(TAG,this)
+        com.mogo.och.bridge.autopilot.line.LineManager.addListener(TAG,this)
    }

    override fun debugStatusChange(debugStatus: Boolean) {
        super.debugStatusChange(debugStatus)
        if(debugStatus){
-            OchAutoPilotStatusListenerManager.removeListener(TAG)
-            LineManager.removeListener(TAG)
+            com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.removeListener(TAG)
+            com.mogo.och.bridge.autopilot.line.LineManager.removeListener(TAG)
        }else{
-            OchAutoPilotStatusListenerManager.addListener(TAG,this)
-            LineManager.addListener(TAG,this)
+            com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.addListener(TAG,this)
+            com.mogo.och.bridge.autopilot.line.LineManager.addListener(TAG,this)
        }
    }

@@ -98,19 +100,19 @@ class AutopilotStateModel :  ViewModel(), IOchAutopilotStatusListener, ILineCall
        // 按照启动自驾失败计算
        if(isPalyStartAni.get() &&
                (!CallerAutoPilotControlManager.isCanStartAutopilot(false)
-                    || OchAutoPilotStatusListenerManager.autopilotState!=IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING)){
+                    || com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState!=IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING)){
            OchChainLogManager.writeChainLog("自驾信息","正在起自驾过程中、自驾状态变化切为非自驾状态或者FSM 状态改为不能启动自驾")
            startAutopilotFail()
            return
        }
        BizLoopManager.runInMainThread{
-            OchChainLogManager.writeChainLog("自驾信息","自驾状态:${OchAutoPilotStatusListenerManager.autopilotState} 能否启动自驾：${CallerAutoPilotControlManager.isCanStartAutopilot(false)}")
-            when (OchAutoPilotStatusListenerManager.autopilotState) {
+            OchChainLogManager.writeChainLog("自驾信息","自驾状态:${com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState} 能否启动自驾：${CallerAutoPilotControlManager.isCanStartAutopilot(false)}")
+            when (com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState) {
                IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE-> {// 不可用 不可启动自驾
                    this.viewCallback?.autopilotDisable()
                }
                IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE-> {
-                    if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用
+                    if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用
                        this.viewCallback?.canStartAutopilot()
                    } else {// 部分可用
                        this.viewCallback?.autopilotDisable()
@@ -136,7 +138,7 @@ class AutopilotStateModel :  ViewModel(), IOchAutopilotStatusListener, ILineCall
                startAutopilotFail()
            }
        }else {
-            LineManager.startAutopilot()
+            com.mogo.och.bridge.autopilot.line.LineManager.startAutopilot()
        }
    }

@@ -153,7 +155,7 @@ class AutopilotStateModel :  ViewModel(), IOchAutopilotStatusListener, ILineCall

    override fun startAutopilotTimeOut() {
        OchChainLogManager.writeChainLog("自驾信息","启动自驾超时失败")
-        if(OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
+        if(com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
            autopilotStateChange()
        }else {
            startAutopilotFail()
@@ -162,7 +164,7 @@ class AutopilotStateModel :  ViewModel(), IOchAutopilotStatusListener, ILineCall

    override fun startAutopilotFailure(startFailedCode: String?, startFailedMessage: String?) {
        OchChainLogManager.writeChainLog("自驾信息","底盘强制失败原因：${startFailedCode}_${startFailedMessage}")
-        if(OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
+        if(com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
            autopilotStateChange()
        }else {
            startAutopilotFail()
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.wigets.map.drawline
+package com.mogo.och.bridge.ui.drawline

 import android.content.Context
 import android.util.AttributeSet
@@ -8,8 +8,8 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.och.common.module.R
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
+import com.mogo.och.bridge.R
+import com.mogo.och.bridge.autopilot.line.LineManager
 import com.mogo.och.common.module.utils.ResourcesUtils
 import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_head
 import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_title
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineViewModel.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineViewModel.kt
@@ -1,10 +1,10 @@
-package com.mogo.och.common.module.wigets.map.drawline
+package com.mogo.och.bridge.ui.drawline

 import androidx.annotation.DrawableRes
 import androidx.lifecycle.ViewModel
 import com.mogo.och.common.module.R
-import com.mogo.och.common.module.manager.autopilot.line.ILineCallback
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
+import com.mogo.och.bridge.autopilot.line.ILineCallback
+import com.mogo.och.bridge.autopilot.line.LineManager

 class LineViewModel : ViewModel(), ILineCallback {

--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/IMapDirectionView.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/IMapDirectionView.java
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.wigets.mapdirectionview;
+package com.mogo.och.bridge.ui.mapdirectionview;

 /**
 * @author xiaoyuzhou
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.wigets.mapdirectionview
+package com.mogo.och.bridge.ui.mapdirectionview

 import android.content.Context
 import android.os.Bundle
@@ -28,7 +28,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.R
-import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
+import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.shuttle.passenger.ui.mapdirectionview.MapDirectionViewModel
 import me.jessyan.autosize.utils.AutoSizeUtils

--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionViewModel.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionViewModel.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.ViewModel
 import com.amap.api.maps.model.LatLng
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.och.common.module.manager.distance.ITrajectoryListener
-import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
+import com.mogo.och.bridge.distance.ITrajectoryListener
+import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager

 class MapDirectionViewModel: ViewModel(), ITrajectoryListener {

--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.utils
+package com.mogo.och.bridge.utils

 import android.content.Context
 import android.location.Location
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
-import com.mogo.och.common.module.manager.distance.DistanceDegree
+import com.mogo.och.bridge.distance.DistanceDegree
 import mogo.telematics.pad.MessagePad
 import java.util.TreeMap
 import kotlin.math.acos
@@ -752,8 +752,8 @@ object CoordinateCalculateRouteUtil {

        //  最近点中包含上次计算的点和上次计算的最近的一个点
        if(distanceMap.containsValue(preIndex)&&distanceMap.containsValue(preIndex+1)&&type==1){
-            var preIndexDistance:DistanceDegree?=null
-            var preIndexNextDistance:DistanceDegree?=null
+            var preIndexDistance: com.mogo.och.bridge.distance.DistanceDegree?=null
+            var preIndexNextDistance: com.mogo.och.bridge.distance.DistanceDegree?=null
            distanceMap.iterator().forEach { en ->
                val key = en.key
                val value = en.value
--- a/OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml
+++ b/OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml
--- a/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml
+++ b/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml
--- a/OCH/common/bridge/src/main/res/layout/common_line_view.xml
+++ b/OCH/common/bridge/src/main/res/layout/common_line_view.xml
--- a/OCH/common/common/build.gradle
+++ b/OCH/common/common/build.gradle
@@ -73,7 +73,6 @@ dependencies {
    implementation rootProject.ext.dependencies.litezxing

    api rootProject.ext.dependencies.flexbox
-    api project(":OCH:common:data")
    api rootProject.ext.dependencies.lottie

    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
--- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
+++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
@@ -33,8 +33,9 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.debug.location.MogoLocationExit
-import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
-import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
+//import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
+//import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
+//import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.view.DebugFloatWindow
 import com.zhjt.mogo.adas.data.bean.AutopilotStatistics
 import mogo.telematics.pad.MessagePad
@@ -214,16 +215,16 @@ object DebugDataDispatch {
    }

    fun setStation(startLon:Double,startLat:Double,endLon:Double,endLat:Double,lineID:Long){
-        if(startLon<0||startLat<0||endLon<0||endLat<0||lineID<0){
-            TrajectoryAndDistanceManager.setStationPoint(null,null,-1)
-        }
-        val startLocation = MogoLocation()
-        startLocation.longitude = startLon
-        startLocation.latitude = startLat
-        val endLocation = MogoLocation()
-        endLocation.longitude = endLon
-        endLocation.latitude = endLat
-        TrajectoryAndDistanceManager.setStationPoint(startLocation,endLocation,lineID)
+//        if(startLon<0||startLat<0||endLon<0||endLat<0||lineID<0){
+//            TrajectoryAndDistanceManager.setStationPoint(null,null,-1)
+//        }
+//        val startLocation = MogoLocation()
+//        startLocation.longitude = startLon
+//        startLocation.latitude = startLat
+//        val endLocation = MogoLocation()
+//        endLocation.longitude = endLon
+//        endLocation.latitude = endLat
+//        TrajectoryAndDistanceManager.setStationPoint(startLocation,endLocation,lineID)
    }

    fun getLocaitonByLog(path:String) {
@@ -290,11 +291,11 @@ object DebugDataDispatch {
        val mogoSecondLocation = MogoLocation()
        mogoSecondLocation.latitude = list[1].latitude
        mogoSecondLocation.longitude = list[1].longitude
-        val angle = CoordinateCalculateRouteUtil.getHeadingAngle(
-            mogoLocation,
-            mogoSecondLocation
-        )
-        mogoLocation.heading = angle
+//        val angle = CoordinateCalculateRouteUtil.getHeadingAngle(
+//            mogoLocation,
+//            mogoSecondLocation
+//        )
+//        mogoLocation.heading = angle

        CallerChassisLocationGCJ02ListenerManager.invokeChassisLocationGCJ02(
            mogoLocation,
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/BusinessEnum.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/BusinessEnum.kt
@@ -13,7 +13,8 @@ enum class BusinessEnum(val code: Int) {
    Taxi( 9),
    Bus( 10),
    Shuttle( 11),
-    Charter( 13),;
+    Charter( 13),
+    SCHEDULED(14);

    companion object {
        @JvmStatic
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/CommonService.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/CommonService.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.view.View
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.template.IProvider
-import com.mogo.och.common.module.wigets.autopilot.AutopilotState

 interface CommonService : IProvider {

@@ -20,10 +19,6 @@ interface CommonService : IProvider {

    fun createOchBindQRCodeView(context: Context?):View?{return null}

-    fun createStartAutopilotView(context: Context?):View?{
-        return context?.let {
-            AutopilotState(it)
-        }
-    }
+    fun createStartAutopilotView(context: Context?):View?{return null}

 }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/exception/InitException.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/exception/InitException.java
@@ -0,0 +1,7 @@
+package com.mogo.och.common.module.exception;
+
+public class InitException extends RuntimeException {
+    public InitException(String detailMessage) {
+        super(detailMessage);
+    }
+}
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt
@@ -1,3 +0,0 @@
-package com.mogo.och.common.module.manager.autopilot.autopilot.bean
-
-data class SessionWithTime(val sessionId:Long,val setTime:Long)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt
@@ -145,7 +145,8 @@ enum class BusinessType {
    shuttle,
    charter,
    taxi,
-    taxiunmanned
+    taxiunmanned,
+
 }

 enum class ProjectType {
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt
@@ -152,6 +152,7 @@ object FlavorUtils {
                    BusinessType.charter
                }

+
                else -> {
                    BusinessType.none
                }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt
@@ -4,11 +4,10 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.common.module.R
 import com.mogo.och.common.module.utils.ResourcesUtils
-import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_head
-import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_title
+import kotlinx.android.synthetic.main.common_biz_board.view.iv_toolkit_item_head
+import kotlinx.android.synthetic.main.common_biz_board.view.iv_toolkit_item_title

 /**
 *
@@ -28,7 +27,7 @@ class OperationalInfoGatewayView : ConstraintLayout {
    )

    private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.common_line_view, this, true)
+        LayoutInflater.from(context).inflate(R.layout.common_biz_board, this, true)
        iv_toolkit_item_head.setImageResource(R.drawable.common_biz_operation)
        iv_toolkit_item_title.text = ResourcesUtils.getString(R.string.common_operation)
    }
--- a/OCH/common/common/src/main/res/layout/common_biz_board.xml
+++ b/OCH/common/common/src/main/res/layout/common_biz_board.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/acc_default_txt_color"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/iv_toolkit_item_head"
+        android:layout_width="@dimen/dp_160"
+        android:layout_height="@dimen/dp_160"
+        android:scaleType="fitXY"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/common_biz_operation"
+        />
+
+    <TextView
+        android:id="@+id/iv_toolkit_item_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_1"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="2"
+        android:text="@string/common_operation"
+        android:textColor="@color/color_FFFFFF"
+        android:textSize="@dimen/sp_38"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_toolkit_item_head"/>
+
+</merge>
--- a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt
+++ b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt
@@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateTransform
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.och.common.module.debug.location.MogoLocationExit
-import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
+import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType
@@ -112,7 +112,7 @@ class ExampleUnitTest {
        mogoLocation.latitude = 26.81621974773846
        mogoLocation.longitude = 112.58256523642582
        mogoLocation.heading = 54.70416759597498
-        TrajectoryAndDistanceManager.distanceWithTrajectory(mutableListOf,mogoLocation)
+        com.mogo.och.bridge.distance.TrajectoryAndDistanceManager.distanceWithTrajectory(mutableListOf,mogoLocation)
    }

    @Test
--- a/OCH/facade/build.gradle
+++ b/OCH/facade/build.gradle
@@ -60,6 +60,7 @@ dependencies {
    implementation rootProject.ext.dependencies.material
    implementation rootProject.ext.dependencies.rxandroid
    implementation rootProject.ext.dependencies.arouter
+    implementation project(':OCH:common:bridge')
    kapt rootProject.ext.dependencies.aroutercompiler

    apply from: "./script/och.gradle"
--- a/OCH/facade/script/och.gradle
+++ b/OCH/facade/script/och.gradle
@@ -26,23 +26,20 @@ project.dependencies {
        } else if (isCurrentPassenger("B2")) {
            implementation project.project(':OCH:shuttle:passenger_weaknet')
        } else if (isCurrentDriver("T1T2")) {
-//            implementation project.project(':OCH:taxi:driver')
            implementation project.project(':OCH:taxi:unmanned-driver')
        } else if (isCurrentPassenger("T1T2")) {
            implementation project.project(':OCH:taxi:unmanned-passenger')
-//            implementation project.project(':OCH:taxi:passenger')
        } else if (isCurrentDriver("ALL")) {
            implementation project.project(':OCH:offline:driver')
            implementation project.project(':OCH:taxi:unmanned-driver')
-//            implementation project.project(':OCH:taxi:driver')
            implementation project.project(':OCH:charter:driver')
            implementation project.project(':OCH:sweeper:driver')
+            implementation project.project(':OCH:shuttle:driver_weaknet')
        } else if (isCurrentPassenger("ALL")) {
            implementation project.project(':OCH:taxi:unmanned-passenger')
-//            implementation project.project(':OCH:taxi:passenger')
            implementation project.project(':OCH:charter:passenger')
            implementation project.project(':OCH:shuttle:passenger_weaknet')
-            implementation project.project(':OCH:shuttle:driver_weaknet')
+
        } else {
            implementation project.project(':OCH:offline:driver')
            implementation project.project(':OCH:charter:driver')
--- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt
@@ -6,10 +6,10 @@ import androidx.fragment.app.FragmentActivity
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.och.bridge.device.checkvin.CheckVinManager
 import com.mogo.och.common.module.biz.lansocket.LoginLanDriverSocket
 import com.mogo.och.common.module.biz.login.LoginStatusEnum
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.manager.device.checkvin.CheckVinManager
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.facade.constant.FacadeConst

--- a/OCH/offline/driver/build.gradle
+++ b/OCH/offline/driver/build.gradle
@@ -51,6 +51,7 @@ dependencies {
    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
+    implementation project(':OCH:common:bridge')
    kapt rootProject.ext.dependencies.aroutercompiler
    implementation rootProject.ext.dependencies.androidxconstraintlayout
    implementation rootProject.ext.dependencies.amapnavi3dmap
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt
@@ -1,6 +1,7 @@
 package com.mogo.och.offline

 import android.content.Context
+import android.view.View
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
@@ -8,7 +9,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.offline.fragment.ShuttleFragment
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.provider.CommonServiceImpl
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.ui.autopilot.AutopilotState
 import com.mogo.och.offline.util.BusAnalyticsManager
 import com.mogo.och.offline.util.OffLineTrajectoryManager

@@ -42,4 +44,10 @@ class ShuttleDriverProvider : CommonServiceImpl() {
        busFragment = null
    }

+    override fun createStartAutopilotView(context: Context?): View? {
+        return context?.let {
+            AutopilotState(it)
+        }
+    }
+
 }
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
@@ -20,9 +20,12 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.utilcode.util.StringUtils;
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics;
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
-import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager;
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager;
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager;
+import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics;
+import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation;
+import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback;
+import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager;
 import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction;
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
 import com.mogo.och.common.module.manager.socket.lan.LedScreenManager;
@@ -36,7 +39,6 @@ import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg;
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType;
 import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation;
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
 import com.mogo.och.common.module.utils.OCHThreadPoolManager;
 import com.mogo.och.data.bean.BusStationBean;
@@ -57,9 +59,7 @@ import com.mogo.och.offline.callback.ISlidePannelHideCallback;
 import com.mogo.och.offline.constant.BusConst;
 import com.mogo.och.offline.util.OffLineTrajectoryManager;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
-import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager;
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;
 import com.mogo.och.common.module.utils.DateTimeUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java
@@ -16,10 +16,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager;
+import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener;
+import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager;
+import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation;
 import com.mogo.och.common.module.biz.login.LoginStatusEnum;
-import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation;
-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener;
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager;
 import com.mogo.och.data.bean.BusStationBean;
 import com.mogo.och.offline.callback.IBusADASStatusCallback;
 import com.mogo.och.offline.callback.IBusControllerStatusCallback;
@@ -31,13 +32,11 @@ import com.mogo.och.offline.model.OrderModel;
 import com.mogo.och.offline.util.OffLineTrajectoryManager;
 import com.mogo.och.common.module.biz.login.ILoginCallback;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;


 import java.util.ArrayList;
 import java.util.List;

-import mogo_msg.MogoReportMsg;

 /**
 * 网约车小巴
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusAnalyticsManager.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusAnalyticsManager.java
@@ -3,7 +3,8 @@ package com.mogo.och.offline.util;

 import androidx.annotation.NonNull;

-import com.mogo.och.common.module.manager.autopilot.autopilot.IOchEventKey;
+import com.mogo.och.bridge.autopilot.autopilot.IOchEventKey;
+

 /**
 * OCH Bus埋点工具
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt
@@ -6,9 +6,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager
 import com.mogo.och.common.module.biz.login.LoginStatusManager.isLogin
-import com.mogo.och.common.module.manager.autopilot.trajectory.ITrajectoryListListener
-import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog
 import com.mogo.och.offline.constant.BusConst
@@ -18,14 +17,13 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Function
 import io.reactivex.schedulers.Schedulers
-import mogo_msg.MogoReportMsg.MogoReportMessage
 import java.util.concurrent.TimeUnit

 /**
 * Bus轨迹管理：给MEC下发用于轨迹下载的信息
 * Created on 2022/6/23
 */
-object OffLineTrajectoryManager : ITrajectoryListListener {
+object OffLineTrajectoryManager : com.mogo.och.bridge.autopilot.trajectory.ITrajectoryListListener {

    private var mAutoPilotLine: AutoPilotLine? = null
    private var mSendReqDisposable: Disposable? = null
--- a/OCH/shuttle/driver_weaknet/build.gradle
+++ b/OCH/shuttle/driver_weaknet/build.gradle
@@ -49,6 +49,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation project(':OCH:common:bridge')

    testImplementation 'junit:junit:4.12'
    testImplementation project(path: ':OCH:shuttle:driver_weaknet')
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
@@ -10,7 +10,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.provider.CommonServiceImpl
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.bridge.ui.autopilot.AutopilotState
 import com.mogo.och.common.module.manager.scnner.ScannerClientManager
 import com.mogo.och.weaknet.repository.db.repository.EventDb
 import com.mogo.och.weaknet.repository.db.repository.LineDb
@@ -81,4 +82,10 @@ class ShuttleDriverProvider : CommonServiceImpl() {
            QrOpenView(it)
        }
    }
+
+    override fun createStartAutopilotView(context: Context?): View? {
+        return context?.let {
+            AutopilotState(it)
+        }
+    }
 }
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
@@ -3,7 +3,7 @@ package com.mogo.och.weaknet.bean.request
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.network.utils.digest.DigestUtils
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.manager.device.checkvin.CheckVinManager
+import com.mogo.och.bridge.device.checkvin.CheckVinManager
 import com.mogo.och.weaknet.repository.db.bean.EventDataBean
 import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean

--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt
@@ -3,7 +3,7 @@ package com.mogo.och.weaknet.bean.response
 import com.google.gson.reflect.TypeToken
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.utilcode.util.GsonUtils
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
+import com.mogo.och.bridge.autopilot.line.LineManager
 import com.mogo.och.data.bean.BusRoutesResult
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.LineInfo
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
@@ -16,7 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.manager.autopilot.line.LineManager
+import com.mogo.och.bridge.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
--- a/Show More
+++ b/Show More