diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle
index 8b6caab739..521ee1e652 100644
--- a/OCH/mogo-och-bus-passenger/build.gradle
+++ b/OCH/mogo-och-bus-passenger/build.gradle
@@ -41,51 +41,24 @@ android {
         }
     }
 
-    flavorDimensions "pattern"
+    flavorDimensions "vehicle"
     productFlavors {
         // 车型：金旅星辰、开沃 小巴业务
         jinlvvan {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '0'
         }
         // 车型：金旅m1 小巴业务
         m1 {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '1'
         }
 
         // 车型：金旅m1 小巴业务
         m2 {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '1'
         }
-
-        // 业务：接驳车 bus乘客屏高度耦合、暂时放到这里
-        // 后期会和module mogo-och-bus-passenger 放到同一级别
-        shuttle {
-            dimension "pattern"
-            buildConfigField 'int', 'NEW_TEST', '1'
-        }
-    }
-    sourceSets {
-        // basecommon 文件夹是 金旅开沃、接驳车公用部分 差异内容是 域名和接口path不同
-        jinlvvan {
-            res.srcDirs = ['src/basecommon/res', 'src/jinlvvan/res',]
-            java.srcDirs=['src/basecommon/java', 'src/jinlvvan/java',]
-        }
-        m1 {
-            res.srcDirs = ['src/m1/res']
-            java.srcDirs=['src/m1/java']
-        }
-        m2 {
-            res.srcDirs = ['src/m2/res']
-            java.srcDirs=['src/m2/java']
-        }
-        // basecommon 文件夹是 金旅开沃、接驳车公用部分 差异内容是 域名和接口path不同
-        shuttle {
-            res.srcDirs = ['src/basecommon/res', 'src/shuttle/res',]
-            java.srcDirs=['src/basecommon/java', 'src/shuttle/java',]
-        }
     }
 }
 
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
deleted file mode 100644
index 08c41a4d83..0000000000
--- a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mogo.och.bus.passenger.network
-
-import android.content.Context
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken
-import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
-import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
-import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.och.bus.passenger.constant.URLConst.Companion.getBaseUrl
-import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
-import com.mogo.och.common.module.biz.network.interceptor.transformTry
-
-/**
- * Created on 2022/3/31
- */
-object BusPassengerServiceManager {
-
-    private var mBusPassengerServiceApi = MoGoRetrofitFactory.getInstance(getBaseUrl())
-        .create(PassengerServiceApi::class.java)
-
-    /**
-     * 获取Bus司机端的sn
-     * @return
-     */
-    private val driverAppSn: String
-        get() = getServerToken()
-    /**
-     * 查询绑定行驶的小巴车路线
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryDriverSiteByCoordinate(
-        context: Context, callback: OchCommonServiceCallback<BusPassengerRoutesResponse>?
-    ) {
-        mBusPassengerServiceApi.queryDriverSiteByCoordinate(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            BusPassengerQueryLineRequest(
-                driverAppSn
-            )
-        )
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
-    }
-
-    /**
-     * 查询司机端出车收车状态，以及车牌号
-     * @param context
-     * @param callback
-     */
-    @JvmStatic
-    fun queryDriverOperationStatus(
-        context: Context,
-        callback: OchCommonServiceCallback<BusPassengerOperationStatusResponse>?) {
-        mBusPassengerServiceApi.queryDriverOperationStatus(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            MoGoAiCloudClientConfig.getInstance().token,
-            driverAppSn)
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
-    }
-}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java
similarity index 83%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java
index c4e4e428a7..35ba94ce3a 100644
--- a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java
@@ -1,7 +1,5 @@
 package com.mogo.och.bus.passenger.bean;
 
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-
 public
 /**
  * @author congtaowang
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
similarity index 89%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
index b4c97ccd35..786264650f 100644
--- a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java
@@ -1,7 +1,6 @@
 package com.mogo.och.bus.passenger.callback;
 
 import com.amap.api.maps.model.LatLng;
-import com.mogo.eagle.core.data.map.MogoLatLng;
 
 import java.util.List;
 
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
similarity index 76%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
index 7d7c95d9a7..b7d348a2b2 100644
--- a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java
@@ -10,7 +10,7 @@ import java.util.List;
  */
 public interface IBusPassengerRouteLineInfoCallback {
     void updateLineInfo(String lineName, String lineDurTime);
-    void updateStationsInfo(List<BusPassengerStation> stations,int currentStationIndex,boolean isArrived);
+    void updateStationsInfo(List<BusPassengerStation> stations, int currentStationIndex, boolean isArrived);
     void showNoTaskView();
     void hideNoTaskView();
 }
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt
index e0f216ae49..a6a50f6c37 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/constant/URLConst.kt
@@ -1,26 +1,42 @@
 package com.mogo.och.bus.passenger.constant
 
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 
 /**
  * Created on 2021/12/6
  */
 class URLConst {
     companion object {
+        // shettle 接驳车域名
+        private const val Shettle_BASE_URL_OCH_DEV = "https://och-driver-dev.zhidaozhixing.com"
+        private const val Shettle_BASE_URL_OCH_QA = "https://och-driver-qa.zhidaozhixing.com"
+        private const val Shettle_BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com"
 
         private const val BASE_URL_OCH_DEV = "http://tech-dev.zhidaohulian.com"
         private const val BASE_URL_OCH_QA = "https://tech-qa.zhidaohulian.com"
         private const val BASE_URL_OCH_RELEASE = "https://tech.zhidaohulian.com"
 
+
         @JvmStatic
         fun getBaseUrl(): String {
-            return when (DebugConfig.getNetMode()) {
-                DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> BASE_URL_OCH_DEV
-                DebugConfig.NET_MODE_QA -> BASE_URL_OCH_QA
-                DebugConfig.NET_MODE_RELEASE -> BASE_URL_OCH_RELEASE
-                else -> BASE_URL_OCH_RELEASE
+            return if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
+                when (DebugConfig.getNetMode()) {
+                    DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> Shettle_BASE_URL_OCH_DEV
+                    DebugConfig.NET_MODE_QA -> Shettle_BASE_URL_OCH_QA
+                    DebugConfig.NET_MODE_RELEASE -> Shettle_BASE_URL_OCH_RELEASE
+                    else -> Shettle_BASE_URL_OCH_RELEASE
+                }
+            }else{
+                when (DebugConfig.getNetMode()) {
+                    DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> BASE_URL_OCH_DEV
+                    DebugConfig.NET_MODE_QA -> BASE_URL_OCH_QA
+                    DebugConfig.NET_MODE_RELEASE -> BASE_URL_OCH_RELEASE
+                    else -> BASE_URL_OCH_RELEASE
+                }
             }
-        }
 
+        }
     }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
