diff --git a/OCH/charter/passenger/src/main/AndroidManifest.xml b/OCH/charter/passenger/src/main/AndroidManifest.xml
index e0687231c1..e40c8b4775 100644
--- a/OCH/charter/passenger/src/main/AndroidManifest.xml
+++ b/OCH/charter/passenger/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.och.bus.passenger">
+    package="com.mogo.och.charter.passenger">
 
 </manifest>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt
deleted file mode 100644
index beb65c2882..0000000000
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mogo.och.bus.passenger.bean.event
-
-import com.mogo.och.bus.passenger.bean.response.LineInfoResponse
-import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse
-
-data class EventLineSites(val lineInfo: LineInfoResponse.LineInfo?, val sites: List<SiteInfoResponse.SiteInfo>?, val clear:Boolean=false)
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugEvent.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugEvent.kt
deleted file mode 100644
index 4a48f3dc2e..0000000000
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.mogo.och.bus.passenger.ui.debugview
-
-data class DebugEvent(val type: String)
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt
similarity index 82%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt
index b61064656a..c42743199f 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger
+package com.mogo.och.charter.passenger
 
 import android.content.Context
 import androidx.fragment.app.Fragment
@@ -10,8 +10,8 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIC
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.och.bus.passenger.constant.CharterPassengerConst
-import com.mogo.och.bus.passenger.ui.MainFragment
+import com.mogo.och.charter.passenger.constant.CharterPassengerConst
+import com.mogo.och.charter.passenger.ui.MainFragment
 
 /**
  * 网约车-Bus-乘客端
@@ -46,7 +46,7 @@ class MogoOCHBusPassenger : IMoGoFunctionProvider {
         val supportFragmentManager: FragmentManager? = mActivity?.supportFragmentManager
 
         if (mPassengerFragment == null) {
-            d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
+            d(SceneConstant.M_TAXI_P + com.mogo.och.charter.passenger.MogoOCHBusPassenger.Companion.TAG, "准备add fragment======")
             var fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(MainFragment.TAG)
             mPassengerFragment = if (fragmentByTag is MainFragment){
                 fragmentByTag
@@ -60,7 +60,7 @@ class MogoOCHBusPassenger : IMoGoFunctionProvider {
             }
             return
         }
-        d(SceneConstant.M_TAXI_P + TAG, "准备show fragment")
+        d(SceneConstant.M_TAXI_P + com.mogo.och.charter.passenger.MogoOCHBusPassenger.Companion.TAG, "准备show fragment")
         supportFragmentManager?.beginTransaction()?.show(mPassengerFragment!!)
             ?.commitAllowingStateLoss()
     }
@@ -73,6 +73,6 @@ class MogoOCHBusPassenger : IMoGoFunctionProvider {
     }
 
     companion object {
-        private val TAG = MogoOCHBusPassenger::class.java.simpleName
+        private val TAG = com.mogo.och.charter.passenger.MogoOCHBusPassenger::class.java.simpleName
     }
 }
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/TaxiPassengerVideoPlay.java
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/TaxiPassengerVideoPlay.java
index 72bbd8e3de..dafc61f873 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/TaxiPassengerVideoPlay.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean;
+package com.mogo.och.charter.passenger.bean;
 
 public class TaxiPassengerVideoPlay {
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/Temperature.kt
similarity index 62%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/Temperature.kt
index 84ea0e4ab8..2b866ac90b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/Temperature.kt
@@ -1,3 +1,3 @@
-package com.mogo.och.bus.passenger.bean
+package com.mogo.och.charter.passenger.bean
 
 data class Temperature(val index:Int,val value:Int,val showTitle:String)
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/event/EventLineSites.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/event/EventLineSites.kt
new file mode 100644
index 0000000000..7a09daf04e
--- /dev/null
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/event/EventLineSites.kt
@@ -0,0 +1,6 @@
+package com.mogo.och.charter.passenger.bean.event
+
+import com.mogo.och.charter.passenger.bean.response.LineInfoResponse
+import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse
+
+data class EventLineSites(val lineInfo: LineInfoResponse.LineInfo?, val sites: List<SiteInfoResponse.SiteInfo>?, val clear:Boolean=false)
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/ArriveDestRequest.kt
similarity index 61%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/ArriveDestRequest.kt
index 60f5e971ad..d6721b2eac 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/ArriveDestRequest.kt
@@ -1,3 +1,3 @@
-package com.mogo.och.bus.passenger.bean.request
+package com.mogo.och.charter.passenger.bean.request
 
 data class ArriveDestRequest(val sn:String, val lineId:Long,val writeVersion:Long)
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/BusPassengerQueryLineRequest.java
similarity index 79%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/BusPassengerQueryLineRequest.java
index bfa44d6d49..3f725073ce 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/BusPassengerQueryLineRequest.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.request;
+package com.mogo.och.charter.passenger.bean.request;
 
 public
 /**
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/EndOrderRequest.kt
similarity index 53%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/EndOrderRequest.kt
index 6df6ccc92f..ac0fc54838 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/EndOrderRequest.kt
@@ -1,3 +1,3 @@
-package com.mogo.och.bus.passenger.bean.request
+package com.mogo.och.charter.passenger.bean.request
 
 data class EndOrderRequest(val sn:String,val orderNo:String)
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessStatusResponse.kt
similarity index 83%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessStatusResponse.kt
index ea11db3386..2cc798b3cb 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessStatusResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.eagle.core.data.BaseData
 import java.util.*
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessTimeResponse.kt
similarity index 84%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessTimeResponse.kt
index 9e9af83926..6d28ff1427 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessTimeResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.eagle.core.data.BaseData
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoListResponse.kt
similarity index 73%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoListResponse.kt
index 4bbdccf061..91a577b10a 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoListResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.eagle.core.data.BaseData
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoResponse.kt
similarity index 83%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoResponse.kt
index 366bc70641..e015e420ab 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.eagle.core.data.BaseData
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LocusResponse.kt
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LocusResponse.kt
index 3068118b1b..0addc40d3f 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LocusResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.eagle.core.data.BaseData
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/M1DriverLoginStatusResponse.kt
similarity index 90%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/M1DriverLoginStatusResponse.kt
index 326d180289..69b4916311 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/M1DriverLoginStatusResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.eagle.core.data.BaseData
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt
similarity index 98%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt
index ee15d54372..6e88928e9b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.BaseData
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/SiteInfoResponse.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/SiteInfoResponse.kt
index 3ba52d8156..51e39a0a2d 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/SiteInfoResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.och.common.module.bean.dpmsg.LineSite
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt
similarity index 90%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt
index 499ec9d66e..488b0e456c 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.bean.response
+package com.mogo.och.charter.passenger.bean.response
 
 import com.amap.api.maps.model.LatLng
 import com.mogo.eagle.core.data.BaseData
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IBusPassengerControllerStatusCallback.java
similarity index 87%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IBusPassengerControllerStatusCallback.java
index 879b502e20..da29bd8560 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IBusPassengerControllerStatusCallback.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback;
+package com.mogo.och.charter.passenger.callback;
 
 import com.mogo.eagle.core.data.map.MogoLocation;
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt
similarity index 84%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt
index 6adf63cc21..7ee83cd636 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback
+package com.mogo.och.charter.passenger.callback
 
 /**
  * Created on 2022/3/31
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IClearViewCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IClearViewCallback.kt
similarity index 53%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IClearViewCallback.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IClearViewCallback.kt
index e53f0f4e2c..e7a6c46def 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IClearViewCallback.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IClearViewCallback.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback
+package com.mogo.och.charter.passenger.callback
 
 interface IClearViewCallback {
     fun goneAllView()
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IDistanceCallback.kt
similarity index 66%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IDistanceCallback.kt
index c0d1a574fb..6f68eab6a8 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IDistanceCallback.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback
+package com.mogo.och.charter.passenger.callback
 
 interface IDistanceCallback {
     fun setDistancecAndTime(meters:Long , timeInSecond:Long )
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IOrderChangeCallback.kt
similarity index 84%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IOrderChangeCallback.kt
index 188a87ed79..80057e1293 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IOrderChangeCallback.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback
+package com.mogo.och.charter.passenger.callback
 
 interface IOrderChangeCallback {
     /**
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ITimeCallback.kt
similarity index 61%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ITimeCallback.kt
index a7283742a2..24c96a72df 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ITimeCallback.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.callback
+package com.mogo.och.charter.passenger.callback
 
 interface ITimeCallback {
     fun setOrderTimeCallBack(timeInSecond: Long)
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/constant/CharterPassengerConst.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/constant/CharterPassengerConst.kt
index 09d15e054f..749964b9f5 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/constant/CharterPassengerConst.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.constant
+package com.mogo.och.charter.passenger.constant
 
 /**
  * Created on 2021/12/6
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
similarity index 99%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
index 48e2d99355..cac9ae42df 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.model
+package com.mogo.och.charter.passenger.model
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -23,15 +23,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.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.*
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import com.mogo.och.common.module.manager.loopmanager.LoopInfo
-import com.mogo.och.bus.passenger.bean.response.*
-import com.mogo.och.bus.passenger.callback.*
-import com.mogo.och.bus.passenger.constant.CharterPassengerConst
+import com.mogo.och.charter.passenger.bean.response.*
+import com.mogo.och.charter.passenger.callback.*
+import com.mogo.och.charter.passenger.constant.CharterPassengerConst
 import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
-import com.mogo.och.bus.passenger.net.BusPassengerServiceManager
+import com.mogo.och.charter.passenger.net.BusPassengerServiceManager
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
-import com.mogo.och.bus.passenger.utils.VoiceFocusManager
+import com.mogo.och.charter.passenger.utils.VoiceFocusManager
 import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/OrderStatusEnum.kt
similarity index 93%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/OrderStatusEnum.kt
index cda47e3c88..7eaf77f7a5 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/OrderStatusEnum.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.model
+package com.mogo.och.charter.passenger.model
 
 /**
  * Created on 2022/08/19
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt
index 41245d7a80..0b0a223687 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt
@@ -1,12 +1,12 @@
-package com.mogo.och.bus.passenger.net
+package com.mogo.och.charter.passenger.net
 
 import android.content.Context
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
-import com.mogo.och.bus.passenger.bean.request.ArriveDestRequest
-import com.mogo.och.bus.passenger.bean.request.EndOrderRequest
-import com.mogo.och.bus.passenger.bean.response.*
+import com.mogo.och.charter.passenger.bean.request.ArriveDestRequest
+import com.mogo.och.charter.passenger.bean.request.EndOrderRequest
+import com.mogo.och.charter.passenger.bean.response.*
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt
index aafd120e7c..e0d4dd686d 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt
@@ -1,11 +1,11 @@
-package com.mogo.och.bus.passenger.net
+package com.mogo.och.charter.passenger.net
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
-import com.mogo.och.bus.passenger.bean.request.ArriveDestRequest
-import com.mogo.och.bus.passenger.bean.request.EndOrderRequest
-import com.mogo.och.bus.passenger.bean.response.*
+import com.mogo.och.charter.passenger.bean.request.ArriveDestRequest
+import com.mogo.och.charter.passenger.bean.request.EndOrderRequest
+import com.mogo.och.charter.passenger.bean.response.*
 import io.reactivex.Observable
 import retrofit2.http.*
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
similarity index 86%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
index 1596ef34b0..0447f1a61b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt
@@ -1,9 +1,9 @@
-package com.mogo.och.bus.passenger.presenter
+package com.mogo.och.charter.passenger.presenter
 
 import androidx.lifecycle.LifecycleOwner
 import com.mogo.commons.mvp.IView
 import com.mogo.commons.mvp.Presenter
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
+import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt
similarity index 66%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt
index 66e05e80b9..26dad18d17 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt
@@ -1,6 +1,6 @@
-package com.mogo.och.bus.passenger.presenter
+package com.mogo.och.charter.passenger.presenter
 
-import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
+import com.mogo.och.charter.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
 
 class BusPassengerCarUseAndNoOrderPresenter(view: M1CarUserNoOrderFragment?) :
     BusBasePassengerFunctionDevicePresenter<M1CarUserNoOrderFragment?>(view){
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
similarity index 93%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
index 3eb1a6e49d..f8bb0969a5 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.presenter
+package com.mogo.och.charter.passenger.presenter
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -18,19 +18,19 @@ 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.SharedPrefs
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.response.LineInfoResponse
-import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse
-import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse
-import com.mogo.och.bus.passenger.bean.response.TrajectoriesResponse
-import com.mogo.och.bus.passenger.callback.IOrderChangeCallback
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener
-import com.mogo.och.bus.passenger.model.OrderStatusEnum
-import com.mogo.och.bus.passenger.receive.DriverMessage
-import com.mogo.och.bus.passenger.ui.MainFragment
-import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteName
-import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteNamewithCheck
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.response.LineInfoResponse
+import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse
+import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse
+import com.mogo.och.charter.passenger.bean.response.TrajectoriesResponse
+import com.mogo.och.charter.passenger.callback.IOrderChangeCallback
+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.charter.passenger.receive.DriverMessage
+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.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.StopSideStatusManager
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt
similarity index 88%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt
index da3e5d9d26..92d0e7807f 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt
@@ -1,9 +1,9 @@
-package com.mogo.och.bus.passenger.presenter
+package com.mogo.och.charter.passenger.presenter
 
 import androidx.lifecycle.LifecycleOwner
-import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment
+import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse
+import com.mogo.och.charter.passenger.model.CharterPassengerModel
+import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/provider/StatusViewManager.java
similarity index 81%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/provider/StatusViewManager.java
index 90f569d3af..aae72e7b38 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/provider/StatusViewManager.java
@@ -1,15 +1,16 @@
-package com.mogo.och.bus.passenger.provider;
+package com.mogo.och.charter.passenger.provider;
 
 import android.content.Context;
 import android.view.View;
 
-import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView;
+import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView;
 
 import androidx.annotation.NonNull;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
+import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView;
 
 /**
  * @author congtaowang
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
index 3ef66cc329..d2cce6cfe2 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.receive
+package com.mogo.och.charter.passenger.receive
 
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
@@ -8,9 +8,9 @@ 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.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse
+import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.common.module.bean.dpmsg.*
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
 import com.mogo.och.common.module.biz.constant.OchCommonConst
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
index 0419ab9a6d..384dd8ed58 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui
+package com.mogo.och.charter.passenger.ui
 
 import android.graphics.BitmapFactory
 import android.os.Bundle
@@ -21,15 +21,15 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.listener.MogoMapListenerHandler
 import com.mogo.map.uicontroller.VisualAngleMode
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.event.EventLineSites
-import com.mogo.och.bus.passenger.callback.IClearViewCallback
-import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter
-import com.mogo.och.bus.passenger.ui.bottom.BottomBar
-import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
-import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
-import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment
-import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.event.EventLineSites
+import com.mogo.och.charter.passenger.callback.IClearViewCallback
+import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter
+import com.mogo.och.charter.passenger.ui.bottom.BottomBar
+import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
+import com.mogo.och.charter.passenger.ui.dialogfragment.M1CarUserNoOrderFragment
+import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment
+import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
 import kotlinx.android.synthetic.main.m1_main_fragment.*
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt
index e868f5fde6..55fab27613 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt
@@ -1,11 +1,11 @@
-package com.mogo.och.bus.passenger.ui.bottom
+package com.mogo.och.charter.passenger.ui.bottom
 
 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.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import kotlinx.android.synthetic.main.m1_bottom_bar.view.*
 
 class BottomBar @JvmOverloads constructor(
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomCheckView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomCheckView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt
index f3cedfde3e..b8bfe7cb68 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomCheckView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt
@@ -1,11 +1,11 @@
-package com.mogo.och.bus.passenger.ui.bottom
+package com.mogo.och.charter.passenger.ui.bottom
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.*
 
 open class BottomCheckView @JvmOverloads constructor(
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomClickView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomClickView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt
index 4109b128a9..aa092889cb 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomClickView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.bottom
+package com.mogo.och.charter.passenger.ui.bottom
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -9,7 +9,7 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.*
 
 open class BottomClickView @JvmOverloads constructor(
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
similarity index 91%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
index 7133025081..c48dedc79a 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.bottom
+package com.mogo.och.charter.passenger.ui.bottom
 
 import android.content.Context
 import android.util.AttributeSet
@@ -8,11 +8,11 @@ import com.mogo.commons.AbsMogoApplication
 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.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.callback.ITimeCallback
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener
-import com.mogo.och.bus.passenger.model.OrderStatusEnum
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.callback.ITimeCallback
+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.utils.DateTimeUtil
 import kotlinx.android.synthetic.main.m1_bottom_orderinfo.view.*
 import java.util.UUID
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/CloseDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt
similarity index 83%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/CloseDoorView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt
index dd4533437a..cd53c836b8 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/CloseDoorView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt
@@ -1,10 +1,10 @@
-package com.mogo.och.bus.passenger.ui.bottom.impl
+package com.mogo.och.charter.passenger.ui.bottom.impl
 
 import android.content.Context
 import android.util.AttributeSet
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
 import com.mogo.och.common.module.utils.SoundPoolHelper
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
index bdc10bfdfb..a9860cd670 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.bottom.impl
+package com.mogo.och.charter.passenger.ui.bottom.impl
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -16,10 +16,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.callback.ICharterPassengerAutoStatusChangeCallback
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
+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.devicemanage.LightAirconditionDoorStatusManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.utils.SoundPoolHelper
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/OpenDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt
similarity index 83%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/OpenDoorView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt
index 1a220ec336..a3c5e86f9a 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/OpenDoorView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt
@@ -1,10 +1,10 @@
-package com.mogo.och.bus.passenger.ui.bottom.impl
+package com.mogo.och.charter.passenger.ui.bottom.impl
 
 import android.content.Context
 import android.util.AttributeSet
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
 import com.mogo.och.common.module.utils.SoundPoolHelper
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt
similarity index 92%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt
index 1b2fae3cf6..2233376fff 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.bottom.impl
+package com.mogo.och.charter.passenger.ui.bottom.impl
 
 import android.content.Context
 import android.util.AttributeSet
@@ -7,8 +7,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.ui.bottom.BottomClickView
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.ui.bottom.BottomClickView
 import com.mogo.och.common.module.utils.SoundPoolHelper
 
 class StopSiteView @JvmOverloads constructor(
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugEvent.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugEvent.kt
new file mode 100644
index 0000000000..9b36e29774
--- /dev/null
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugEvent.kt
@@ -0,0 +1,3 @@
+package com.mogo.och.charter.passenger.ui.debugview
+
+data class DebugEvent(val type: String)
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
similarity index 92%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
index e7db47ab07..067a3804bb 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.debugview
+package com.mogo.och.charter.passenger.ui.debugview
 
 import android.content.Context
 import android.util.AttributeSet
@@ -10,11 +10,11 @@ import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.ui.MainFragment
-import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse
+import com.mogo.och.charter.passenger.model.CharterPassengerModel
+import com.mogo.och.charter.passenger.ui.MainFragment
+import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
 import kotlinx.android.synthetic.main.m1_p_debug.view.debug_arrive_dest
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
index 16da2dddcd..5cafa0b340 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.dialogfragment
+package com.mogo.och.charter.passenger.ui.dialogfragment
 
 import android.os.Bundle
 import android.util.Log
@@ -15,8 +15,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.AppStateManager
 import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.ClickUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
 import com.mogo.och.common.module.voice.VoiceManager
 import kotlinx.android.synthetic.main.m1_order_end.*
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
index face4be037..a7dfbfed3f 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.dialogfragment
+package com.mogo.och.charter.passenger.ui.dialogfragment
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -15,11 +15,11 @@ import com.mogo.commons.voice.AIAssist
 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.*
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter
-import com.mogo.och.bus.passenger.presenter.CharterPassengerNoviceGuidancePresenter
-import com.mogo.och.bus.passenger.ui.MainFragment
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.model.CharterPassengerModel
+import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter
+import com.mogo.och.charter.passenger.presenter.CharterPassengerNoviceGuidancePresenter
+import com.mogo.och.charter.passenger.ui.MainFragment
 import com.mogo.och.common.module.voice.VoiceNotice
 import kotlinx.android.synthetic.main.m1_novice_guidance_fragment.*
 import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_1_fragment.*
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt
index f02829b5c1..26238e72e9 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.itinerary
+package com.mogo.och.charter.passenger.ui.itinerary
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance
 import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_arrive_time
 import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_surplus_time
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
similarity index 90%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryViewModel.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
index 1c773f0624..d55e708e3b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.itinerary
+package com.mogo.och.charter.passenger.ui.itinerary
 
 import androidx.lifecycle.ViewModel
 import com.mogo.commons.AbsMogoApplication
@@ -6,11 +6,11 @@ import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.callback.IDistanceCallback
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener
-import com.mogo.och.bus.passenger.model.OrderStatusEnum
+import com.mogo.och.charter.passenger.R
+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.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.NumberFormatUtil
 import kotlin.math.abs
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
similarity index 98%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
index 67a2b90900..7a429a9365 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.lockview
+package com.mogo.och.charter.passenger.ui.lockview
 
 import android.content.Context
 import android.os.Handler
@@ -10,7 +10,7 @@ import android.view.MotionEvent
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import com.mogo.och.common.module.utils.FrameAnimatorContainer
 import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock
 import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock_bg
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockManager.kt
similarity index 98%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockManager.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockManager.kt
index a9a1a7d7ea..8bdc7da105 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockManager.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.lockview
+package com.mogo.och.charter.passenger.ui.lockview
 
 import android.os.Handler
 import android.os.HandlerThread
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockViewConstrainLayout.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockViewConstrainLayout.kt
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockViewConstrainLayout.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockViewConstrainLayout.kt
index bbb57cd9f8..e32003b66b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockViewConstrainLayout.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockViewConstrainLayout.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.lockview
+package com.mogo.och.charter.passenger.ui.lockview
 
 import android.content.Context
 import android.util.AttributeSet
@@ -7,7 +7,7 @@ import android.view.View
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 
 class LockViewConstrainLayout : ConstraintLayout {
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt
similarity index 98%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt
index aa7d0cbe6a..e52a0896ac 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.lockview
+package com.mogo.och.charter.passenger.ui.lockview
 
 import android.content.Context
 import android.os.Handler
@@ -11,7 +11,7 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import kotlinx.android.synthetic.main.m1_devices_unlock.view.aciv_only_unlock
 import kotlinx.android.synthetic.main.m1_devices_unlock.view.actv_lock_status
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt
index 9dd947ecbf..78b4af73ff 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.orderinfo
+package com.mogo.och.charter.passenger.ui.orderinfo
 
 import android.content.Context
 import android.util.AttributeSet
@@ -8,8 +8,8 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.callback.IClearViewCallback
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.callback.IClearViewCallback
 import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_contain_order
 import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order
 import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order_submit
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt
index b81809d67e..224351d5a6 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.orderinfo
+package com.mogo.och.charter.passenger.ui.orderinfo
 
 import androidx.lifecycle.ViewModel
 import com.mogo.eagle.core.data.BaseData
@@ -7,8 +7,8 @@ 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.GsonUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.callback.ITimeCallback
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
+import com.mogo.och.charter.passenger.callback.ITimeCallback
+import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.EndOrderMsg
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/overmapview/MakerWithSiteName.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt
similarity index 90%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/overmapview/MakerWithSiteName.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt
index b11ee93faf..a2afbfe06f 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/overmapview/MakerWithSiteName.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt
@@ -1,11 +1,11 @@
-package com.mogo.och.bus.passenger.ui.overmapview
+package com.mogo.och.charter.passenger.ui.overmapview
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import kotlinx.android.synthetic.main.view_maker_sitename.view.*
 
 /**
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt
similarity index 92%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt
index 5608cd7df0..d9fa7178c1 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.selectline
+package com.mogo.och.charter.passenger.ui.selectline
 
 import android.animation.ObjectAnimator
 import android.content.Context
@@ -13,14 +13,14 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.elegant.utils.UiThreadHandler
 import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.event.EventLineSites
-import com.mogo.och.bus.passenger.bean.response.LineInfoResponse
-import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse
-import com.mogo.och.bus.passenger.callback.IClearViewCallback
-import com.mogo.och.bus.passenger.ui.selectline.adapter.OrderLineItemAdapter
-import com.mogo.och.bus.passenger.ui.selectline.adapter.OrderSiteItemAdapter
-import com.mogo.och.bus.passenger.ui.selectline.layoutmanage.BottomDecoration
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.event.EventLineSites
+import com.mogo.och.charter.passenger.bean.response.LineInfoResponse
+import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse
+import com.mogo.och.charter.passenger.callback.IClearViewCallback
+import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderLineItemAdapter
+import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderSiteItemAdapter
+import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.m1_order_fragment.view.aciv_driver_refuse_group
@@ -98,7 +98,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         rlv_line_list.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         rlv_line_list.addItemDecoration(
-            BottomDecoration(
+            com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration(
                 AutoSizeUtils.dp2px(context, 60f)
             )
         )
@@ -107,7 +107,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         rv_site_list.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         rv_site_list.addItemDecoration(
-            BottomDecoration(
+            com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration(
                 AutoSizeUtils.dp2px(context, 90f)
             )
         )
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
index a8599877a8..1d89dc4089 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.selectline
+package com.mogo.och.charter.passenger.ui.selectline
 
 import androidx.lifecycle.ViewModel
 import com.elegant.utils.UiThreadHandler
@@ -12,14 +12,14 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 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.GsonUtils
-import com.mogo.och.bus.passenger.bean.event.EventLineSites
-import com.mogo.och.bus.passenger.bean.response.LineInfoListResponse
-import com.mogo.och.bus.passenger.bean.response.LineInfoResponse
-import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse
-import com.mogo.och.bus.passenger.model.CharterPassengerModel
-import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener
-import com.mogo.och.bus.passenger.model.OrderStatusEnum
-import com.mogo.och.bus.passenger.net.BusPassengerServiceManager
+import com.mogo.och.charter.passenger.bean.event.EventLineSites
+import com.mogo.och.charter.passenger.bean.response.LineInfoListResponse
+import com.mogo.och.charter.passenger.bean.response.LineInfoResponse
+import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse
+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.charter.passenger.net.BusPassengerServiceManager
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg
 import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
index bac61fde81..b5304ca398 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.selectline.adapter
+package com.mogo.och.charter.passenger.ui.selectline.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -6,8 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.response.LineInfoResponse
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.response.LineInfoResponse
 
 /**
  * Created by adityagohad on 06/06/17.
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
index 8db2811dd9..23d37f4c80 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.selectline.adapter
+package com.mogo.och.charter.passenger.ui.selectline.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -9,9 +9,9 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.event.EventLineSites
-import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.event.EventLineSites
+import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse
 import org.greenrobot.eventbus.EventBus
 
 /**
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/BottomDecoration.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/BottomDecoration.java
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/BottomDecoration.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/BottomDecoration.java
index 803bf98a69..edd8137789 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/BottomDecoration.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/BottomDecoration.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.selectline.layoutmanage;
+package com.mogo.och.charter.passenger.ui.selectline.layoutmanage;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
index ae81c22d68..86b446bce6 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.selectline.layoutmanage;
+package com.mogo.och.charter.passenger.ui.selectline.layoutmanage;
 
 import android.content.Context;
 import android.util.DisplayMetrics;
@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearSmoothScroller;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.och.bus.passenger.R;
+import com.mogo.och.charter.passenger.R;
 
 public class PickerLayoutManager extends LinearLayoutManager {
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt
index 52c5c9bdbf..c071ba0680 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol
+package com.mogo.och.charter.passenger.ui.softcontrol
 
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
@@ -26,13 +26,13 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.Temperature
-import com.mogo.och.bus.passenger.callback.IClearViewCallback
-import com.mogo.och.bus.passenger.ui.selectline.layoutmanage.PickerLayoutManager
-import com.mogo.och.bus.passenger.ui.softcontrol.adapter.TemperatureAdapter
-import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration
-import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.PagerCenterSnapHelper
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.Temperature
+import com.mogo.och.charter.passenger.callback.IClearViewCallback
+import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager
+import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter
+import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration
+import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.PagerCenterSnapHelper
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.utils.SoundPoolHelper
@@ -188,10 +188,10 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         tv_temperature_title.isEnabled = enable
         rv_aircondition_temperature.isEnabled = enable
         val layoutManager = rv_aircondition_temperature.layoutManager
-        if (layoutManager is PickerLayoutManager) {
+        if (layoutManager is com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager) {
             layoutManager.setHorizontallyScroll(enable)
         }
-        val adapter = rv_aircondition_temperature.adapter as TemperatureAdapter
+        val adapter = rv_aircondition_temperature.adapter as com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter
         if (enable) {
             adapter.setEnable(true)
             if (tv_setting_aircondition.isChecked) {
@@ -322,7 +322,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
         viewModel?.openAndSetAircondition(modeCmd, windSpeedCmd, temperatureCmd)
     }
 
-    private fun setCheckAir(adapter: TemperatureAdapter, tag: Temperature) {
+    private fun setCheckAir(adapter: com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter, tag: Temperature) {
         adapter.setCheckIndex(tag.index)
         currentTemperature = tag
         if (rv_aircondition_temperature.tag == touchTag) {
@@ -629,25 +629,32 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 openAircondition()
             }
         }
-        val pickerLayoutManager = PickerLayoutManager(
-            context, PickerLayoutManager.HORIZONTAL, false
-        )
+        val pickerLayoutManager =
+            com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager(
+                context,
+                com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager.HORIZONTAL,
+                false
+            )
         pickerLayoutManager.isChangeAlpha = true
         pickerLayoutManager.scaleDownBy = 0.29f
         pickerLayoutManager.scaleDownDistance = 0.8f
 
         val data = getData()
-        val adapter = TemperatureAdapter(context, data, rv_aircondition_temperature)
+        val adapter = com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter(
+            context,
+            data,
+            rv_aircondition_temperature
+        )
         val snapHelper = PagerCenterSnapHelper()
         snapHelper.attachToRecyclerView(rv_aircondition_temperature)
         rv_aircondition_temperature.layoutManager = pickerLayoutManager
         rv_aircondition_temperature.adapter = adapter
-        HorizontalDecoration.distance = SharedPrefsMgr.getInstance(context).getInt(
-            HorizontalDecoration.distancekey, 0
+        com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distance = SharedPrefsMgr.getInstance(context).getInt(
+            com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distancekey, 0
         )
         val space = AutoSizeUtils.dp2px(context, 15f)
         rv_aircondition_temperature.addItemDecoration(
-            HorizontalDecoration(
+            com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration(
                 space, data.size - 1
             )
         )
@@ -673,7 +680,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
 
             }
         }
-        if (HorizontalDecoration.distance != 0) {
+        if (com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distance != 0) {
             rv_aircondition_temperature.scrollToPosition(data.size - 1)
             adapter.setCheckIndex(data.size - 1)
         }
@@ -722,7 +729,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             }
             if (airIsOpen) {
                 val adapter = rv_aircondition_temperature.adapter
-                if (adapter is TemperatureAdapter) {
+                if (adapter is com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter) {
                     adapter.data.forEach {
                         if (it.value == temperatureCmd) {
                             rv_aircondition_temperature.tag = touchTag
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt
similarity index 99%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt
index 8a27bf082d..af30004679 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol
+package com.mogo.och.charter.passenger.ui.softcontrol
 
 import androidx.lifecycle.ViewModel
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/adapter/TemperatureAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
similarity index 92%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
index dc969d07ed..05bfb80f09 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.adapter;
+package com.mogo.och.charter.passenger.ui.softcontrol.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -10,8 +10,9 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.och.bus.passenger.R;
-import com.mogo.och.bus.passenger.bean.Temperature;
+import com.mogo.och.charter.passenger.R;
+import com.mogo.och.charter.passenger.bean.Temperature;
+import com.mogo.och.charter.passenger.bean.Temperature;
 
 import java.util.List;
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
similarity index 99%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
index a3b734dddd..0fcf2d61f5 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage;
+package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage;
 
 import android.graphics.PointF;
 import android.os.Build;
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java
index 0e7475e192..c1de86ed79 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage;
+package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage;
 
 import android.view.View;
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java
index 30b4eaa280..2ff5515969 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage;
+package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java
similarity index 95%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java
index 913c47c9e2..09f4c44241 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage;
+package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage;
 
 import android.graphics.Rect;
 import android.view.View;
@@ -8,7 +8,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
-import com.mogo.och.bus.passenger.ui.softcontrol.adapter.TemperatureAdapter;
+import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter;
+import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter;
 
 public class HorizontalDecoration extends RecyclerView.ItemDecoration {
     private int space = 0;
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java
similarity index 87%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java
index b77e0fa8f2..9994307061 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage;
+package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage;
 
 public class ItemTransformation {
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt
index 537586bb54..9051b98a65 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage
+package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage
 
 import android.view.View
 import androidx.recyclerview.widget.OrientationHelper
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt
index a369c95154..11aa2f0fe2 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.view
+package com.mogo.och.charter.passenger.ui.softcontrol.view
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -7,7 +7,7 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.View
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 
 
 class DrawBitmapView @JvmOverloads constructor(
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawableCheckBox.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawableCheckBox.java
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawableCheckBox.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawableCheckBox.java
index 21fe0abb8a..b6121440da 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawableCheckBox.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawableCheckBox.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.softcontrol.view;
+package com.mogo.och.charter.passenger.ui.softcontrol.view;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/M1BlueToothView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt
similarity index 91%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/M1BlueToothView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt
index 7a28fb5cc1..cc8df22d64 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/M1BlueToothView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt
@@ -1,11 +1,11 @@
-package com.mogo.och.bus.passenger.ui.statusbar
+package com.mogo.och.charter.passenger.ui.statusbar
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
-import com.mogo.och.bus.passenger.R
+import com.mogo.och.charter.passenger.R
 import kotlinx.android.synthetic.main.m1_statusview_blue_tooth.view.*
 
 /**
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
index 171dbad766..5f71592fbe 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.statusbar
+package com.mogo.och.charter.passenger.ui.statusbar
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -27,8 +27,8 @@ import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.ui.debugview.DebugEvent
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.ui.debugview.DebugEvent
 import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
 import com.mogo.och.common.module.manager.loopmanager.LoopInfo
 import kotlinx.android.synthetic.main.m1_statusview_datetime.view.*
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
similarity index 99%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
index bb8dae89a9..a6d86d0e1d 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.video
+package com.mogo.och.charter.passenger.ui.video
 
 import android.app.Activity
 import android.content.Context
@@ -20,8 +20,8 @@ import androidx.core.app.ActivityCompat
 import com.mogo.eagle.core.utilcode.util.TimeTransformUtils
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.utils.FullVideoUtils
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.utils.FullVideoUtils
 import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt
similarity index 75%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt
index 098bb93864..150ca3b0b8 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.video
+package com.mogo.och.charter.passenger.ui.video
 
 import android.content.Context
 import android.util.AttributeSet
@@ -8,13 +8,13 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.och.bus.passenger.R
-import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay
-import com.mogo.och.bus.passenger.callback.IClearViewCallback
-import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager
-import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener
-import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CenterScrollListener
-import com.mogo.och.bus.passenger.ui.video.adapter.RecyclerVideoAdapter
+import com.mogo.och.charter.passenger.R
+import com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay
+import com.mogo.och.charter.passenger.callback.IClearViewCallback
+import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager
+import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener
+import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CenterScrollListener
+import com.mogo.och.charter.passenger.ui.video.adapter.RecyclerVideoAdapter
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 import kotlinx.android.synthetic.main.m1_video_fragment.view.rvVideoPlaylist
 import kotlin.math.floor
@@ -29,7 +29,7 @@ class VideoView @JvmOverloads constructor(
         const val TAG = "DebugView"
     }
 
-    private val arrayListOf = ArrayList<TaxiPassengerVideoPlay>()
+    private val arrayListOf = ArrayList<com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay>()
 
     var goneViewListener: IClearViewCallback? = null
 
@@ -39,10 +39,14 @@ class VideoView @JvmOverloads constructor(
             goneViewListener?.goneAllView()
         }
         initConsultData()
-        val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true)
-        carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener())
+        val carouselLayoutManager =
+            com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager(
+                CarouselLayoutManager.HORIZONTAL,
+                true
+            )
+        carouselLayoutManager.setPostLayoutListener(com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener())
         carouselLayoutManager.maxVisibleItems = 1
-        rvVideoPlaylist.addOnScrollListener(object : CenterScrollListener() {
+        rvVideoPlaylist.addOnScrollListener(object : com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CenterScrollListener() {
             var prePlayerPosition = 0
             override fun pageSelect(recyclerView: RecyclerView?, newState: Int) {
                 //播放视频
@@ -83,7 +87,12 @@ class VideoView @JvmOverloads constructor(
                 }
             }
         }
-        val recyclerVideoAdapter = RecyclerVideoAdapter(context, arrayListOf, rvVideoPlaylist)
+        val recyclerVideoAdapter =
+            com.mogo.och.charter.passenger.ui.video.adapter.RecyclerVideoAdapter(
+                context,
+                arrayListOf,
+                rvVideoPlaylist
+            )
         recyclerVideoAdapter.setOnThumbImageClilckListener {
             val (_, player) = getPlayer(carouselLayoutManager)
             if (player is ConsultVideoPlayer) {
@@ -102,7 +111,7 @@ class VideoView @JvmOverloads constructor(
 
     }
 
-    private fun getPlayer(carouselLayoutManager: CarouselLayoutManager): Pair<Int, ConsultVideoPlayer?> {
+    private fun getPlayer(carouselLayoutManager: com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager): Pair<Int, ConsultVideoPlayer?> {
         val centerItemPosition: Int = carouselLayoutManager.centerItemPosition
         val playerHolder = carouselLayoutManager.findViewByPosition(centerItemPosition)
         val player = playerHolder?.findViewById<ConsultVideoPlayer>(R.id.video_item_player)
@@ -118,7 +127,7 @@ class VideoView @JvmOverloads constructor(
         if (changedView != this) {
             return
         }
-        val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager
+        val carouselLayoutManager = rvVideoPlaylist?.layoutManager as com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager
         val (_, player) = getPlayer(carouselLayoutManager)
         when (visibility) {
             View.VISIBLE -> {}
@@ -135,28 +144,28 @@ class VideoView @JvmOverloads constructor(
     private fun initConsultData() {
         arrayListOf.clear()
         arrayListOf.add(
-            TaxiPassengerVideoPlay(
+            com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay(
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708596763/全车型混剪增加红旗车队.m4v",
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969511280/车队.png",
                 "蘑菇车联覆盖生活的方方面面"
             )
         )
         arrayListOf.add(
-            TaxiPassengerVideoPlay(
+            com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay(
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708554279/红旗车队.m4v",
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969553174/红旗重新排版.png",
                 "蘑菇车联之红旗车队"
             )
         )
         arrayListOf.add(
-            TaxiPassengerVideoPlay(
+            com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay(
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v",
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969536177/大运会.png",
                 "蘑菇车联牵手成都大运会"
             )
         )
         arrayListOf.add(
-            TaxiPassengerVideoPlay(
+            com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay(
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708409810/20210610重新排版3屏.m4v",
                 "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969579713/三屏.png",
                 "多视角体验蘑菇车联自动驾驶"
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerItemVideoHolder.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerItemVideoHolder.java
similarity index 80%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerItemVideoHolder.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerItemVideoHolder.java
index 784e57ec53..a113e336af 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerItemVideoHolder.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerItemVideoHolder.java
@@ -1,12 +1,12 @@
-package com.mogo.och.bus.passenger.ui.video.adapter;
+package com.mogo.och.charter.passenger.ui.video.adapter;
 
 import android.content.Context;
 import android.view.View;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.och.bus.passenger.R;
-import com.mogo.och.bus.passenger.ui.video.ConsultVideoPlayer;
+import com.mogo.och.charter.passenger.R;
+import com.mogo.och.charter.passenger.ui.video.ConsultVideoPlayer;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
 
 public class RecyclerItemVideoHolder extends RecyclerView.ViewHolder {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java
index fd7710714a..707a8bc74e 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.ui.video.adapter;
+package com.mogo.och.charter.passenger.ui.video.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -11,8 +11,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils;
-import com.mogo.och.bus.passenger.R;
-import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay;
+import com.mogo.och.charter.passenger.R;
+import com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay;
 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack;
 
 import java.util.List;
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/BusPassengerMapAssetStyleUtil.java
similarity index 97%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/BusPassengerMapAssetStyleUtil.java
index edab28cb78..09807fa2b8 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/BusPassengerMapAssetStyleUtil.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.utils;
+package com.mogo.och.charter.passenger.utils;
 
 
 import android.content.Context;
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/FullVideoUtils.kt
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/FullVideoUtils.kt
index 0202dabf41..0e8ca48fc2 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/FullVideoUtils.kt
@@ -1,10 +1,10 @@
-package com.mogo.och.bus.passenger.utils
+package com.mogo.och.charter.passenger.utils
 
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.view.View
 import android.view.WindowManager
-import com.mogo.och.bus.passenger.ui.video.ConsultVideoPlayer
+import com.mogo.och.charter.passenger.ui.video.ConsultVideoPlayer
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import java.lang.Exception
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/VoiceFocusManager.kt
similarity index 96%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/VoiceFocusManager.kt
index 5e1dad8231..2b8d8dad8b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/VoiceFocusManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.utils
+package com.mogo.och.charter.passenger.utils
 
 import android.os.Build
 import androidx.annotation.RequiresApi
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/ZoomDrawable.kt
similarity index 94%
rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt
rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/ZoomDrawable.kt
index 1811e3b1fd..ea8c41bdaa 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/ZoomDrawable.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.bus.passenger.utils
+package com.mogo.och.charter.passenger.utils
 
 import android.content.Context
 import android.graphics.*
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml
index 73237c41d1..0de1e420ce 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml
@@ -8,7 +8,7 @@
     tools:ignore="MissingDefaultResource">
 
 
-    <com.mogo.och.bus.passenger.ui.bottom.impl.GoViewWithArrive
+    <com.mogo.och.charter.passenger.ui.bottom.impl.GoViewWithArrive
         android:id="@+id/aciv_center_image"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -26,7 +26,7 @@
         android:layout_height="@dimen/dp_107"/>
 
 
-    <com.mogo.och.bus.passenger.ui.bottom.impl.StopSiteView
+    <com.mogo.och.charter.passenger.ui.bottom.impl.StopSiteView
         android:id="@+id/actv_stop_site"
         app:backageViewId="@+id/actv_stop_site_press"
         app:selectedDrawable="@drawable/charter_p_bottom_stopsite_press"
@@ -48,7 +48,7 @@
         android:layout_width="@dimen/dp_359"
         android:layout_height="@dimen/dp_107"/>
 
-    <com.mogo.och.bus.passenger.ui.bottom.impl.CloseDoorView
+    <com.mogo.och.charter.passenger.ui.bottom.impl.CloseDoorView
         android:id="@+id/actv_close_door"
         app:backageViewId="@+id/actv_close_door_press"
         app:selectedDrawable="@drawable/charter_p_bottom_closedoor_press"
@@ -70,7 +70,7 @@
         android:layout_width="@dimen/dp_359"
         android:layout_height="@dimen/dp_107"/>
 
-    <com.mogo.och.bus.passenger.ui.bottom.impl.OpenDoorView
+    <com.mogo.och.charter.passenger.ui.bottom.impl.OpenDoorView
         android:id="@+id/actv_open_door"
         android:gravity="center"
         app:backageViewId="@+id/actv_open_door_press"
@@ -93,7 +93,7 @@
         android:layout_width="@dimen/dp_359"
         android:layout_height="@dimen/dp_107"/>
 
-    <com.mogo.och.bus.passenger.ui.bottom.BottomOrderInfoView
+    <com.mogo.och.charter.passenger.ui.bottom.BottomOrderInfoView
         android:id="@+id/cl_order_time"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/actv_setting"
@@ -112,7 +112,7 @@
         android:layout_width="@dimen/dp_359"
         android:layout_height="@dimen/dp_107"/>
 
-    <com.mogo.och.bus.passenger.ui.bottom.BottomCheckView
+    <com.mogo.och.charter.passenger.ui.bottom.BottomCheckView
         android:id="@+id/actv_setting"
         app:backageViewId="@+id/actv_setting_press"
         app:selectedDrawable="@drawable/charter_p_bottom_softsettiing_press"
@@ -135,7 +135,7 @@
         android:layout_width="@dimen/dp_359"
         android:layout_height="@dimen/dp_107"/>
 
-    <com.mogo.och.bus.passenger.ui.bottom.BottomCheckView
+    <com.mogo.och.charter.passenger.ui.bottom.BottomCheckView
         android:id="@+id/actv_line"
         app:backageViewId="@+id/actv_line_press"
         app:selectedDrawable="@drawable/charter_p_bottom_line_press"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml
index dec696b77e..c7dbe5675e 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
-    <com.mogo.och.bus.passenger.ui.bottom.BottomBar
+    <com.mogo.och.charter.passenger.ui.bottom.BottomBar
         android:id="@+id/bb_bottom_bar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
index e3fcc1ec3a..8b076ef230 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.och.bus.passenger.ui.lockview.LockViewConstrainLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.och.charter.passenger.ui.lockview.LockViewConstrainLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -91,13 +91,13 @@
         app:layout_constraintEnd_toEndOf="@+id/viewBusPM1MsgBoxButton"
         app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
 
-    <com.mogo.och.bus.passenger.ui.itinerary.ItineraryView
+    <com.mogo.och.charter.passenger.ui.itinerary.ItineraryView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.och.bus.passenger.ui.orderinfo.OrderInfoView
+    <com.mogo.och.charter.passenger.ui.orderinfo.OrderInfoView
         android:id="@+id/biz_orderinfo"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -106,13 +106,13 @@
         app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.och.bus.passenger.ui.softcontrol.SoftControlView
+    <com.mogo.och.charter.passenger.ui.softcontrol.SoftControlView
         android:id="@+id/biz_softcontrol"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
 
-    <com.mogo.och.bus.passenger.ui.selectline.SelectLineView
+    <com.mogo.och.charter.passenger.ui.selectline.SelectLineView
         android:id="@+id/biz_selectline"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -123,14 +123,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.och.bus.passenger.ui.video.VideoView
+    <com.mogo.och.charter.passenger.ui.video.VideoView
         android:id="@+id/biz_video"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
 
 
-    <com.mogo.och.bus.passenger.ui.bottom.BottomBar
+    <com.mogo.och.charter.passenger.ui.bottom.BottomBar
         android:id="@+id/bb_boorombar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_107"
@@ -138,7 +138,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.mogo.och.bus.passenger.ui.debugview.DebugView
+    <com.mogo.och.charter.passenger.ui.debugview.DebugView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_47"
@@ -146,7 +146,7 @@
         app:layout_constraintEnd_toEndOf="@+id/mapBizView"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.mogo.och.bus.passenger.ui.lockview.UnlockView
+    <com.mogo.och.charter.passenger.ui.lockview.UnlockView
         android:id="@+id/uv_only_unlock"
         android:visibility="gone"
         android:background="@color/bus_p_m1_66000000"
@@ -157,7 +157,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <com.mogo.och.bus.passenger.ui.lockview.LockAndUnlockView
+    <com.mogo.och.charter.passenger.ui.lockview.LockAndUnlockView
         android:layout_width="@dimen/dp_138"
         android:layout_height="@dimen/dp_138"
         app:layout_constraintBottom_toTopOf="@+id/aciv_map_2_default"
@@ -165,4 +165,4 @@
         app:layout_constraintEnd_toEndOf="parent" />
 
 
-</com.mogo.och.bus.passenger.ui.lockview.LockViewConstrainLayout>
\ No newline at end of file
+</com.mogo.och.charter.passenger.ui.lockview.LockViewConstrainLayout>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
index 66d7eea319..16ca18765c 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
@@ -84,7 +84,7 @@
             app:layout_constraintStart_toStartOf="@+id/gl_left"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.mogo.och.bus.passenger.ui.softcontrol.view.DrawBitmapView
+        <com.mogo.och.charter.passenger.ui.softcontrol.view.DrawBitmapView
             android:id="@+id/dbv_wind"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -93,7 +93,7 @@
             app:layout_constraintHeight_percent="0.5"
             app:layout_constraintStart_toStartOf="@+id/iv_aircondition" />
 
-        <com.mogo.och.bus.passenger.ui.softcontrol.view.DrawableCheckBox
+        <com.mogo.och.charter.passenger.ui.softcontrol.view.DrawableCheckBox
             android:id="@+id/tv_aircondition_switch"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_76"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml b/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml
index 7e5aa9f2ea..11a86bc214 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml
@@ -63,7 +63,7 @@
         android:layout_marginStart="@dimen/dp_80" />
 
     <!--魔方连接状态-->
-    <com.mogo.och.bus.passenger.ui.statusbar.M1BlueToothView
+    <com.mogo.och.charter.passenger.ui.statusbar.M1BlueToothView
         android:id="@+id/blueToothView"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_video_item.xml b/OCH/charter/passenger/src/main/res/layout/m1_video_item.xml
index 7cf240e56f..0025cf3d7a 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_video_item.xml
+++ b/OCH/charter/passenger/src/main/res/layout/m1_video_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="@dimen/dp_1300"
     android:layout_height="@dimen/dp_731">
 
-    <com.mogo.och.bus.passenger.ui.video.ConsultVideoPlayer
+    <com.mogo.och.charter.passenger.ui.video.ConsultVideoPlayer
         android:id="@+id/video_item_player"
         android:layout_gravity="center"
         android:layout_width="@dimen/dp_1300"
diff --git a/OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml b/OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml
index fc2ffb2265..5c43eecc82 100644
--- a/OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml
@@ -144,7 +144,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    <com.mogo.och.bus.passenger.ui.bottom.BottomBar
+    <com.mogo.och.charter.passenger.ui.bottom.BottomBar
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"