new file mode 100644
index 0000000000..caf58e1ed9
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
@@ -0,0 +1,92 @@
+package com.mogo.och.bus.passenger.network
+
+import android.content.Context
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken
+import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest
+import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
+import com.mogo.eagle.core.network.MoGoRetrofitFactory
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.och.bus.passenger.constant.URLConst.Companion.getBaseUrl
+import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
+import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
+import com.mogo.och.common.module.biz.network.interceptor.transformTry
+
+/**
+ * Created on 2022/3/31
+ */
+object BusPassengerServiceManager {
+
+    private var mShuttleBusPassengerServiceApi =
+        MoGoRetrofitFactory.getInstance(getBaseUrl()).create(ShettlePassengerServiceApi::class.java)
+    private var mBusPassengerServiceApi =
+        MoGoRetrofitFactory.getInstance(getBaseUrl()).create(PassengerServiceApi::class.java)
+
+    /**
+     * 获取Bus司机端的sn
+     * @return
+     */
+    private val driverAppSn: String
+        get() = getServerToken()
+
+    /**
+     * 查询绑定行驶的小巴车路线
+     * @param context
+     * @param callback
+     */
+    @JvmStatic
+    fun queryDriverSiteByCoordinate(
+        context: Context, callback: OchCommonServiceCallback<BusPassengerRoutesResponse>?
+    ) {
+        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+            mShuttleBusPassengerServiceApi.queryDriverSiteByCoordinate(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusPassengerQueryLineRequest(
+                    driverAppSn
+                )
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+        } else {
+            mBusPassengerServiceApi.queryDriverSiteByCoordinate(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                BusPassengerQueryLineRequest(
+                    driverAppSn
+                )
+            ).transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate"))
+        }
+    }
+
+    /**
+     * 查询司机端出车收车状态，以及车牌号
+     * @param context
+     * @param callback
+     */
+    @JvmStatic
+    fun queryDriverOperationStatus(
+        context: Context,
+        callback: OchCommonServiceCallback<BusPassengerOperationStatusResponse>?
+    ) {
+        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+            mShuttleBusPassengerServiceApi.queryDriverOperationStatus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                driverAppSn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
+        } else {
+            mBusPassengerServiceApi.queryDriverOperationStatus(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                MoGoAiCloudClientConfig.getInstance().token,
+                driverAppSn
+            )
+                .transformTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus"))
+        }
+    }
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/shuttle/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java
similarity index 97%
rename from OCH/mogo-och-bus-passenger/src/shuttle/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java
index 0db5380214..c780786bf2 100644
--- a/OCH/mogo-och-bus-passenger/src/shuttle/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java
@@ -17,7 +17,7 @@ import retrofit2.http.Query;
  *
  * Bus乘客端接口定义
  */
-interface PassengerServiceApi {
+interface ShettlePassengerServiceApi {
     /**
      * 查询bus司机端绑定路线
      * @return 接口返回数据
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
similarity index 98%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
index 585d750d01..895020227b 100644
--- a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
@@ -8,7 +8,6 @@ import androidx.lifecycle.LifecycleOwner;
 import com.amap.api.maps.model.LatLng;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.mvp.Presenter;
-import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -133,7 +132,7 @@ public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragme
     }
 
     @Override
-    public void updateStationsInfo(List<BusPassengerStation> stations,int currentStationIndex,boolean isArrived) {
+    public void updateStationsInfo(List<BusPassengerStation> stations, int currentStationIndex, boolean isArrived) {
         runOnUIThread(() -> mView.updateStationsInfo(stations,currentStationIndex, isArrived));
     }
 
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
similarity index 99%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index c9abd42c76..40983fa135 100644
--- a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -22,7 +22,6 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
-import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
 
 /**
  * Created on 2022/3/31
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bg_bus_p_arrived_station.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_arrow_nor.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_auto_nor.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_green_nor.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_red_nor.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_yellow_nor.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_blue.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_blue.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_green.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_green.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_grey.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_grey.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_arrived.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_car.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_car.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_end_point.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_view_dir_end_point.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_end_point.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_view_dir_end_point.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_way_point.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_view_dir_way_point.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_way_point.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_view_dir_way_point.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_mogo_nor.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_no_order_data.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_blue.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_blue.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_gray.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_gray.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_green.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_green.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_un_auto_nor.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/station_arrow.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/station_arrow.png
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_station_circle.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_tag_bg.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_tag_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_tag_bg.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_tag_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_middle_station_circle.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_station_circle.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_tag_bg.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_tag_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_tag_bg.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_tag_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_traffic_light_background.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_dividing_line_bg.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_dividing_line_bg.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_panel_cur_station_panel.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_route_bg.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_route_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_route_bg.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_route_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_progress_bar_bg.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_progress_bar_bg.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/progress_item_round.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/progress_item_round.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/progress_item_round.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/progress_item_round.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_base_fragment.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_map_view.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_map_view.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_no_data_common_view.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_no_data_common_view.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_route_fragment.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_stations_common_item.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_traffic_light_view.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_traffic_light_view.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/colors.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/values/colors.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/colors.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/values/dimens.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml
diff --git a/OCH/mogo-och-bus-passenger/src/basecommon/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/basecommon/res/values/strings.xml
rename to OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml
diff --git a/OCH/mogo-och-bus-passenger/src/shuttle/java/com/mogo/och/bus/passenger/constant/URLConst.kt b/OCH/mogo-och-bus-passenger/src/shuttle/java/com/mogo/och/bus/passenger/constant/URLConst.kt
deleted file mode 100644
index 3bc5684eb7..0000000000
--- a/OCH/mogo-och-bus-passenger/src/shuttle/java/com/mogo/och/bus/passenger/constant/URLConst.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mogo.och.bus.passenger.constant
-
-import com.mogo.commons.debug.DebugConfig
-
-/**
- * Created on 2021/12/6
- */
-class URLConst {
-    companion object {
-
-        private const val BASE_URL_OCH_DEV = "https://och-driver-dev.zhidaozhixing.com"
-        private const val BASE_URL_OCH_QA = "https://och-driver-qa.zhidaozhixing.com"
-        private const val BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com"
-
-        @JvmStatic
-        fun getBaseUrl(): String {
-            return when (DebugConfig.getNetMode()) {
-                DebugConfig.NET_MODE_DEV, DebugConfig.NET_MODE_DEMO -> BASE_URL_OCH_DEV
-                DebugConfig.NET_MODE_QA -> BASE_URL_OCH_QA
-                DebugConfig.NET_MODE_RELEASE -> BASE_URL_OCH_RELEASE
-                else -> BASE_URL_OCH_RELEASE
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle
index ba948ab44a..fd8de2a04b 100644
--- a/OCH/mogo-och-bus/build.gradle
+++ b/OCH/mogo-och-bus/build.gradle
@@ -40,17 +40,18 @@ android {
     }
 
 
-    flavorDimensions "pattern"
+    flavorDimensions "vehicle"
     productFlavors {
 
         jinlvvan {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '0'
         }
 
-        // 接驳车
+        // 小巴车 接驳车  这个维度应该放入的最外层 但是和小巴的代码耦合的太严重放到了这个地方
+        // 乘客端删除了这个flavors 是因为乘客端这个地方比较简单
         shuttle {
-            dimension "pattern"
+            dimension "vehicle"
             buildConfigField 'int', 'NEW_TEST', '1'
         }
     }
diff --git a/app/build.gradle b/app/build.gradle
index 032e963998..a137553c14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,8 +196,8 @@ android {
     }
     // 项目 business
     // 业务线 product
-    // 车型 pattern
-    flavorDimensions "project","product","pattern" ,"basic", "env"
+    // 车型 vehicle
+    flavorDimensions "project","product","vehicle" ,"basic", "env"
     productFlavors {
         // launcher app
         launcher {
@@ -319,8 +319,6 @@ android {
                 } else if (names.contains("fMultiDisplayOchBus")) {
                 } else if (names.contains("fOchBusPassengerM1")) {
                 } else if (names.contains("fOchBusPassengerM2")) {
-                } else if (names.contains("fOchShuttle")) {
-                } else if (names.contains("fOchShuttlePassenger")) {
                 } else {
                     setIgnore(true)
                 }
@@ -363,8 +361,6 @@ android {
                 } else if (names.contains("fMultiDisplayOchBus")) {
                 } else if (names.contains("fOchBusPassengerM1")) {
                 } else if (names.contains("fOchBusPassengerM2")) {
-                } else if (names.contains("fOchShuttle")) {
-                } else if (names.contains("fBusShuttlePassenger")) {
                 } else {
                     setIgnore(true)
                 }
diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/productFlavors/fMultiDisplayOchBus.gradle
index 1a9663cf31..2c3bea9a38 100644
--- a/app/productFlavors/fMultiDisplayOchBus.gradle
+++ b/app/productFlavors/fMultiDisplayOchBus.gradle
@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m1对应
         matchingFallbacks = ['jinlvvan']
 
diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/productFlavors/fMultiDisplayOchTaxi.gradle
index 9960a37933..f41cd23d68 100644
--- a/app/productFlavors/fMultiDisplayOchTaxi.gradle
+++ b/app/productFlavors/fMultiDisplayOchTaxi.gradle
@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
diff --git a/app/productFlavors/fOchBus.gradle b/app/productFlavors/fOchBus.gradle
index f2191e8e95..85f23b72cf 100644
--- a/app/productFlavors/fOchBus.gradle
+++ b/app/productFlavors/fOchBus.gradle
@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         matchingFallbacks = ['jinlvvan']
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/productFlavors/fOchBusPassenger.gradle
index 858bbabcbd..9ec1b1c7a7 100644
--- a/app/productFlavors/fOchBusPassenger.gradle
+++ b/app/productFlavors/fOchBusPassenger.gradle
@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应
         matchingFallbacks = ['jinlvvan']
 
diff --git a/app/productFlavors/fOchBusPassengerM1.gradle b/app/productFlavors/fOchBusPassengerM1.gradle
index a13828e9f6..88aeb42ed9 100644
--- a/app/productFlavors/fOchBusPassengerM1.gradle
+++ b/app/productFlavors/fOchBusPassengerM1.gradle
@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m1对应
         matchingFallbacks = ['m1']
 
diff --git a/app/productFlavors/fOchBusPassengerM2.gradle b/app/productFlavors/fOchBusPassengerM2.gradle
index 33ce9209fa..c65c95c257 100644
--- a/app/productFlavors/fOchBusPassengerM2.gradle
+++ b/app/productFlavors/fOchBusPassengerM2.gradle
@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的m2对应
         matchingFallbacks = ['m2']
 
diff --git a/app/productFlavors/fOchShuttle.gradle b/app/productFlavors/fOchShuttle.gradle
index 23b4abf485..c918fa3c50 100644
--- a/app/productFlavors/fOchShuttle.gradle
+++ b/app/productFlavors/fOchShuttle.gradle
@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
         // 和 och/mogo-och-bus-passenger 的flavors的shuttle对应
         matchingFallbacks = ['shuttle']
 
diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/productFlavors/fOchShuttlePassenger.gradle
index 93f3337864..17d8186d9f 100644
--- a/app/productFlavors/fOchShuttlePassenger.gradle
+++ b/app/productFlavors/fOchShuttlePassenger.gradle
@@ -11,8 +11,8 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
-        matchingFallbacks = ['shuttle']
+        dimension "vehicle"
+        matchingFallbacks = ['jinlvvan']
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
diff --git a/app/productFlavors/fOchSweeper.gradle b/app/productFlavors/fOchSweeper.gradle
index 6aae05ea54..db75689c9d 100644
--- a/app/productFlavors/fOchSweeper.gradle
+++ b/app/productFlavors/fOchSweeper.gradle
@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
diff --git a/app/productFlavors/fOchTaxi.gradle b/app/productFlavors/fOchTaxi.gradle
index 6d0c0b7f9a..9be61d9e9c 100644
--- a/app/productFlavors/fOchTaxi.gradle
+++ b/app/productFlavors/fOchTaxi.gradle
@@ -14,7 +14,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
diff --git a/app/productFlavors/fOchTaxiPassenger.gradle b/app/productFlavors/fOchTaxiPassenger.gradle
index 12967729ec..28044afb38 100644
--- a/app/productFlavors/fOchTaxiPassenger.gradle
+++ b/app/productFlavors/fOchTaxiPassenger.gradle
@@ -13,7 +13,7 @@ project.android.productFlavors {
         versionName rootProject.versionName
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle
index 5ea0511ed4..8929e03c69 100644
--- a/app/productFlavors/fPadLenovo.gradle
+++ b/app/productFlavors/fPadLenovo.gradle
@@ -11,7 +11,7 @@ project.android.productFlavors {
         targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
         // 应用包名
         applicationId rootProject.ext.android.fLauncherApplicationId
-        dimension "pattern"
+        dimension "vehicle"
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'