From a563256bef590a07630719e859d970ad0f96360f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 23 Aug 2023 10:50:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[6.0.0]=201=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=B1=BB=202=E3=80=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=9C=B0=E5=9B=BEmarker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/ui/TaxiBeingTaskFragment.kt | 119 ++++-------------- .../java/com/mogo/och/taxi/utils/DimenUtil.kt | 13 -- .../mogo/och/taxi/utils/MapMakerManager.kt | 85 +++++++++++++ .../com/mogo/och/taxi/utils/OrderUtil.java | 19 --- .../mogo/och/taxi/utils/PermissionUtil.java | 37 ------ 5 files changed, 112 insertions(+), 161 deletions(-) delete mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt create mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt delete mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java delete mode 100644 OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt index b296846074..42625b9a1c 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt @@ -49,6 +49,7 @@ import com.mogo.och.taxi.model.TaxiUnmannedViewModel import com.mogo.och.taxi.ui.base.TaxiFragment import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState import com.mogo.och.taxi.ui.unmanned.UnmannedIntent +import com.mogo.och.taxi.utils.MapMakerManager import kotlinx.android.synthetic.main.taxi_no_data_common_view.noOrderDataTv import kotlinx.android.synthetic.main.unmanned_being_order.cancelOrder import kotlinx.android.synthetic.main.unmanned_being_order.endPoint @@ -83,6 +84,25 @@ class TaxiBeingTaskFragment : BaseFragment(), private var mCurrentTaskAndOrder: QueryCurrentTaskRespBean.Result? = null private var mCurrentUntruthTask: StartServiceRespBean.Result? = null + companion object { + const val TAG = "TaxiBeingTaskFragment" + @SuppressLint("StaticFieldLeak") + private var mActivity: Activity? = null + @SuppressLint("StaticFieldLeak") + private var mTaxiFragment: TaxiFragment? = null + fun newInstance( + activity: Activity?, + taxiFragment: TaxiFragment? + ): TaxiBeingTaskFragment { + mActivity = activity + mTaxiFragment = taxiFragment + val args = Bundle() + val fragment = TaxiBeingTaskFragment() + fragment.arguments = args + return fragment + } + } + override fun getLayoutId(): Int { return R.layout.unmanned_being_order } @@ -620,7 +640,7 @@ class TaxiBeingTaskFragment : BaseFragment(), */ private fun isHaveBeingOrder(being: Boolean) { d( - SceneConstant.M_TAXI + TAG, + M_TAXI + TAG, "isHaveBeingOrder = $being" ) try { @@ -640,7 +660,7 @@ class TaxiBeingTaskFragment : BaseFragment(), override fun onClick(v: View) { if (v.id == taskClickBtn.id) { - d(SceneConstant.M_TAXI + TAG, taskStatus.text.toString()) + d(M_TAXI + TAG, taskStatus.text.toString()) startOrEndService() } else if (v.id == cancelOrder.id) { if (mCurrentTaskAndOrder!!.order != null){ @@ -729,80 +749,17 @@ class TaxiBeingTaskFragment : BaseFragment(), * @param uuid * @param station */ - private fun setOrRemoveMapMaker( - isAdd: Boolean, - uuid: String, - lat: Double, - lon: Double, - resourceId: Int - ) { + private fun setOrRemoveMapMaker(isAdd: Boolean, uuid: String, + lat: Double, lon: Double, resourceId: Int) { if (isAdd) { - //开启线程执行起终点marker设置 - val setMapMarkerRunnable = Runnable { - d( - SceneConstant.M_TAXI + "setMapMaker= " + Thread.currentThread() - .name, - "$uuid=latitude=$lat,longitude=$lon" - ) - val builder = - Point.Options.Builder( - TYPE_MARKER_TAXI_ORDER, - Level.MAP_MARKER - ) - .setId(uuid) - .anchor(0.5f, 0.5f) - .set3DMode(true) - .isUseGps(true) - .controlAngle(true) - .icon3DRes(resourceId) - .latitude(lat) - .longitude(lon) - val mapUIController = - getMapUIController() - if (mapUIController != null) { - val centerLine = - mapUIController.getCenterLineInfo( - lon, lat, -1f - ) - if (null != centerLine) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 - val angle = centerLine.angle - if (angle != null) { - builder.rotate(angle.toFloat()) - } - } - } - val overlayManager = - getOverlayManager() - overlayManager?.showOrUpdatePoint(builder.build()) - } - OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable) + MapMakerManager.addMapMaker(TYPE_MARKER_TAXI_ORDER,uuid,lat, lon, resourceId) } else { - //开启线程移除起终点marker设置 - val removeMapMarkerRunnable = Runnable { - d( - SceneConstant.M_TAXI + "RemoveMapMaker=" + Thread.currentThread() - .name, - "$uuid=latitude=$lat,longitude=$lon" - ) - val overlayManager = - getOverlayManager() - overlayManager?.removePoint(uuid) - } - OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable) + MapMakerManager.removeMapMaker(uuid,lat,lon) } } private fun removeAllMapMarker() { - //开启线程移除起终点marker设置 - val removeAllMapMarkerRunnable = Runnable { - d( - SceneConstant.M_TAXI + "removeAllMapMarkerRunnable=" + Thread.currentThread() - ) - val overlayManager = - getOverlayManager() - overlayManager?.removeAllLinesInOwner(TYPE_MARKER_TAXI_ORDER) - } - OCHThreadPoolManager.getsInstance().execute(removeAllMapMarkerRunnable) + MapMakerManager.removeAllMapMarkerByOwner(TYPE_MARKER_TAXI_ORDER) } private fun updateOrderBottomBtn(txt: String?, txtColorId: Int, bgColorId: Int, isClickable: Boolean) { @@ -818,26 +775,4 @@ class TaxiBeingTaskFragment : BaseFragment(), mViewModel.startOrStopOrderLoop(false) super.onDestroy() } - - /** - * END - */ - companion object { - const val TAG = "TaxiBeingTaskFragment" - @SuppressLint("StaticFieldLeak") - private var mActivity: Activity? = null - @SuppressLint("StaticFieldLeak") - private var mTaxiFragment: TaxiFragment? = null - fun newInstance( - activity: Activity?, - taxiFragment: TaxiFragment? - ): TaxiBeingTaskFragment { - mActivity = activity - mTaxiFragment = taxiFragment - val args = Bundle() - val fragment = TaxiBeingTaskFragment() - fragment.arguments = args - return fragment - } - } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt deleted file mode 100644 index 0ef16d740a..0000000000 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/DimenUtil.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.och.taxi.utils - -import android.content.res.Resources - -/** - * @author: wangmingjun - * @date: 2022/1/21 - */ -object DimenUtil{ - fun dp2px(value:Float):Float{ - return (0.5f + value * Resources.getSystem().displayMetrics.density) - } -} \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt new file mode 100644 index 0000000000..ffd8b423bd --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt @@ -0,0 +1,85 @@ +package com.mogo.och.taxi.utils + +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.map.overlay.core.Level +import com.mogo.map.overlay.point.Point +import com.mogo.och.common.module.utils.OCHThreadPoolManager + +/** + * @author: wangmingjun + * @date: 2023/8/23 + */ +object MapMakerManager { + + fun addMapMaker(owner: String, uuid: String, lat: Double, lon: Double, resourceId: Int){ + + val setMapMarkerRunnable = Runnable { + CallerLogger.d( + SceneConstant.M_TAXI + "setMapMaker= " + Thread.currentThread() + .name, + "$uuid=latitude=$lat,longitude=$lon" + ) + val builder = + Point.Options.Builder( + owner, + Level.MAP_MARKER + ) + .setId(uuid) + .anchor(0.5f, 0.5f) + .set3DMode(true) + .isUseGps(true) + .controlAngle(true) + .icon3DRes(resourceId) + .latitude(lat) + .longitude(lon) + val mapUIController = + CallerMapUIServiceManager.getMapUIController() + if (mapUIController != null) { + val centerLine = + mapUIController.getCenterLineInfo( + lon, lat, -1f + ) + if (null != centerLine) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 + val angle = centerLine.angle + if (angle != null) { + builder.rotate(angle.toFloat()) + } + } + } + val overlayManager = + CallerMapUIServiceManager.getOverlayManager() + overlayManager?.showOrUpdatePoint(builder.build()) + } + OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable) + } + + fun removeMapMaker(uuid: String, lat: Double, lon: Double){ + //开启线程移除起终点marker设置 + val removeMapMarkerRunnable = Runnable { + CallerLogger.d( + SceneConstant.M_TAXI + "RemoveMapMaker=" + Thread.currentThread() + .name, + "$uuid=latitude=$lat,longitude=$lon" + ) + val overlayManager = + CallerMapUIServiceManager.getOverlayManager() + overlayManager?.removePoint(uuid) + } + OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable) + } + + fun removeAllMapMarkerByOwner(owner: String){ + //开启线程移除起终点marker设置 + val removeAllMapMarkerRunnable = Runnable { + CallerLogger.d( + SceneConstant.M_TAXI + "removeAllMapMarkerRunnable=" + Thread.currentThread() + ) + val overlayManager = + CallerMapUIServiceManager.getOverlayManager() + overlayManager?.removeAllLinesInOwner(owner) + } + OCHThreadPoolManager.getsInstance().execute(removeAllMapMarkerRunnable) + } +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java deleted file mode 100644 index ff17be437f..0000000000 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/OrderUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mogo.och.taxi.utils; - -import java.util.Arrays; - -/** - * Created on 2021/9/11 - */ -public class OrderUtil { - - // 判断两个list中的订单是否相同：依据orderId -// public static boolean haveSameOrders(List list1, -// List list2) { -// OrderQueryRespBean.Result[] arr1 = list1.toArray(new OrderQueryRespBean.Result[]{}); -// OrderQueryRespBean.Result[] arr2 = list2.toArray(new OrderQueryRespBean.Result[]{}); -// Arrays.sort(arr1); -// Arrays.sort(arr1); -// return Arrays.equals(arr1,arr2); -// } -} diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java deleted file mode 100644 index 121533db99..0000000000 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/PermissionUtil.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.mogo.och.taxi.utils; - -import android.app.AppOpsManager; -import android.content.Context; -import android.content.pm.PackageManager; -import android.location.LocationManager; -import android.os.Build; - -import androidx.core.content.ContextCompat; - -/** - * @author: wangmingjun - * @date: 2021/12/7 - */ -public class PermissionUtil { - - public static boolean checkPermission(Context context,String... permissons) { - - for (String permisson : permissons) { - if ((ContextCompat.checkSelfPermission(context, - permisson) != PackageManager.PERMISSION_GRANTED)) { - return false; - } - } - return true; - } - - public static boolean isLocServiceEnable(Context context) { - LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); - boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); - boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER); - if (gps || network) { - return true; - } - return false; - } -} From f6e88fae83ed3feedadae8fcfb8655c2189305ab Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 23 Aug 2023 14:08:29 +0800 Subject: [PATCH 2/8] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20refacto?= =?UTF-8?q?r:=20=E6=8A=BD=E5=8F=96task=E7=9B=B8=E5=85=B3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/bean/UnmannedTaskBean.kt | 28 +- .../com/mogo/och/taxi/ui/base/TaxiFragment.kt | 29 +- .../debug/{OrderDebugView.kt => DebugView.kt} | 5 +- .../TaxiCurrentTaskFragment.kt} | 535 +++++++++--------- .../task/TaxiCurrentTaskViewModel.kt} | 17 +- .../TaxiNextTaskFragment.kt} | 61 +- .../TaxiTaskTabFragment.kt} | 76 +-- ...ng_order.xml => task_fragment_current.xml} | 0 .../src/main/res/layout/taxi_panel.xml | 2 +- 9 files changed, 384 insertions(+), 369 deletions(-) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/{OrderDebugView.kt => DebugView.kt} (94%) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/{TaxiBeingTaskFragment.kt => task/TaxiCurrentTaskFragment.kt} (61%) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/{model/TaxiUnmannedViewModel.kt => ui/task/TaxiCurrentTaskViewModel.kt} (97%) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/{TaxiReserveOrderFragment.kt => task/TaxiNextTaskFragment.kt} (63%) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/{TaxiServerOrdersFragment.kt => task/TaxiTaskTabFragment.kt} (74%) rename OCH/taxi/unmanned-driver/src/main/res/layout/{unmanned_being_order.xml => task_fragment_current.xml} (100%) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt index 893e68040b..891208987a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt @@ -1,5 +1,7 @@ package com.mogo.och.taxi.bean +import android.text.Spanned +import androidx.core.text.HtmlCompat import com.mogo.eagle.core.data.BaseData /** @@ -44,8 +46,10 @@ data class OrderDetail( } } -data class Site(var siteId: Long, var siteName: String, var gcjLat: Double, var gcjLon: Double, - var wgs84Lon: Double, var wgs84Lat: Double) { +data class Site( + var siteId: Long, var siteName: String, var gcjLat: Double, var gcjLon: Double, + var wgs84Lon: Double, var wgs84Lat: Double +) { override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false @@ -69,6 +73,16 @@ data class QueryCurrentTaskRespBean(var data: Result?) : BaseData() { var startSite: Site?, var endSite: Site?, var order: OrderDetail? ) { + companion object { + @JvmStatic + fun getCurrentTaskTotalAndDurationHtml(mileage: Float, duration: Int): Spanned { + val strHtml = + ("全程 " + " $mileage " + " 公里 " + + "，总用时 " + " $duration " + " 分钟") + return HtmlCompat.fromHtml(strHtml, HtmlCompat.FROM_HTML_MODE_LEGACY) + } + } + // servingStatus = 0 //暂停接单 = 1 //开始接单 //taskType = 1 //虚拟任务 = 2 //接驾任务 = 3 //送驾任务 //currentStatus 0：空闲 1:获取任务 2:开始任务 3:到达目的地 @@ -95,8 +109,8 @@ data class StartTaskReqBean(var sn: String, var lineId: Long) data class ArriveSiteReqBean(var sn: String, var siteId: Long) data class PrepareTaskReqBean(var sn: String, var siteId: Long) -data class PrepareTaskRespBean(var data: Result?): BaseData(){ //taskType 1:虚拟任务 2:接驾任务3:送驾任务 - data class Result( +data class PrepareTaskRespBean(var data: Result?) : BaseData() { //taskType 1:虚拟任务 2:接驾任务3:送驾任务 + data class Result( var lineId: Long, var cityCode: Int, var taskType: Int, var startSite: Site, var endSite: Site ) @@ -106,18 +120,18 @@ data class JumpPassengerCheckReqBean(var sn: String, var orderNo: String) data class CancelOrderReqBean(var sn: String, var orderNo: String, var cancelType: Int) data class OrderCompletedReqBean(var sn: String, var orderNo: String) data class QueryCarOrderByNoReqBean(var sn: String, var orderNo: String) -data class QueryCarOrderByNoRespBean(var data: Result): BaseData(){ +data class QueryCarOrderByNoRespBean(var data: Result) : BaseData() { data class Result( var sn: String, var orderNo: String, var orderStatus: Int, var bookingUserPhone: String, var businessType: String, - var mileage: Float,var duration: Float,var passengerSize: Int + var mileage: Float, var duration: Float, var passengerSize: Int ) } data class ContrailListRespBean(var data: MutableList?) //轨迹路线集合 : BaseData() { data class Result( - var lineId: Long,var lineName: String, var csvFileUrl: String, var csvFileMd5: String, + var lineId: Long, var lineName: String, var csvFileUrl: String, var csvFileMd5: String, var txtFileUrl: String, var txtFileMd5: String, var contrailSaveTime: Long, var csvFileUrlDPQP: String, var csvFileMd5DPQP: String, var txtFileUrlDPQP: String, var txtFileMd5DPQP: String, var contrailSaveTimeDPQP: Long diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt index dd3e816f4d..b378fea9e1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt @@ -1,12 +1,10 @@ package com.mogo.och.taxi.ui.base -import android.os.Build import android.os.Bundle import android.text.TextUtils import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.annotation.RequiresApi import androidx.fragment.app.FragmentTransaction import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.module.status.MogoStatusManager @@ -21,7 +19,7 @@ import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean import com.mogo.och.taxi.model.TaxiModel import com.mogo.och.taxi.network.LoginBusImpl import com.mogo.och.taxi.ui.TaxiPersonalDialogFragment -import com.mogo.och.taxi.ui.TaxiServerOrdersFragment +import com.mogo.och.taxi.ui.TaxiTaskTabFragment import com.mogo.och.taxi.utils.TPRouteDataTestUtils import kotlinx.android.synthetic.main.taxi_base_fragment.module_mogo_och_operation_status import kotlinx.android.synthetic.main.taxi_base_fragment.taxi_driver_role_tv @@ -48,7 +46,7 @@ class TaxiFragment : BaseTaxiTabFragment(), } } - private var servedOrdersFragment: WeakReference? = null + private var taskTabFragment: WeakReference? = null private var personalDialogFragment: WeakReference? = null private var loginService: LoginService? = null @@ -126,10 +124,10 @@ class TaxiFragment : BaseTaxiTabFragment(), } private fun initFragment() { - servedOrdersFragment = WeakReference(TaxiServerOrdersFragment.newInstance()) + taskTabFragment = WeakReference(TaxiTaskTabFragment.newInstance()) val transaction: FragmentTransaction = childFragmentManager.beginTransaction() //默认显示OCHTaxiServerOrdersFragment - servedOrdersFragment?.get()?.let { + taskTabFragment?.get()?.let { transaction.add(R.id.fragment_container, it).show( it ) @@ -143,14 +141,13 @@ class TaxiFragment : BaseTaxiTabFragment(), override fun onChangeOperationStatus() { super.onChangeOperationStatus() - if (null == servedOrdersFragment || servedOrdersFragment!!.get() == null) return - servedOrdersFragment!!.get()!!.onChangeOperationStatus() + if (null == taskTabFragment || taskTabFragment!!.get() == null) return + taskTabFragment!!.get()!!.onOperationStatusChanged() } - @RequiresApi(Build.VERSION_CODES.N) - fun updateReserveOrderChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) { - if (null == servedOrdersFragment || servedOrdersFragment!!.get() == null) return - servedOrdersFragment!!.get()!!.updateOrderChanged(taskAndOrder) + fun updateNextTaskFragment(taskAndOrder: QueryCurrentTaskRespBean.Result?) { + if (null == taskTabFragment || taskTabFragment!!.get() == null) return + taskTabFragment!!.get()!!.updateOrderChanged(taskAndOrder) } fun switchVRFlatMode(isVRMode: Boolean) { @@ -211,8 +208,8 @@ class TaxiFragment : BaseTaxiTabFragment(), fun onNaviToEnd(isAmap: Boolean, isShow: Boolean) { if (isAmap) { - if (null == servedOrdersFragment || servedOrdersFragment!!.get() == null) return - servedOrdersFragment!!.get()!!.onNaviToEndAMap(isShow) + if (null == taskTabFragment || taskTabFragment!!.get() == null) return + taskTabFragment!!.get()!!.onNaviToEndAMap(isShow) } else if (isShow) { //使用routing数据 showRoutingToStationFragment(true) } else { @@ -247,8 +244,8 @@ class TaxiFragment : BaseTaxiTabFragment(), } fun onCurrentOrderDistToEndChanged(meters: Long, timeInSecond: Long) { - if (null == servedOrdersFragment || servedOrdersFragment!!.get() == null) return - servedOrdersFragment!!.get()!!.onCurrentOrderDistToEndChanged(meters, timeInSecond) + if (null == taskTabFragment || taskTabFragment!!.get() == null) return + taskTabFragment!!.get()!!.onCurrentOrderDistToEndChanged(meters, timeInSecond) } private fun testRouteInfoUpload() { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt similarity index 94% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt index 2ce91eb17b..e336ea75a2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt @@ -8,7 +8,6 @@ import android.widget.LinearLayout import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.och.taxi.R import com.mogo.och.taxi.model.TaxiModel -import kotlinx.android.synthetic.main.taxi_debug_order.view.orderDebugContainer import kotlinx.android.synthetic.main.taxi_debug_order.view.orderInfo import kotlinx.android.synthetic.main.taxi_debug_order.view.orderToStartLines import kotlinx.android.synthetic.main.taxi_debug_order.view.taskEndSite @@ -22,14 +21,14 @@ import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_sto import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_traj_md5 import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_traj_md5_dpqp -class OrderDebugView @JvmOverloads constructor( +class DebugView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, defStyleRes: Int = 0 ) : LinearLayout(context, attrs, defStyleAttr, defStyleRes) { companion object { - const val TAG = "OrderDebugView" + const val TAG = "DebugView" } init { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt similarity index 61% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 42625b9a1c..647ad81b88 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -1,7 +1,6 @@ package com.mogo.och.taxi.ui import android.annotation.SuppressLint -import android.app.Activity import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.os.Build @@ -9,6 +8,7 @@ import android.os.Bundle import android.text.Html import android.view.View import androidx.annotation.RequiresApi +import androidx.core.text.HtmlCompat import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.amap.api.navi.model.NaviLatLng @@ -16,8 +16,6 @@ import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getState import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02 -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getOverlayManager import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -25,14 +23,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.DateTimeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.map.overlay.core.Level -import com.mogo.map.overlay.point.Point import com.mogo.och.common.module.map.AmapNaviToDestinationModel import com.mogo.och.common.module.map.ICommonNaviChangedCallback import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil -import com.mogo.och.common.module.utils.OCHThreadPoolManager -import com.mogo.och.common.module.voice.VoiceNotice.showNotice import com.mogo.och.common.module.wigets.OCHCommitDialog import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.OrderDetail @@ -45,26 +39,26 @@ import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER import com.mogo.och.taxi.model.TaxiModel -import com.mogo.och.taxi.model.TaxiUnmannedViewModel import com.mogo.och.taxi.ui.base.TaxiFragment +import com.mogo.och.taxi.ui.task.TaxiCurrentTaskViewModel import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState import com.mogo.och.taxi.ui.unmanned.UnmannedIntent import com.mogo.och.taxi.utils.MapMakerManager +import kotlinx.android.synthetic.main.task_fragment_current.cancelOrder +import kotlinx.android.synthetic.main.task_fragment_current.endPoint +import kotlinx.android.synthetic.main.task_fragment_current.endStationName +import kotlinx.android.synthetic.main.task_fragment_current.mBeingOrderLayout +import kotlinx.android.synthetic.main.task_fragment_current.naviToEnd +import kotlinx.android.synthetic.main.task_fragment_current.naviToStart +import kotlinx.android.synthetic.main.task_fragment_current.noTaskData +import kotlinx.android.synthetic.main.task_fragment_current.orderPhoneAndNum +import kotlinx.android.synthetic.main.task_fragment_current.startPoint +import kotlinx.android.synthetic.main.task_fragment_current.startStationName +import kotlinx.android.synthetic.main.task_fragment_current.taskClickBtn +import kotlinx.android.synthetic.main.task_fragment_current.taskOtherInfo +import kotlinx.android.synthetic.main.task_fragment_current.taskStatus +import kotlinx.android.synthetic.main.task_fragment_current.taskTypeTv import kotlinx.android.synthetic.main.taxi_no_data_common_view.noOrderDataTv -import kotlinx.android.synthetic.main.unmanned_being_order.cancelOrder -import kotlinx.android.synthetic.main.unmanned_being_order.endPoint -import kotlinx.android.synthetic.main.unmanned_being_order.endStationName -import kotlinx.android.synthetic.main.unmanned_being_order.mBeingOrderLayout -import kotlinx.android.synthetic.main.unmanned_being_order.naviToEnd -import kotlinx.android.synthetic.main.unmanned_being_order.naviToStart -import kotlinx.android.synthetic.main.unmanned_being_order.noTaskData -import kotlinx.android.synthetic.main.unmanned_being_order.orderPhoneAndNum -import kotlinx.android.synthetic.main.unmanned_being_order.startPoint -import kotlinx.android.synthetic.main.unmanned_being_order.startStationName -import kotlinx.android.synthetic.main.unmanned_being_order.taskClickBtn -import kotlinx.android.synthetic.main.unmanned_being_order.taskOtherInfo -import kotlinx.android.synthetic.main.unmanned_being_order.taskStatus -import kotlinx.android.synthetic.main.unmanned_being_order.taskTypeTv import kotlinx.coroutines.flow.map import java.util.Calendar import kotlin.math.ceil @@ -74,155 +68,141 @@ import kotlin.math.roundToInt * @author: wangmingjun * @date: 2023/7/24 */ -class TaxiBeingTaskFragment : BaseFragment(), +class TaxiCurrentTaskFragment : BaseFragment(), View.OnClickListener, ICommonNaviChangedCallback { - private lateinit var mViewModel : TaxiUnmannedViewModel + private lateinit var mViewModel: TaxiCurrentTaskViewModel + private var mCurrentTaskWithOrder: QueryCurrentTaskRespBean.Result? = null - @Volatile - private var mTtsLessThan200Tip = 0 //离终点200米提示播报 - private var mCurrentTaskAndOrder: QueryCurrentTaskRespBean.Result? = null - private var mCurrentUntruthTask: StartServiceRespBean.Result? = null + // 开始接单后 需要将车开到最近的一个站点就位，然后才能开启 无人化 流程 + private var mDriveToNearestStationTask: StartServiceRespBean.Result? = null companion object { - const val TAG = "TaxiBeingTaskFragment" - @SuppressLint("StaticFieldLeak") - private var mActivity: Activity? = null - @SuppressLint("StaticFieldLeak") + const val TAG = "TaxiCurrentTaskFragment" + private var mTaxiFragment: TaxiFragment? = null - fun newInstance( - activity: Activity?, - taxiFragment: TaxiFragment? - ): TaxiBeingTaskFragment { - mActivity = activity + fun newInstance(taxiFragment: TaxiFragment?): TaxiCurrentTaskFragment { mTaxiFragment = taxiFragment val args = Bundle() - val fragment = TaxiBeingTaskFragment() + val fragment = TaxiCurrentTaskFragment() fragment.arguments = args return fragment } } override fun getLayoutId(): Int { - return R.layout.unmanned_being_order + return R.layout.task_fragment_current } override fun getTagName(): String { - return "TaxiBeingTaskFragment" + return "TaxiCurrentTaskFragment" } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - d("viewModel ==", "TaxiBeingTaskFragment onCreate") - mViewModel = ViewModelProvider(this, ViewModelProvider.NewInstanceFactory())[TaxiUnmannedViewModel::class.java] + mViewModel = ViewModelProvider( + this, + ViewModelProvider.NewInstanceFactory() + )[TaxiCurrentTaskViewModel::class.java] } - @RequiresApi(Build.VERSION_CODES.N) override fun initViews() { - initNaviView() - isHaveBeingOrder(false) initOnClickListener() - //任意模式下调试信息都打开 - initOrderTestBar() - - initData() + initContainerView(false) + initTaskDebugViewListener() + initViewModelObserver() } - @RequiresApi(Build.VERSION_CODES.N) - private fun initData() { + /** + * 是否有正在进行的订单，进行UI显示 + * + * @param being + */ + private fun initContainerView(hasCurrentTask: Boolean) { + d( + M_TAXI + TAG, + "hasCurrentTask = $hasCurrentTask" + ) + try { + if (hasCurrentTask) { + noTaskData.visibility = View.GONE + mBeingOrderLayout.visibility = View.VISIBLE + } else { + noTaskData.visibility = View.VISIBLE + noOrderDataTv.text = "暂无进行中订单" + mBeingOrderLayout.visibility = View.GONE + } + } catch (e: NullPointerException) { //可能会出现订单信息已经轮询回来，但进行中页面控件还未初始化完成的情况 + TaxiModel.clearCurrentOCHOrder() + } + } + private fun initOnClickListener() { + naviToStart.setOnClickListener(this) + naviToEnd.setOnClickListener(this) + + cancelOrder.setOnClickListener(this) + taskStatus.setOnClickListener(this) + taskClickBtn.setOnClickListener(this) + } + + private fun initTaskDebugViewListener() { + taskStatus.setOnLongClickListener { + mTaxiFragment?.clickOrderDebugView() + false + } + } + + private fun initViewModelObserver() { mViewModel.sendUiIntent(UnmannedIntent.StartTaskOrOrderLooper) //监听返回的数据状态 lifecycleScope.launchWhenStarted { - mViewModel.uiStateFlow.map {it.taskAndOrderUiState}.collect {taskAndOrderUiState -> - d(TAG,"uiStateFlow-taskAndOrderUiState: $taskAndOrderUiState") - when(taskAndOrderUiState){ - is TaskAndOrderUiState.INIT -> { + mViewModel.uiStateFlow.map { it.taskAndOrderUiState }.collect { taskAndOrderUiState -> + d(TAG, "uiStateFlow-initViewModelObserver: $taskAndOrderUiState") + when (taskAndOrderUiState) { + is TaskAndOrderUiState.INIT -> { + } + is TaskAndOrderUiState.TASKANDORDER -> { + mDriveToNearestStationTask = taskAndOrderUiState.untruthTask + mCurrentTaskWithOrder = taskAndOrderUiState.taskAndOrder + + if ((taskAndOrderUiState.untruthTask == null + && mCurrentTaskWithOrder != null + && mCurrentTaskWithOrder!!.endSite == null) + || mCurrentTaskWithOrder == null + ) { + initContainerView(false) + removeAllMapMarker() + return@collect } - is TaskAndOrderUiState.TASKANDORDER -> { - - mCurrentUntruthTask = taskAndOrderUiState.untruthTask - mCurrentTaskAndOrder = taskAndOrderUiState.taskAndOrder - - if ((taskAndOrderUiState.untruthTask == null && mCurrentTaskAndOrder != null - && mCurrentTaskAndOrder!!.endSite == null) || mCurrentTaskAndOrder == null){ - isHaveBeingOrder(false) - removeAllMapMarker() - return@collect - } - - if (taskAndOrderUiState.untruthTask != null){ - updateUntruthTask(taskAndOrderUiState.untruthTask) - }else{ - updateReserveOrderChanged(taskAndOrderUiState.taskAndOrder) - updateCurrentTaskAndOrderStatusChanged(taskAndOrderUiState.taskAndOrder) - } - } - - is TaskAndOrderUiState.UPDATEORDERMILEANDDUR -> { - updateOrderTotalMilAndDur(taskAndOrderUiState.mileage,taskAndOrderUiState.duration) + if (taskAndOrderUiState.untruthTask != null) { + updateDriveToNearestStationTaskView(taskAndOrderUiState.untruthTask) + } else { + updateNextTaskFragment(taskAndOrderUiState.taskAndOrder) + updateCurrentTaskAndOrderStatusChanged(taskAndOrderUiState.taskAndOrder) } } + + is TaskAndOrderUiState.UPDATEORDERMILEANDDUR -> { + taskOtherInfo.text = + QueryCurrentTaskRespBean.Result.getCurrentTaskTotalAndDurationHtml( + taskAndOrderUiState.mileage, + taskAndOrderUiState.duration + ) + } } + } } } - @RequiresApi(Build.VERSION_CODES.N) - private fun updateOrderTotalMilAndDur(mileage: Float, duration: Int) { - val strHtml2 = - ("全程 " + " $mileage " + " 公里 " - + "，总用时 " + " $duration " + " 分钟") - taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY) - } - - @RequiresApi(Build.VERSION_CODES.N) - private fun updateReserveOrderChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) { - mTaxiFragment?.let { - it.updateReserveOrderChanged(taskAndOrder) - } - } - - fun onChangeOperationStatus(){ - mViewModel.sendUiIntent(UnmannedIntent.StartOrPauseReceivingOrder) - } - - private fun updateUntruthTask(untruthTask: StartServiceRespBean.Result?) { - if (untruthTask == null) return - isHaveBeingOrder(true) - updateUntruthTaskView() - updateUntruthTaskUIData(untruthTask.siteName) - updateUntruthTaskOtherInfo() - } - - private fun updateUntruthTaskOtherInfo() { - if (mCurrentUntruthTask != null){ - startNaviToStation(false, mCurrentUntruthTask!!.gcjLat, - mCurrentUntruthTask!!.gcjLon) - } - } - - private fun updateUntruthTaskUIData(siteName: String) { - taskStatus.text = resources.getString(R.string.task_start_to_virtual_site) - startStationName.text = resources.getString(R.string.task_current_loc) - endStationName.text = siteName - setPointBlueGreen() - } - - private fun setPointBlueGreen(){ - startPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big) - endPoint.setImageResource(R.drawable.taxi_driver_circle_green_big) - } - - private fun setPointGreenBlue(){ - startPoint.setImageResource(R.drawable.taxi_driver_circle_green_big) - endPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big) - } - - private fun updateUntruthTaskView() { - taskStatus.visibility = View.VISIBLE + private fun updateDriveToNearestStationTaskView(driveToNearestStationTask: StartServiceRespBean.Result?) { + if (driveToNearestStationTask == null) return + initContainerView(true) + // DriverToNearestStationTask 更新 + taskStatus.visibility = View.VISIBLE taskTypeTv.visibility = View.GONE cancelOrder.visibility = View.GONE orderPhoneAndNum.visibility = View.GONE @@ -231,37 +211,63 @@ class TaxiBeingTaskFragment : BaseFragment(), taskClickBtn.visibility = View.GONE naviToStart.visibility = View.GONE naviToEnd.visibility = View.VISIBLE - taskOtherInfo.visibility = View.VISIBLE + taskOtherInfo.visibility = View.VISIBLE + + // 更新任务状态，起点，终点 + taskStatus.text = resources.getString(R.string.task_start_to_virtual_site) + startStationName.text = resources.getString(R.string.task_current_loc) + endStationName.text = driveToNearestStationTask.siteName + updateStartAndEndStationPointByStatus(true) + + // 使用高德获取导航数据 + if (mDriveToNearestStationTask != null) { + startNaviToStation( + false, mDriveToNearestStationTask!!.gcjLat, + mDriveToNearestStationTask!!.gcjLon + ) + } } - private fun initOnClickListener() { - cancelOrder.setOnClickListener(this) - taskStatus.setOnClickListener(this) - taskClickBtn.setOnClickListener(this) + private fun updateStartAndEndStationPointByStatus(isGoingToStation: Boolean) { + if (isGoingToStation) {// 即将到达的站点 + startPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big) + endPoint.setImageResource(R.drawable.taxi_driver_circle_green_big) + } else {// 到达站点 或 已经经过的站点 + startPoint.setImageResource(R.drawable.taxi_driver_circle_green_big) + endPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big) + } } - private fun initNaviView() { - naviToStart.setOnClickListener(this) - naviToEnd.setOnClickListener(this) + private fun updateNextTaskFragment(taskAndOrder: QueryCurrentTaskRespBean.Result?) { + mTaxiFragment?.let { + it.updateNextTaskFragment(taskAndOrder) + } } - private fun updateRemainDistanceAndTime(isVoicePlay: Boolean){ + fun onOperationStatusChanged() { + mViewModel.sendUiIntent(UnmannedIntent.StartOrPauseReceivingOrder) + } + + private fun updateRemainDistanceAndTime(isVoicePlay: Boolean) { //根据任务状态计算剩余历程和时间 - if (mCurrentTaskAndOrder == null) return - - if (mCurrentTaskAndOrder!!.endSite != null - && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code){ - - startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.endSite!!.gcjLat, - mCurrentTaskAndOrder!!.endSite!!.gcjLon) + if (mCurrentTaskWithOrder == null) return + if (mCurrentTaskWithOrder!!.endSite != null + && mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code + ) { + startNaviToStation( + isVoicePlay, mCurrentTaskWithOrder!!.endSite!!.gcjLat, + mCurrentTaskWithOrder!!.endSite!!.gcjLon + ) return } - if (mCurrentTaskAndOrder!!.startSite != null - && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.GetTask.code){ //演练任务和送驾任务 - - startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.startSite!!.gcjLat, - mCurrentTaskAndOrder!!.startSite!!.gcjLon) + if (mCurrentTaskWithOrder!!.startSite != null + && mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.GetTask.code + ) { //演练任务和送驾任务 + startNaviToStation( + isVoicePlay, mCurrentTaskWithOrder!!.startSite!!.gcjLat, + mCurrentTaskWithOrder!!.startSite!!.gcjLon + ) } } @@ -273,13 +279,14 @@ class TaxiBeingTaskFragment : BaseFragment(), fun updateCurrentTaskAndOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) { if (taskAndOrder == null) return if ((taskAndOrder.endSite == null || taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code) - && taskAndOrder.order == null){ - isHaveBeingOrder(false) + && taskAndOrder.order == null + ) { + initContainerView(false) removeAllMapMarker() return } - isHaveBeingOrder(true) + initContainerView(true) /** * 根据任务类型判断任务显示, * 虚拟单, 显示在进行中 前往上车点 @@ -292,30 +299,33 @@ class TaxiBeingTaskFragment : BaseFragment(), val endSite = taskAndOrder.endSite //进行的任务 val currentStatus = taskAndOrder.currentStatus // 任务的状态 - updateUIShowStatus(taskType,currentStatus,order) + updateUIShowStatus(taskType, currentStatus, order) when (taskType) { TaskTypeEnum.VirtualTask.code -> {// 演练任务 - if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code){ + if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { updateOrderUI(order) return } if (startSite == null || endSite == null) return taskStatus.text = resources.getString(R.string.task_start_end_site) - taskTypeTv.background = resources.getDrawable(R.drawable.task_unreal_type_btn_bg,null) + taskTypeTv.background = + resources.getDrawable(R.drawable.task_unreal_type_btn_bg, null) taskTypeTv.text = resources.getString(R.string.task_exercise) startStationName.text = startSite.siteName endStationName.text = endSite.siteName - setPointBlueGreen() + updateStartAndEndStationPointByStatus(true) } - TaskTypeEnum.ToOrderEndTask.code,TaskTypeEnum.ToOrderStartTask.code -> {// 送驾/接驾任务任务 + + TaskTypeEnum.ToOrderEndTask.code, TaskTypeEnum.ToOrderStartTask.code -> {// 送驾/接驾任务任务 if (order == null) return updateOrderUI(order) } + TaskTypeEnum.None.code -> { - if (order != null){ + if (order != null) { updateOrderUI(order) } } @@ -327,22 +337,23 @@ class TaxiBeingTaskFragment : BaseFragment(), } private fun updateMapMarkers() { - if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.startSite != null - && mCurrentTaskAndOrder!!.endSite != null ) { - when(mCurrentTaskAndOrder!!.currentStatus){ + if (mCurrentTaskWithOrder != null && mCurrentTaskWithOrder!!.startSite != null + && mCurrentTaskWithOrder!!.endSite != null + ) { + when (mCurrentTaskWithOrder!!.currentStatus) { TaskStatusEnum.GetTask.code -> { setOrRemoveMapMaker( true, TAXI_START_MAP_MAKER, - mCurrentTaskAndOrder!!.startSite!!.wgs84Lat, - mCurrentTaskAndOrder!!.startSite!!.wgs84Lon, + mCurrentTaskWithOrder!!.startSite!!.wgs84Lat, + mCurrentTaskWithOrder!!.startSite!!.wgs84Lon, R.raw.star_marker ) setOrRemoveMapMaker( true, TAXI_END_MAP_MAKER, - mCurrentTaskAndOrder!!.endSite!!.wgs84Lat, - mCurrentTaskAndOrder!!.endSite!!.wgs84Lon, + mCurrentTaskWithOrder!!.endSite!!.wgs84Lat, + mCurrentTaskWithOrder!!.endSite!!.wgs84Lon, R.raw.end_marker ) } @@ -351,15 +362,15 @@ class TaxiBeingTaskFragment : BaseFragment(), setOrRemoveMapMaker( false, TAXI_START_MAP_MAKER, - mCurrentTaskAndOrder!!.startSite!!.wgs84Lat, - mCurrentTaskAndOrder!!.startSite!!.wgs84Lon, + mCurrentTaskWithOrder!!.startSite!!.wgs84Lat, + mCurrentTaskWithOrder!!.startSite!!.wgs84Lon, R.raw.star_marker ) setOrRemoveMapMaker( true, TAXI_END_MAP_MAKER, - mCurrentTaskAndOrder!!.endSite!!.wgs84Lat, - mCurrentTaskAndOrder!!.endSite!!.wgs84Lon, + mCurrentTaskWithOrder!!.endSite!!.wgs84Lat, + mCurrentTaskWithOrder!!.endSite!!.wgs84Lon, R.raw.end_marker ) } @@ -368,47 +379,48 @@ class TaxiBeingTaskFragment : BaseFragment(), setOrRemoveMapMaker( false, TAXI_START_MAP_MAKER, - mCurrentTaskAndOrder!!.startSite!!.wgs84Lat, - mCurrentTaskAndOrder!!.startSite!!.wgs84Lon, + mCurrentTaskWithOrder!!.startSite!!.wgs84Lat, + mCurrentTaskWithOrder!!.startSite!!.wgs84Lon, R.raw.star_marker ) setOrRemoveMapMaker( false, TAXI_END_MAP_MAKER, - mCurrentTaskAndOrder!!.endSite!!.wgs84Lat, - mCurrentTaskAndOrder!!.endSite!!.wgs84Lon, + mCurrentTaskWithOrder!!.endSite!!.wgs84Lat, + mCurrentTaskWithOrder!!.endSite!!.wgs84Lon, R.raw.end_marker ) } - } - - - }else{ - d(M_TAXI + TAG,"CurrentTaskAndOrder == "+GsonUtil.jsonFromObject(mCurrentTaskAndOrder)) + } else { + d( + M_TAXI + TAG, + "CurrentTaskAndOrder == " + GsonUtil.jsonFromObject(mCurrentTaskWithOrder) + ) } } @RequiresApi(Build.VERSION_CODES.N) private fun updateOrderUI(order: OrderDetail) { - taskTypeTv.text = resources.getString(R.string.task_order) - taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg,null) - orderPhoneAndNum.text = Html.fromHtml(" " + order.bookingUserPhone + "" + - " | " + - "" + order.passengerSize + "人" + "",Html.FROM_HTML_MODE_LEGACY) + taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg, null) + orderPhoneAndNum.text = Html.fromHtml( + " " + order.bookingUserPhone + "" + + " | " + + "" + order.passengerSize + "人" + "", + Html.FROM_HTML_MODE_LEGACY + ) startStationName.text = order.orderStartSite?.siteName endStationName.text = order.orderEndSite?.siteName - when(order.orderStatus){ - + when (order.orderStatus) { TaxiOrderStatusEnum.None.code -> { //无 - isHaveBeingOrder(false) + initContainerView(false) } TaxiOrderStatusEnum.ArriveAtEnd.code -> { //到达目的地 taskStatus.text = resources.getString(R.string.task_start_end_site) - setPointBlueGreen() + updateStartAndEndStationPointByStatus(true) updateOrderBottomBtn( getString(R.string.module_och_taxi_order_server_end), Color.parseColor("#FFFFFF"), @@ -420,7 +432,7 @@ class TaxiBeingTaskFragment : BaseFragment(), TaxiOrderStatusEnum.OnTheWayToEnd.code -> { //送驾中 taskStatus.text = resources.getString(R.string.task_start_end_site) - setPointBlueGreen() + updateStartAndEndStationPointByStatus(true) updateOrderBottomBtn( getString(R.string.module_och_taxi_order_close), Color.parseColor("#FFFFFF"), @@ -429,26 +441,25 @@ class TaxiBeingTaskFragment : BaseFragment(), ) } - TaxiOrderStatusEnum.UserArriveAtStart.code,TaxiOrderStatusEnum.ArriveAtStart.code -> { + TaxiOrderStatusEnum.UserArriveAtStart.code, TaxiOrderStatusEnum.ArriveAtStart.code -> { //乘客到达上车点,验证成功 ; 到达乘客上车点 - setPointGreenBlue() + updateStartAndEndStationPointByStatus(false) taskStatus.text = resources.getString(R.string.arrived_start_site) updateOrderBottomBtn( - if (order.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code) - getString(R.string.module_och_taxi_order_server_start) - else getString(R.string.module_och_taxi_order_server_start_wait_check), - Color.parseColor("#FFFFFF"), - Color.parseColor("#FF1D5EF3"), - true - ) - + if (order.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code) + getString(R.string.module_och_taxi_order_server_start) + else getString(R.string.module_och_taxi_order_server_start_wait_check), + Color.parseColor("#FFFFFF"), + Color.parseColor("#FF1D5EF3"), + true + ) updateOtherInfo() hideNavi() } TaxiOrderStatusEnum.OnTheWayToStart.code -> { //前往上车地点 taskStatus.text = resources.getString(R.string.task_start_start_site) - setPointGreenBlue() + updateStartAndEndStationPointByStatus(false) updateOrderBottomBtn( getString(R.string.module_och_taxi_order_server_start), Color.parseColor("#4DFFFFFF"), @@ -456,7 +467,6 @@ class TaxiBeingTaskFragment : BaseFragment(), false ) } - } } @@ -484,16 +494,17 @@ class TaxiBeingTaskFragment : BaseFragment(), DateTimeUtil.MM_dd_HH_mm ) + "") } - taskOtherInfo.text = Html.fromHtml(strHtml13,Html.FROM_HTML_MODE_LEGACY) + taskOtherInfo.text = Html.fromHtml(strHtml13, Html.FROM_HTML_MODE_LEGACY) } private fun updateUIShowStatus(taskType: Int, currentStatus: Int, order: OrderDetail?) { when (taskType) { - TaskTypeEnum.None.code ->{ - if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code){ + TaskTypeEnum.None.code -> { + if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { handleOrderView(order) } } + TaskTypeEnum.VirtualTask.code -> { //演练任务 cancelOrder.visibility = View.GONE orderPhoneAndNum.visibility = View.GONE @@ -501,10 +512,13 @@ class TaxiBeingTaskFragment : BaseFragment(), // currentStatus 0：空闲 1:获取任务 2:开始任务 3:到达目的地 naviToStart.visibility = View.GONE taskTypeTv.visibility = View.VISIBLE - naviToEnd.visibility = if (currentStatus >= TaskStatusEnum.StartTask.code) View.VISIBLE else View.GONE - taskOtherInfo.visibility = if (currentStatus == TaskStatusEnum.GetTask.code) View.GONE else View.VISIBLE + naviToEnd.visibility = + if (currentStatus >= TaskStatusEnum.StartTask.code) View.VISIBLE else View.GONE + taskOtherInfo.visibility = + if (currentStatus == TaskStatusEnum.GetTask.code) View.GONE else View.VISIBLE } - TaskTypeEnum.ToOrderEndTask.code,TaskTypeEnum.ToOrderStartTask.code -> {// 运营单(接驾任务、送驾任务) + + TaskTypeEnum.ToOrderEndTask.code, TaskTypeEnum.ToOrderStartTask.code -> {// 运营单(接驾任务、送驾任务) if (order == null) return handleOrderView(order) } @@ -520,10 +534,12 @@ class TaxiBeingTaskFragment : BaseFragment(), // orderStatus: 0 订单创建（为派单）, 10 已派上司机（司机去往上车点）, 20 司机到达上车点, // 30 乘客到达上车点, 40 服务中（去往目的地）, 50 到达目的地, 60 已完成, 70 已取消 naviToStart.visibility = if (order.orderStatus - == TaxiOrderStatusEnum.OnTheWayToStart.code) View.VISIBLE else View.GONE + == TaxiOrderStatusEnum.OnTheWayToStart.code + ) View.VISIBLE else View.GONE naviToEnd.visibility = if (order.orderStatus - == TaxiOrderStatusEnum.OnTheWayToEnd.code) View.VISIBLE else View.GONE + == TaxiOrderStatusEnum.OnTheWayToEnd.code + ) View.VISIBLE else View.GONE taskOtherInfo.visibility = View.VISIBLE } @@ -535,6 +551,7 @@ class TaxiBeingTaskFragment : BaseFragment(), AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi() mTaxiFragment?.showAmapNaviToStationFragment(false) mTaxiFragment?.showRoutingToStationFragment(false) + requireParentFragment() } private fun startNaviToStation(isVoicePlay: Boolean, stationLat: Double, stationLng: Double) { @@ -557,11 +574,10 @@ class TaxiBeingTaskFragment : BaseFragment(), * @param meters m * @param timeInSecond 秒 */ - @RequiresApi(Build.VERSION_CODES.N) fun updateDistanceAndTime(meters: Long, timeInSecond: Long) { // CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond); - if (mCurrentTaskAndOrder == null) return - if (mCurrentTaskAndOrder!!.endSite == null && mCurrentUntruthTask == null) return + if (mCurrentTaskWithOrder == null) return + if (mCurrentTaskWithOrder!!.endSite == null && mDriveToNearestStationTask == null) return var dis = "0" var disUnit = "公里" @@ -579,13 +595,12 @@ class TaxiBeingTaskFragment : BaseFragment(), ("里程 " + "" + dis + "" + " " + disUnit + "" + "，剩余 " + "" + min + "" + " 分钟") - taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY) + taskOtherInfo.text = HtmlCompat.fromHtml(strHtml2, HtmlCompat.FROM_HTML_MODE_LEGACY) } - private fun speekVoice200mTipsOnce() { - mTtsLessThan200Tip = 1 - showNotice(resources.getString(R.string.module_och_taxi_order_arrive_end_200m_tip)) - } +// private fun speekVoice200mTipsOnce() { +// showNotice(resources.getString(R.string.module_och_taxi_order_arrive_end_200m_tip)) +// } override fun onDestroyView() { super.onDestroyView() @@ -593,13 +608,13 @@ class TaxiBeingTaskFragment : BaseFragment(), } private fun startOrEndService() { - if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.order == null) return - val order = mCurrentTaskAndOrder!!.order + if (mCurrentTaskWithOrder == null || mCurrentTaskWithOrder!!.order == null) return + val order = mCurrentTaskWithOrder!!.order if (TaxiOrderStatusEnum.ArriveAtStart.code == order!!.orderStatus) { //到达乘客上车点，司机可跳过乘客屏认证 mViewModel.sendUiIntent(UnmannedIntent.JumpPassengerCheckDone) - } else if (TaxiOrderStatusEnum.UserArriveAtStart.code == order.orderStatus){ + } else if (TaxiOrderStatusEnum.UserArriveAtStart.code == order.orderStatus) { mViewModel.sendUiIntent(UnmannedIntent.StartTask) - }else if (TaxiOrderStatusEnum.ArriveAtEnd.code == order.orderStatus) { //点击了完成服务，结束订单并更新订单信息 + } else if (TaxiOrderStatusEnum.ArriveAtEnd.code == order.orderStatus) { //点击了完成服务，结束订单并更新订单信息 mViewModel.sendUiIntent(UnmannedIntent.JourneyCompleted) } else if (TaxiOrderStatusEnum.OnTheWayToEnd.code == order.orderStatus) { //前往目的地过程中可提前结束行程 //自驾中提示，接管后才能结束 @@ -633,42 +648,20 @@ class TaxiBeingTaskFragment : BaseFragment(), closeOrderDialog.show() } - /** - * 是否有正在进行的订单，进行UI显示 - * - * @param being - */ - private fun isHaveBeingOrder(being: Boolean) { - d( - M_TAXI + TAG, - "isHaveBeingOrder = $being" - ) - try { - if (being) { - noTaskData.visibility = View.GONE - mBeingOrderLayout.visibility = View.VISIBLE - } else { - noTaskData.visibility = View.VISIBLE - noOrderDataTv.text = "暂无进行中订单" - mBeingOrderLayout.visibility = View.GONE - } - - } catch (e: NullPointerException) { //可能会出现订单信息已经轮询回来，但进行中页面控件还未初始化完成的情况 - TaxiModel.clearCurrentOCHOrder() - } - } override fun onClick(v: View) { if (v.id == taskClickBtn.id) { d(M_TAXI + TAG, taskStatus.text.toString()) startOrEndService() } else if (v.id == cancelOrder.id) { - if (mCurrentTaskAndOrder!!.order != null){ - TaxiOrderCancelDialog(mActivity,mCurrentTaskAndOrder!!.order!!.orderStatus - ) { - mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(it)) + if (mCurrentTaskWithOrder!!.order != null) { + activity?.also { + TaxiOrderCancelDialog( + it, mCurrentTaskWithOrder!!.order!!.orderStatus + ) { + mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(it)) + }.show() } - .show() } } else if (v.id == naviToStart.id || v.id == naviToEnd.id) { showNaviToEndStationFragment(true) @@ -684,15 +677,6 @@ class TaxiBeingTaskFragment : BaseFragment(), mTaxiFragment?.startNaviToEndStation(isShow) } - /** - * 订单流转debug START - */ - private fun initOrderTestBar() { - taskStatus.setOnLongClickListener { - mTaxiFragment?.clickOrderDebugView() - false - } - } @RequiresApi(Build.VERSION_CODES.N) override fun onCurrentNaviDistAndTimeChanged(meters: Int, timeInSecond: Long) { @@ -712,15 +696,15 @@ class TaxiBeingTaskFragment : BaseFragment(), updateRemainDistanceAndTime(false) }, 2000) UiThreadHandler.postDelayed({ - if (mCurrentTaskAndOrder != null && - mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.GetTask.code + if (mCurrentTaskWithOrder != null && + mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.GetTask.code ) { if (naviToStart.visibility == View.GONE) { naviToStart.visibility = View.VISIBLE } } - if (mCurrentTaskAndOrder != null && - mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code + if (mCurrentTaskWithOrder != null && + mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code ) { if (naviToEnd.visibility == View.GONE) { naviToEnd.visibility = View.VISIBLE @@ -730,15 +714,15 @@ class TaxiBeingTaskFragment : BaseFragment(), } fun onNaviToEndAmap(isShow: Boolean) { - if (mCurrentTaskAndOrder == null) return + if (mCurrentTaskWithOrder == null) return mTaxiFragment?.showAmapNaviToStationFragment( - if (mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code) + if (mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code) isShow else true ) updateRemainDistanceAndTime( - if (mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code) + if (mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code) isShow else true ) } @@ -749,12 +733,14 @@ class TaxiBeingTaskFragment : BaseFragment(), * @param uuid * @param station */ - private fun setOrRemoveMapMaker(isAdd: Boolean, uuid: String, - lat: Double, lon: Double, resourceId: Int) { + private fun setOrRemoveMapMaker( + isAdd: Boolean, uuid: String, + lat: Double, lon: Double, resourceId: Int + ) { if (isAdd) { - MapMakerManager.addMapMaker(TYPE_MARKER_TAXI_ORDER,uuid,lat, lon, resourceId) + MapMakerManager.addMapMaker(TYPE_MARKER_TAXI_ORDER, uuid, lat, lon, resourceId) } else { - MapMakerManager.removeMapMaker(uuid,lat,lon) + MapMakerManager.removeMapMaker(uuid, lat, lon) } } @@ -762,7 +748,12 @@ class TaxiBeingTaskFragment : BaseFragment(), MapMakerManager.removeAllMapMarkerByOwner(TYPE_MARKER_TAXI_ORDER) } - private fun updateOrderBottomBtn(txt: String?, txtColorId: Int, bgColorId: Int, isClickable: Boolean) { + private fun updateOrderBottomBtn( + txt: String?, + txtColorId: Int, + bgColorId: Int, + isClickable: Boolean + ) { taskClickBtn.text = txt taskClickBtn.setTextColor(txtColorId) val background = diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index eebcaf0ea0..0e025303c0 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.taxi.model +package com.mogo.och.taxi.ui.task import android.annotation.SuppressLint import android.content.Context @@ -31,6 +31,7 @@ import com.mogo.och.taxi.constant.TaxiOrderStatusEnum import com.mogo.och.taxi.constant.TaxiUnmannedConst import com.mogo.och.taxi.constant.TaxtServingStatusManager import com.mogo.och.taxi.constant.TaxtServingStatusManager.isOpeningOrderStatus +import com.mogo.och.taxi.model.TaxiModel import com.mogo.och.taxi.network.CarServiceManager import com.mogo.och.taxi.network.CarServiceManager.cancelOrder import com.mogo.och.taxi.network.CarServiceManager.contrailList @@ -48,7 +49,7 @@ import java.util.concurrent.TimeUnit * @author: wangmingjun * @date: 2023/7/26 */ -class TaxiUnmannedViewModel : BaseViewModel(){ +class TaxiCurrentTaskViewModel : BaseViewModel(){ private var mInAndWaitServiceDisposable: Disposable? = null //进行中、待服务订单列表轮询 @@ -83,7 +84,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ is UnmannedIntent.CloseOrderByDriver -> { if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.order != null){ val site = mCurrentTaskAndOrder!!.order!!.orderEndSite - TaxiModel.arriveSite(site!!.siteId,true) + TaxiModel.arriveSite(site!!.siteId, true) } } @@ -237,7 +238,8 @@ class TaxiUnmannedViewModel : BaseViewModel(){ sendUiState { copy( taskAndOrderUiState = TaskAndOrderUiState.TASKANDORDER(mCurrentTaskAndOrder, - TaxiModel.getCurUntruthTask()) + TaxiModel.getCurUntruthTask() + ) ) } } @@ -257,7 +259,8 @@ class TaxiUnmannedViewModel : BaseViewModel(){ sendUiState { copy( taskAndOrderUiState = TaskAndOrderUiState.TASKANDORDER(null, - TaxiModel.getCurUntruthTask()) + TaxiModel.getCurUntruthTask() + ) ) } } @@ -339,7 +342,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ if (result.currentStatus <= TaskStatusEnum.StartTask.code){//任务执行中, 去加载下轨迹 d(TAG, "queryCurrentTaskOnce1 = by lineId query Contrail" ) - TaxiModel.queryTaskContrail(Array(1) {result.lineId}) + TaxiModel.queryTaskContrail(Array(1) { result.lineId }) } if (result.taskType <= TaskTypeEnum.ToOrderStartTask.code @@ -447,7 +450,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ + ", isOpeningOrderStatus = ${isOpeningOrderStatus()}") if (data?.data == null || data.code != 0) return //去下载轨迹, 下发给工控机下载 - TaxiModel.queryTaskContrail(Array(1) {data.data!!.lineId}) + TaxiModel.queryTaskContrail(Array(1) { data.data!!.lineId }) } override fun onFail(code: Int, msg: String?) { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt similarity index 63% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt index e725ac4ac4..c9a38bb0f5 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt @@ -4,33 +4,31 @@ import android.annotation.SuppressLint import android.app.Activity import android.graphics.Color import android.graphics.drawable.GradientDrawable -import android.os.Build import android.os.Bundle -import android.text.Html import android.view.View -import androidx.annotation.RequiresApi +import androidx.core.text.HtmlCompat import com.mogo.commons.mvp.BaseFragment import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.OrderDetail import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment -import kotlinx.android.synthetic.main.unmanned_being_order.endStationName -import kotlinx.android.synthetic.main.unmanned_being_order.mBeingOrderLayout -import kotlinx.android.synthetic.main.unmanned_being_order.naviToEnd -import kotlinx.android.synthetic.main.unmanned_being_order.naviToStart -import kotlinx.android.synthetic.main.unmanned_being_order.noTaskData -import kotlinx.android.synthetic.main.unmanned_being_order.orderPhoneAndNum -import kotlinx.android.synthetic.main.unmanned_being_order.startStationName -import kotlinx.android.synthetic.main.unmanned_being_order.taskClickBtn -import kotlinx.android.synthetic.main.unmanned_being_order.taskOtherInfo -import kotlinx.android.synthetic.main.unmanned_being_order.taskTypeTv +import kotlinx.android.synthetic.main.task_fragment_current.endStationName +import kotlinx.android.synthetic.main.task_fragment_current.mBeingOrderLayout +import kotlinx.android.synthetic.main.task_fragment_current.naviToEnd +import kotlinx.android.synthetic.main.task_fragment_current.naviToStart +import kotlinx.android.synthetic.main.task_fragment_current.noTaskData +import kotlinx.android.synthetic.main.task_fragment_current.orderPhoneAndNum +import kotlinx.android.synthetic.main.task_fragment_current.startStationName +import kotlinx.android.synthetic.main.task_fragment_current.taskClickBtn +import kotlinx.android.synthetic.main.task_fragment_current.taskOtherInfo +import kotlinx.android.synthetic.main.task_fragment_current.taskTypeTv /** * @author: wangmingjun * @date: 2023/7/24 */ -class TaxiReserveOrderFragment : BaseFragment() { +class TaxiNextTaskFragment : BaseFragment() { private val mData: MutableList = ArrayList() override fun onCreate(savedInstanceState: Bundle?) { @@ -38,34 +36,32 @@ class TaxiReserveOrderFragment : BaseFragment() { } override fun getLayoutId(): Int { - return R.layout.unmanned_being_order + return R.layout.task_fragment_current } override fun getTagName(): String { - return "TaxiReserveOrderFragment" + return "TaxiNextTaskFragment" } override fun initViews() { showNoOrderView() } - @RequiresApi(Build.VERSION_CODES.N) fun updateOrderChanged(model: QueryCurrentTaskRespBean.Result?) { if (model?.order == null) { showNoOrderView() return } - if (model.taskType == TaskTypeEnum.VirtualTask.code){ + if (model.taskType == TaskTypeEnum.VirtualTask.code) { val order = model.order updateOrderUI(order!!) - }else{ + } else { showNoOrderView() } } - @RequiresApi(Build.VERSION_CODES.N) @SuppressLint("SetTextI18n") private fun updateOrderUI(order: OrderDetail) { showOrderView() @@ -73,9 +69,12 @@ class TaxiReserveOrderFragment : BaseFragment() { naviToStart.visibility = View.GONE naviToEnd.visibility = View.GONE - orderPhoneAndNum.text = Html.fromHtml(" " + order.bookingUserPhone + "" + - " | " + - "" + order.passengerSize + "人" + "",Html.FROM_HTML_MODE_LEGACY) + orderPhoneAndNum.text = HtmlCompat.fromHtml( + " " + order.bookingUserPhone + "" + + " | " + + "" + order.passengerSize + "人" + "", + HtmlCompat.FROM_HTML_MODE_LEGACY + ) order.orderStartSite?.let { @@ -86,7 +85,7 @@ class TaxiReserveOrderFragment : BaseFragment() { } taskTypeTv.text = resources.getString(R.string.task_order) - taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg,null) + taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg, null) updateOrderBottomBtn( getString(R.string.waiting_server), @@ -96,7 +95,12 @@ class TaxiReserveOrderFragment : BaseFragment() { ) } - private fun updateOrderBottomBtn(txt: String?, txtColorId: Int, bgColorId: Int, isClickable: Boolean) { + private fun updateOrderBottomBtn( + txt: String?, + txtColorId: Int, + bgColorId: Int, + isClickable: Boolean + ) { taskClickBtn.text = txt taskClickBtn.setTextColor(txtColorId) val background = @@ -117,18 +121,19 @@ class TaxiReserveOrderFragment : BaseFragment() { companion object { - const val TAG = "TaxiReserveOrderFragment" + const val TAG = "TaxiNextTaskFragment" @SuppressLint("StaticFieldLeak") private var mTaxiFragment: TaxiFragment? = null + @SuppressLint("StaticFieldLeak") private var mActivity: Activity? = null fun newInstance( activity: Activity?, - ): TaxiReserveOrderFragment { + ): TaxiNextTaskFragment { mActivity = activity val args = Bundle() - val fragment = TaxiReserveOrderFragment() + val fragment = TaxiNextTaskFragment() fragment.arguments = args return fragment } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt similarity index 74% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt index 6d84cce10c..eebd6b5c69 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt @@ -3,12 +3,10 @@ package com.mogo.och.taxi.ui import android.annotation.SuppressLint import android.graphics.Color import android.graphics.Typeface -import android.os.Build import android.os.Bundle import android.util.TypedValue import android.view.View import android.widget.TextView -import androidx.annotation.RequiresApi import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter @@ -27,18 +25,36 @@ import me.jessyan.autosize.utils.AutoSizeUtils /** * @author: wangmingjun * @date: 2023/7/25 + * @desc: 司机端任务fragment 容器，展示了“进行中”和“待服务”的任务信息 + * 任务：可以理解为对应的是一个自动驾驶任务 + * 任务类型：演练任务 / 接驾任务 / 送驾任务 + * 订单：是面向C端小程序的一个概念，用户下单后产生的是一个订单，后端会将一个订单分解成 接驾任务和送驾任务 并派发到 + * 车端来执行 + * 任务和订单的对应：1.如果是一个演练任务，是后端自动生成的，没有和C端订单挂钩 + * 2.如果是一个接驾任务 或 送驾任务，是和一个实际的C端订单对应的 */ -class TaxiServerOrdersFragment : BaseFragment(){ +class TaxiTaskTabFragment : BaseFragment() { + + companion object { + const val TAG = "TaxiTaskTabFragment" + fun newInstance(): TaxiTaskTabFragment { + val args = Bundle() + val fragment = TaxiTaskTabFragment() + fragment.arguments = args + return fragment + } + } + private val mTabTitles = arrayOf("进行中", "待服务") - private val fragments: MutableList = ArrayList() - private var beingTaskFragment: TaxiBeingTaskFragment? = null - private var reserveOrdersFragment: TaxiReserveOrderFragment? = null + private val mFragments: MutableList = ArrayList() + private var currentTaskFragment: TaxiCurrentTaskFragment? = null + private var nextTaskFragment: TaxiNextTaskFragment? = null override fun getLayoutId(): Int { return R.layout.taxi_server_orders_panel } override fun getTagName(): String { - return "TaxiServerOrdersFragment" + return "TaxiTaskTabFragment" } override fun initViews() { @@ -54,24 +70,25 @@ class TaxiServerOrdersFragment : BaseFragment(){ tabView.text = mTabTitles[i] tabView.height = AutoSizeUtils.dp2px(context, 120f) tab.customView = tabView + if (0 == i) { module_och_taxi_tab.addTab(tab, true) changeTabLayoutTabUI(tab, true) - beingTaskFragment = TaxiBeingTaskFragment.newInstance( - activity, + currentTaskFragment = TaxiCurrentTaskFragment.newInstance( parentFragment as TaxiFragment? ) - fragments.add(beingTaskFragment!!) + mFragments.add(currentTaskFragment!!) } else if (1 == i) { module_och_taxi_tab.addTab(tab) changeTabLayoutTabUI(tab, false) - reserveOrdersFragment = TaxiReserveOrderFragment.newInstance( + nextTaskFragment = TaxiNextTaskFragment.newInstance( activity ) - fragments.add(reserveOrdersFragment!!) + mFragments.add(nextTaskFragment!!) } } d(SceneConstant.M_TAXI + TAG, "activity=$activity") + module_och_taxi_tab.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { override fun onTabSelected(tab: TabLayout.Tab) { module_och_taxi_view_pager.currentItem = tab.position @@ -138,11 +155,11 @@ class TaxiServerOrdersFragment : BaseFragment(){ SceneConstant.M_TAXI + TAG, "getItem=$position" ) - return fragments[position] + return mFragments[position] } override fun getCount(): Int { - return fragments.size + return mFragments.size } override fun getPageTitle(position: Int): CharSequence { @@ -155,33 +172,22 @@ class TaxiServerOrdersFragment : BaseFragment(){ } fun onNaviToEndAMap(isShow: Boolean) { - if (null == beingTaskFragment) return - beingTaskFragment!!.onNaviToEndAmap(isShow) + if (null == currentTaskFragment) return + currentTaskFragment!!.onNaviToEndAmap(isShow) } fun onCurrentOrderDistToEndChanged(meters: Long, timeInSecond: Long) { - if (null == beingTaskFragment) return - beingTaskFragment!!.updateDistanceAndTime(meters, timeInSecond) + if (null == currentTaskFragment) return + currentTaskFragment!!.updateDistanceAndTime(meters, timeInSecond) } - fun onChangeOperationStatus(){ - if (null == beingTaskFragment) return - beingTaskFragment!!.onChangeOperationStatus() + fun onOperationStatusChanged() { + if (null == currentTaskFragment) return + currentTaskFragment!!.onOperationStatusChanged() } - @RequiresApi(Build.VERSION_CODES.N) - fun updateOrderChanged(model: QueryCurrentTaskRespBean.Result?){ - if (null == reserveOrdersFragment) return - reserveOrdersFragment!!.updateOrderChanged(model) - } - - companion object { - const val TAG = "TaxiServerOrdersFragment" - fun newInstance(): TaxiServerOrdersFragment { - val args = Bundle() - val fragment = TaxiServerOrdersFragment() - fragment.arguments = args - return fragment - } + fun updateOrderChanged(model: QueryCurrentTaskRespBean.Result?) { + if (null == nextTaskFragment) return + nextTaskFragment!!.updateOrderChanged(model) } } diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_being_order.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml similarity index 100% rename from OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_being_order.xml rename to OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_panel.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_panel.xml index 871a362fc3..702787973d 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_panel.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_panel.xml @@ -15,7 +15,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - Date: Wed, 23 Aug 2023 14:12:45 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20refacto?= =?UTF-8?q?r:=20Html.fromHtml=20->=20HtmlCompat.fromHtml;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 647ad81b88..4d26024b3d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -274,7 +274,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), /** * 任务和订单信息 */ - @RequiresApi(Build.VERSION_CODES.N) @SuppressLint("SetTextI18n", "UseCompatLoadingForDrawables") fun updateCurrentTaskAndOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) { if (taskAndOrder == null) return @@ -400,15 +399,14 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } - @RequiresApi(Build.VERSION_CODES.N) private fun updateOrderUI(order: OrderDetail) { taskTypeTv.text = resources.getString(R.string.task_order) taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg, null) - orderPhoneAndNum.text = Html.fromHtml( + orderPhoneAndNum.text = HtmlCompat.fromHtml( " " + order.bookingUserPhone + "" + " | " + "" + order.passengerSize + "人" + "", - Html.FROM_HTML_MODE_LEGACY + HtmlCompat.FROM_HTML_MODE_LEGACY ) startStationName.text = order.orderStartSite?.siteName endStationName.text = order.orderEndSite?.siteName @@ -470,7 +468,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } - @RequiresApi(Build.VERSION_CODES.N) private fun updateOtherInfo() { val currentCale = DateTimeUtils.getCurrentDateTime() val currentDay = @@ -494,7 +491,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), DateTimeUtil.MM_dd_HH_mm ) + "") } - taskOtherInfo.text = Html.fromHtml(strHtml13, Html.FROM_HTML_MODE_LEGACY) + taskOtherInfo.text = HtmlCompat.fromHtml(strHtml13, HtmlCompat.FROM_HTML_MODE_LEGACY) } private fun updateUIShowStatus(taskType: Int, currentStatus: Int, order: OrderDetail?) { From 0b17fd5ca39ce8245a1ac60cd856aa8aec49a3ef Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 23 Aug 2023 15:37:11 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[6.0.0]=20[shuttle]=20[=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driver}/.gitignore | 0 .../driver}/build.gradle | 0 .../driver}/consumer-rules.pro | 0 .../driver}/gradle.properties | 0 .../driver}/proguard-rules.pro | 0 .../driver}/src/main/AndroidManifest.xml | 0 .../src/main/java/com/mogo/och/bus/BusProvider.java | 0 .../src/main/java/com/mogo/och/bus/IMogoOCH.java | 0 .../com/mogo/och/bus/bean/BusCloseTaskRequest.java | 0 .../och/bus/bean/BusOperationStatusRequest.java | 0 .../java/com/mogo/och/bus/bean/BusOrderBean.java | 0 .../com/mogo/och/bus/bean/BusOrdersResponse.java | 0 .../och/bus/bean/BusQueryLineStationsRequest.java | 0 .../mogo/och/bus/bean/BusQueryLineTaskResponse.java | 0 .../mogo/och/bus/bean/BusQueryLinesResponse.java | 0 .../bean/BusQueryWriteOffPassengersResponse.java | 0 .../och/bus/bean/BusResetDrivingLineRequest.java | 0 .../och/bus/bean/BusResetLineStatusRequest.java | 0 .../och/bus/bean/BusRoutePlanningUpdateReqBean.java | 0 .../com/mogo/och/bus/bean/BusRoutesResponse.java | 0 .../och/bus/bean/BusUpdateSiteStatusRequest.java | 0 .../bus/bean/BusWriteOffPassengersQueryRequest.java | 0 .../com/mogo/och/bus/bean/CarHeartbeatReqBean.java | 0 .../bus/bean/QueryLeaveAwayPassengersRequest.java | 0 .../bus/bean/QueryLeaveAwayPassengersResponse.java | 0 .../com/mogo/och/bus/bean/WriteOffPassenger.java | 0 .../och/bus/callback/IBusADASStatusCallback.java | 0 .../bus/callback/IBusControllerStatusCallback.java | 0 .../mogo/och/bus/callback/IBusLinesCallback.java | 0 .../mogo/och/bus/callback/IPassengerCallback.java | 0 .../bus/callback/IRefreshBusStationsCallback.java | 0 .../och/bus/callback/ISlidePannelHideCallback.java | 0 .../main/java/com/mogo/och/bus/constant/BusConst.kt | 0 .../mogo/och/bus/fragment/BaseBusTabFragment.java | 0 .../java/com/mogo/och/bus/fragment/BusFragment.java | 0 .../java/com/mogo/och/bus/model/BusLineModel.java | 0 .../java/com/mogo/och/bus/model/OrderModel.java | 0 .../java/com/mogo/och/bus/net/IBascApiService.java | 0 .../com/mogo/och/bus/net/OrderServiceManager.kt | 0 .../java/com/mogo/och/bus/net/login/LoginBusImpl.kt | 0 .../och/bus/net/login/OchCommonServiceManager.kt | 0 .../mogo/och/bus/net/login/OchLoginServiceApi.java | 0 .../mogo/och/bus/presenter/BusLinePresenter.java | 0 .../mogo/och/bus/presenter/BusModelLoopManager.java | 0 .../com/mogo/och/bus/presenter/BusPresenter.java | 0 .../och/bus/receiver/TestBusBroadcastReceiver.java | 0 .../com/mogo/och/bus/ui/BusStationCommonItem.kt | 0 .../com/mogo/och/bus/ui/BusSwitchLineActivity.kt | 0 .../java/com/mogo/och/bus/ui/BusSwitchLineView.java | 0 .../mogo/och/bus/ui/adapter/OpenItemAnimator.java | 0 .../mogo/och/bus/ui/adapter/SwitchLineAdapter.kt | 0 .../och/bus/ui/adapter/SwitchLineTaskAdapter.kt | 0 .../com/mogo/och/bus/util/BDRouteDataTestUtils.java | 0 .../com/mogo/och/bus/util/BusAnalyticsManager.java | 0 .../com/mogo/och/bus/util/BusSendTripInfoManager.kt | 0 .../com/mogo/och/bus/util/BusTrajectoryManager.java | 0 .../main/java/com/mogo/och/bus/view/BusArcView.java | 0 .../mogo/och/bus/view/NoTouchConstraintLayout.java | 0 .../java/com/mogo/och/bus/view/SlidePanelView.java | 0 .../com/mogo/och/bus/view/VerticalDashLineView.java | 0 .../res/color/bus_autopilot_text_color_selector.xml | 0 .../drawable-xhdpi/bus_base_icon_in_autopilot.png | Bin .../bus_base_icon_not_in_autopilot.png | Bin .../res/drawable-xhdpi/bus_base_notice_box_bg.9.png | Bin .../res/drawable-xhdpi/bus_base_slide_block.png | Bin .../drawable-xhdpi/bus_disable_autopilot_icon.png | Bin .../src/main/res/drawable-xhdpi/bus_dot_line.png | Bin .../main/res/drawable-xhdpi/bus_ic_autopilot.png | Bin .../res/drawable-xhdpi/bus_icon_arrived_station.png | Bin .../drawable-xhdpi/bus_icon_arriving_station.png | Bin .../drawable-xhdpi/bus_icon_not_arrive_station.png | Bin .../res/drawable-xhdpi}/bus_light_green_nor.png | Bin .../main/res/drawable-xhdpi}/bus_light_red_nor.png | Bin .../res/drawable-xhdpi}/bus_lightyellow_nor.png | Bin .../main/res/drawable-xhdpi/bus_line_panel_bg.png | Bin .../main/res/drawable-xhdpi/bus_line_panel_bg_1.png | Bin .../main/res/drawable-xhdpi/bus_line_task_arrow.png | Bin .../drawable-xhdpi/bus_loading_autopilot_icon.png | Bin .../main/res/drawable-xhdpi/bus_no_line_icon.png | Bin .../main/res/drawable-xhdpi/bus_och_dot_line.png | Bin .../res/drawable-xhdpi/bus_operation_status_bg.png | Bin .../bus_operation_status_select_bg.png | Bin .../res/drawable-xhdpi/bus_right_autopilot_icon.png | Bin .../main/res/drawable-xhdpi/bus_selected_btn.png | Bin .../main/res/drawable-xhdpi/bus_setting_btn_bg.png | Bin .../res/drawable-xhdpi/bus_switch_line_close.png | Bin .../main/res/drawable-xhdpi/bus_switch_map_long.png | Bin .../res/drawable-xhdpi/bus_switch_map_medium.png | Bin .../main/res/drawable-xhdpi/bus_unselect_btn.png | Bin .../res/drawable-xhdpi/bus_wrong_autopilot_icon.png | Bin .../src/main/res/drawable-xhdpi/end_maker_icon.png | Bin .../src/main/res/drawable-xhdpi/icon_ai_collect.png | Bin .../src/main/res/drawable-xhdpi/icon_ai_normal.png | Bin .../src/main/res/drawable-xhdpi/icon_ai_select.png | Bin .../main/res/drawable-xhdpi/icon_arrow_blue_bus.png | Bin .../res/drawable-xhdpi/icon_arrow_green_bus.png | Bin .../main/res/drawable-xhdpi/icon_arrow_grey_bus.png | Bin .../src/main/res/drawable-xhdpi/icon_bad_case.png | Bin .../res/drawable-xhdpi/icon_bad_case_normal.png | Bin .../res/drawable-xhdpi/icon_bad_case_select.png | Bin .../main/res/drawable-xhdpi/icon_no_bus_line.png | Bin .../main/res/drawable-xhdpi/icon_point_blue_bus.png | Bin .../res/drawable-xhdpi/icon_point_green_bus.png | Bin .../main/res/drawable-xhdpi/icon_point_grey_bus.png | Bin .../res/drawable-xhdpi/icon_station_start_end.png | Bin .../src/main/res/drawable-xhdpi/no_order_data.png | Bin .../src/main/res/drawable-xhdpi/pingxingjiashi.png | Bin .../main/res/drawable-xhdpi/press_start_status.png | Bin .../src/main/res/drawable-xhdpi/start_failure.png | Bin .../main/res/drawable-xhdpi/start_maker_icon.png | Bin .../src/main/res/drawable-xhdpi/start_success.png | Bin .../src/main/res/drawable/ai_collect_selector.xml | 0 .../src/main/res/drawable/bad_case_selector.xml | 0 .../drawable/bg_bus_traffic_light_background.xml | 0 .../res/drawable/bus_autopilot_0_1_status_bg.xml | 0 .../main/res/drawable/bus_autopilot_2_status_bg.xml | 0 .../res/drawable/bus_autopilot_status_bg_check.png | Bin .../res/drawable/bus_autopilot_status_bg_nor.png | Bin .../bus_base_autopilot_status_icon_selector.xml | 0 .../res/drawable/bus_base_icon_in_autopilot.png | Bin .../res/drawable/bus_base_icon_not_in_autopilot.png | Bin .../main/res/drawable/bus_base_notice_box_bg.9.png | Bin .../src/main/res/drawable/bus_base_slide_block.png | Bin .../src/main/res/drawable/bus_checkbox_selector.xml | 0 .../res/drawable/bus_disable_autopilot_icon.png | Bin .../driver}/src/main/res/drawable/bus_dot_line.png | Bin .../src/main/res/drawable/bus_ic_autopilot.png | Bin .../main/res/drawable/bus_icon_arrived_station.png | Bin .../main/res/drawable/bus_icon_arriving_station.png | Bin .../res/drawable/bus_icon_not_arrive_station.png | Bin .../src/main}/res/drawable/bus_light_green_nor.png | Bin .../src/main}/res/drawable/bus_light_red_nor.png | Bin .../src/main}/res/drawable/bus_lightyellow_nor.png | Bin .../drawable/bus_line_dividing_line1_selector.xml | 0 .../drawable/bus_line_dividing_line2_selector.xml | 0 .../src/main/res/drawable/bus_line_panel_bg.png | Bin .../src/main/res/drawable/bus_line_panel_bg_1.png | Bin .../res/drawable/bus_loading_autopilot_icon.png | Bin .../src/main/res/drawable/bus_och_dot_line.png | Bin .../drawable/bus_operation_status_bg_selector.xml | 0 .../src/main/res/drawable/bus_panel_anchor_bkg.xml | 0 .../driver}/src/main/res/drawable/bus_panel_bkg.xml | 0 .../main/res/drawable/bus_right_autopilot_icon.png | Bin .../src/main/res/drawable/bus_selected_btn.png | Bin .../src/main/res/drawable/bus_setting_btn_bg.png | Bin .../res/drawable/bus_setting_tip_red_cir_bg.xml | 0 .../bus_shape_select_line_item_bg_normal.xml | 0 .../bus_shape_select_line_item_bg_selected.xml | 0 .../drawable/bus_shape_select_line_item_time_bg.xml | 0 .../bus_shape_select_line_item_time_bg_selected.xml | 0 .../res/drawable/bus_station_green_dash_line.xml | 0 .../main/res/drawable/bus_station_v_green_dash.xml | 0 .../src/main/res/drawable/bus_switch_line_btn.xml | 0 .../res/drawable/bus_switch_line_btn_commit.xml | 0 .../src/main/res/drawable/bus_switch_line_close.png | Bin .../src/main/res/drawable/bus_switch_map_bg.xml | 0 .../src/main/res/drawable/bus_switch_map_long.png | Bin .../src/main/res/drawable/bus_switch_map_medium.png | Bin .../src/main/res/drawable/bus_task_time_bg.xml | 0 .../src/main/res/drawable/bus_unselect_btn.png | Bin .../main/res/drawable/bus_wrong_autopilot_icon.png | Bin .../main/res/drawable/bus_yi_biao_pan_bg_nor.xml | 0 .../res/drawable/bus_yi_biao_pan_bg_speeding.xml | 0 .../src/main/res/drawable/end_maker_icon.png | Bin .../src/main/res/drawable/icon_ai_normal.png | Bin .../src/main/res/drawable/icon_ai_select.png | Bin .../src/main/res/drawable/icon_arrow_blue_bus.png | Bin .../src/main/res/drawable/icon_arrow_green_bus.png | Bin .../src/main/res/drawable/icon_arrow_grey_bus.png | Bin .../src/main/res/drawable/icon_bad_case_normal.png | Bin .../src/main/res/drawable/icon_bad_case_select.png | Bin .../src/main/res/drawable/icon_no_bus_line.png | Bin .../src/main/res/drawable/icon_point_blue_bus.png | Bin .../src/main/res/drawable/icon_point_green_bus.png | Bin .../src/main/res/drawable/icon_point_grey_bus.png | Bin .../main/res/drawable/icon_station_start_end.png | Bin .../driver}/src/main/res/drawable/no_order_data.png | Bin .../src/main/res/drawable/press_start_status.png | Bin .../driver}/src/main/res/drawable/start_failure.png | Bin .../src/main/res/drawable/start_maker_icon.png | Bin .../driver}/src/main/res/drawable/start_success.png | Bin .../main/res/layout/activity_bus_switch_line.xml | 0 .../src/main/res/layout/bus_base_fragment.xml | 0 .../src/main/res/layout/bus_no_data_common_view.xml | 0 .../src/main/res/layout/bus_no_line_view.xml | 0 .../main/res/layout/bus_stations_common_item.xml | 0 .../main/res/layout/bus_switch_line_list_item.xml | 0 .../res/layout/bus_switch_line_list_task_item.xml | 0 .../src/main/res/layout/bus_test_bar_view.xml | 0 .../src/main/res/layout/fragment_och_bus.xml | 0 .../src/main/res/raw/bus_away_passengers.json | 0 .../driver}/src/main/res/raw/bus_di.mp3 | Bin .../driver}/src/main/res/raw/bus_order_1.json | 0 .../driver}/src/main/res/raw/bus_station_list1.json | 0 .../driver}/src/main/res/raw/bus_station_list2.json | 0 .../driver}/src/main/res/raw/end_marker.nt3d | Bin .../driver}/src/main/res/raw/star_marker.nt3d | Bin .../driver}/src/main/res/values/attrs.xml | 0 .../driver}/src/main/res/values/colors.xml | 0 .../driver}/src/main/res/values/dimens.xml | 0 .../driver}/src/main/res/values/strings.xml | 0 .../driver}/src/main/res/values/style.xml | 0 .../res/xml/bus_switch_line_list_item_scene.xml | 0 .../passenger}/.gitignore | 0 .../passenger}/README.md | 0 .../passenger}/build.gradle | 0 .../passenger}/consumer-rules.pro | 0 .../passenger}/gradle.properties | 0 .../passenger}/proguard-rules.pro | 0 .../och/bus/passenger/ExampleInstrumentedTest.java | 0 .../mogo/och/bus/passenger/MogoOCHBusPassenger.java | 0 .../adapter/BusPassengerLineStationsAdapter.java | 0 .../bean/BusPassengerOperationStatusResponse.java | 0 .../bean/BusPassengerQueryLineRequest.java | 0 .../passenger/bean/BusPassengerRoutesResponse.java | 0 .../passenger/bean/BusPassengerRoutesResult.java | 0 .../och/bus/passenger/bean/BusPassengerStation.java | 0 .../callback/IBusPassegerDriverStatusCallback.java | 0 .../callback/IBusPassengerADASStatusCallback.java | 0 .../IBusPassengerAutopilotPlanningCallback.java | 0 .../IBusPassengerControllerStatusCallback.java | 0 .../callback/IBusPassengerMapViewCallback.java | 0 .../IBusPassengerRouteLineInfoCallback.java | 0 .../och/bus/passenger/model/BusPassengerModel.java | 0 .../network/BusPassengerModelLoopManager.java | 0 .../passenger/network/BusPassengerServiceManager.kt | 0 .../network/ShettlePassengerServiceApi.java | 0 .../presenter/BaseBusPassengerPresenter.java | 0 .../bus/passenger/provider/B1StatusViewManager.java | 0 .../mogo/och/bus/passenger/ui/BusPBlueToothView.kt | 0 .../mogo/och/bus/passenger/ui/BusPStatusBarView.kt | 0 .../bus/passenger/ui/BusPassengerBaseFragment.java | 0 .../passenger/ui/BusPassengerMapDirectionView.java | 0 .../bus/passenger/ui/BusPassengerRouteFragment.java | 0 .../passenger/ui/BusPassengerTrafficLightView.kt | 0 .../passenger/ui/IBusPassengerMapDirectionView.java | 0 .../ui/layoutmanager/CenterLayoutManager.java | 0 .../bus/passenger/ui/widget/BusPTurnLightView.kt | 0 .../bus/passenger/utils/BPRouteDataTestUtils.java | 0 .../src/jinlvvan/res/drawable-nodpi/auto_close.png | Bin .../src/jinlvvan/res/drawable-nodpi/auto_open.png | Bin .../res/drawable-nodpi/bg_bus_p_arrived_station.png | Bin .../res/drawable-nodpi/bg_bus_p_end_tag_bg.png | Bin .../res/drawable-nodpi/bg_bus_p_start_tag_bg.png | Bin .../jinlvvan/res/drawable-nodpi/bus_line_logo.png | Bin .../res/drawable-nodpi/bus_p_arrive_line_blue.png | Bin .../res/drawable-nodpi/bus_p_arrive_line_green.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png | Bin .../res/drawable-nodpi/bus_p_blue_tooth_close.png | Bin .../res/drawable-nodpi/bus_p_blue_tooth_open.png | Bin .../res/drawable-nodpi/bus_p_light_green_nor.png | Bin .../res/drawable-nodpi/bus_p_light_red_nor.png | Bin .../res/drawable-nodpi/bus_p_light_yellow_nor.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_line_blue.png | Bin .../res/drawable-nodpi/bus_p_line_green.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_line_grey.png | Bin .../res/drawable-nodpi/bus_p_map_arrived_point.png | Bin .../res/drawable-nodpi/bus_p_map_arrow_arrived.png | Bin .../drawable-nodpi/bus_p_map_arrow_un_arrive.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_map_car.png | Bin .../res/drawable-nodpi/bus_p_map_end_point.png | Bin .../res/drawable-nodpi/bus_p_map_start_point.png | Bin .../drawable-nodpi/bus_p_map_unarrived_point.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png | Bin .../res/drawable-nodpi/bus_p_no_order_data.png | Bin .../res/drawable-nodpi/bus_p_point_blue.png | Bin .../res/drawable-nodpi/bus_p_point_gray.png | Bin .../res/drawable-nodpi/bus_p_right_route_bg.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_route_bg.png | Bin .../res/drawable-nodpi/bus_p_status_bar_logo.png | Bin .../res/drawable-nodpi/bus_p_un_auto_nor.png | Bin .../res/drawable-nodpi/bus_p_youzhuan_open.png | Bin .../res/drawable-nodpi/bus_p_youzhuan_un_open.png | Bin .../res/drawable-nodpi/bus_p_zuozhuan_open.png | Bin .../res/drawable-nodpi/bus_p_zuozhuan_un_open.png | Bin .../res/drawable-nodpi/card_split_line_bg.png | Bin .../res/drawable-nodpi/cur_station_arrived_bg.png | Bin .../drawable-nodpi/cur_station_un_arrived_bg.png | Bin .../res/drawable-nodpi/m2_blue_tooth_open.png | Bin .../res/drawable-nodpi/route_line_name_bg.png | Bin .../res/drawable-nodpi/speak_arrived_icon_0.png | Bin .../res/drawable-nodpi/speak_arrived_icon_1.png | Bin .../res/drawable-nodpi/speak_arrived_icon_2.png | Bin .../jinlvvan/res/drawable-nodpi/station_arrow.png | Bin .../res/drawable/bg_bus_p_end_station_circle.xml | 0 .../res/drawable/bg_bus_p_middle_station_circle.xml | 0 .../res/drawable/bg_bus_p_start_station_circle.xml | 0 .../drawable/bg_bus_p_traffic_light_background.xml | 0 .../res/drawable/bg_p_speak_icon_arrived.xml | 0 .../src/jinlvvan/res/drawable/bg_status_bar.xml | 0 .../res/drawable/brakelight_background_daytime.xml | 0 .../res/drawable/bus_p_dividing_line_bg.xml | 0 .../res/drawable/bus_p_panel_cur_station_panel.xml | 0 .../jinlvvan/res/drawable/bus_progress_bar_bg.xml | 0 .../res/drawable/iv_roma_bus_passenger_bg.png | Bin .../res/drawable/iv_roma_bus_passenger_press_bg.png | Bin .../jinlvvan/res/drawable/progress_item_round.xml | 0 .../res/drawable/roma_bus_p_bg_selector.xml | 0 .../src/jinlvvan/res/layout/bus_p_base_fragment.xml | 0 .../src/jinlvvan/res/layout/bus_p_map_view.xml | 0 .../res/layout/bus_p_no_data_common_view.xml | 0 .../jinlvvan/res/layout/bus_p_route_fragment.xml | 0 .../res/layout/bus_p_stations_common_item.xml | 0 .../res/layout/bus_p_traffic_light_view.xml | 0 .../jinlvvan/res/layout/p_bus_view_blue_tooth.xml | 0 .../jinlvvan/res/layout/p_bus_view_status_bar.xml | 0 .../src/jinlvvan/res/layout/view_roma_busp_bg.xml | 0 .../res/layout/view_turn_light_status_daytime.xml | 0 .../passenger}/src/jinlvvan/res/values/colors.xml | 0 .../passenger}/src/jinlvvan/res/values/dimens.xml | 0 .../passenger}/src/jinlvvan/res/values/strings.xml | 0 .../passenger}/src/m2/AndroidManifest.xml | 0 .../passenger}/src/m2/assets/m2_map_style.data | Bin .../src/m2/assets/m2_map_style_extra.data | Bin .../src/m2/java/BPRouteDataTestUtils.java | 0 .../com/mogo/och/bus/passenger/BusPassengerM2.kt | 0 .../passenger/bean/PM2OperationStatusResponse.java | 0 .../och/bus/passenger/bean/PM2QueryLineRequest.java | 0 .../och/bus/passenger/bean/PM2RoutesResponse.java | 0 .../och/bus/passenger/bean/PM2RoutesResult.java | 0 .../com/mogo/och/bus/passenger/bean/PM2Station.java | 0 .../mogo/och/bus/passenger/callback/ADASCallback.kt | 0 .../passenger/callback/AutoPilotStatusCallback.kt | 0 .../bus/passenger/callback/DrivingInfoCallback.kt | 0 .../com/mogo/och/bus/passenger/constant/M2Const.kt | 0 .../mogo/och/bus/passenger/model/PM2ADASModel.kt | 0 .../mogo/och/bus/passenger/model/PM2DrivingModel.kt | 0 .../och/bus/passenger/model/PM2ServiceManager.kt | 0 .../bus/passenger/network/PM2ModelLoopManager.kt | 0 .../och/bus/passenger/network/PM2ServiceApi.java | 0 .../och/bus/passenger/presenter/PM2ADASPresenter.kt | 0 .../bus/passenger/presenter/PM2DrivingPresenter.kt | 0 .../och/bus/passenger/presenter/PM2Presenter.kt | 0 .../bus/passenger/presenter/PM2VideoPresenter.kt | 0 .../bus/passenger/provider/M2StatusViewManager.java | 0 .../mogo/och/bus/passenger/ui/PM2BaseFragment.kt | 0 .../och/bus/passenger/ui/PM2DrivingInfoFragment.kt | 0 .../mogo/och/bus/passenger/ui/PM2HPMapFragment.kt | 0 .../och/bus/passenger/ui/video/PM2VideoFragment.kt | 0 .../och/bus/passenger/ui/widget/M2BlueToothView.kt | 0 .../bus/passenger/ui/widget/M2PTrafficLightView.kt | 0 .../och/bus/passenger/ui/widget/M2StatusBarView.kt | 0 .../och/bus/passenger/ui/widget/M2TurnLightView.kt | 0 .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 0 .../passenger/ui/widget/video/AdvanceImageView.kt | 0 .../ui/widget/video/AdvancePagerAdapter.kt | 0 .../passenger/ui/widget/video/AdvanceVideoView.kt | 0 .../passenger/ui/widget/video/AdvanceViewPager.kt | 0 .../ui/widget/video/ImageAndVideoRotation.kt | 0 .../m2/res/drawable-nodpi/amap_custom_corner_m2.png | Bin .../src/m2/res/drawable-nodpi/auto_button_bg.png | Bin .../m2/res/drawable-nodpi/bg_driving_info_image.png | Bin .../m2/res/drawable-nodpi}/bus_light_green_nor.png | Bin .../m2/res/drawable-nodpi}/bus_light_red_nor.png | Bin .../m2/res/drawable-nodpi}/bus_lightyellow_nor.png | Bin .../src/m2/res/drawable-nodpi/clock_bg.png | Bin .../src/m2/res/drawable-nodpi/img_drive_bg.png | Bin .../src/m2/res/drawable-nodpi/img_line_bg.png | Bin .../src/m2/res/drawable-nodpi/img_time_bg.png | Bin .../m2/res/drawable-nodpi/m2_amap_arrived_road.png | Bin .../m2/res/drawable-nodpi/m2_amap_arriving_road.png | Bin .../src/m2/res/drawable-nodpi/m2_arrived_an_0.png | Bin .../src/m2/res/drawable-nodpi/m2_arrived_an_1.png | Bin .../src/m2/res/drawable-nodpi/m2_arrived_an_2.png | Bin .../m2/res/drawable-nodpi/m2_blue_tooth_close.png | Bin .../m2/res/drawable-nodpi/m2_blue_tooth_open.png | Bin .../src/m2/res/drawable-nodpi/m2_bottom_bg.png | Bin .../m2/res/drawable-nodpi/m2_light_green_nor.png | Bin .../src/m2/res/drawable-nodpi/m2_light_red_nor.png | Bin .../m2/res/drawable-nodpi/m2_light_yellow_nor.png | Bin .../m2/res/drawable-nodpi/m2_line_location_bg.png | Bin .../src/m2/res/drawable-nodpi/m2_map_car_icon.png | Bin .../src/m2/res/drawable-nodpi/m2_map_end_icon.png | Bin .../src/m2/res/drawable-nodpi/m2_map_start_icon.png | Bin .../drawable-nodpi/m2_map_staton_arrived_icon.png | Bin .../m2/res/drawable-nodpi/m2_map_staton_icon.png | Bin .../src/m2/res/drawable-nodpi/m2_p_video_holder.png | Bin .../src/m2/res/drawable-nodpi/m2_sky_bg.png | Bin .../m2/res/drawable-nodpi/m2_status_bar_logo.png | Bin .../m2/res/drawable-nodpi/m2_video_bottom_left.png | Bin .../m2/res/drawable-nodpi/m2_video_bottom_right.png | Bin .../src/m2/res/drawable-nodpi/m2_video_top_left.png | Bin .../m2/res/drawable-nodpi/m2_video_top_right.png | Bin .../src/m2/res/drawable-nodpi/m2_youzhuan_open.png | Bin .../m2/res/drawable-nodpi/m2_youzhuan_un_open.png | Bin .../src/m2/res/drawable-nodpi/m2_zuozhuan_open.png | Bin .../m2/res/drawable-nodpi/m2_zuozhuan_un_open.png | Bin .../m2/res/drawable-nodpi/shuttle_p_card_split.png | Bin .../m2/res/drawable-nodpi/shuttle_p_line_name.png | Bin .../res/drawable-nodpi/shuttle_p_line_noselect.png | Bin .../m2/res/drawable-nodpi/shuttle_p_line_tile.png | Bin .../src/m2/res/drawable/bg_dashed_line.xml | 0 .../m2/res/drawable/bg_driving_arrived_notice.xml | 0 .../res/drawable/bg_driving_distance_lefttime.xml | 0 .../src/m2/res/drawable/bg_driving_info.xml | 0 .../src/m2/res/drawable/bg_driving_selector.xml | 0 .../src/m2/res/drawable/bg_p_m2_arrived_station.xml | 0 .../passenger}/src/m2/res/drawable/bg_p_m2_auto.xml | 0 .../src/m2/res/drawable/bg_p_m2_traffic_light.xml | 0 .../passenger}/src/m2/res/drawable/bg_pnc.xml | 0 .../res/drawable/brakelight_background_daytime.xml | 0 .../src/m2}/res/drawable/bus_light_green_nor.png | Bin .../src/m2}/res/drawable/bus_light_red_nor.png | Bin .../src/m2}/res/drawable/bus_lightyellow_nor.png | Bin .../src/m2/res/drawable/m2_power_seekbar_style.xml | 0 .../src/m2/res/layout/m2_p_traffic_light_view.xml | 0 .../m2/res/layout/p_m2_driving_info_fragment.xml | 0 .../passenger}/src/m2/res/layout/p_m2_fragment.xml | 0 .../src/m2/res/layout/p_m2_hpmap_fragment.xml | 0 .../src/m2/res/layout/p_m2_video_fragment.xml | 0 .../src/m2/res/layout/p_m2_video_view.xml | 0 .../src/m2/res/layout/p_m2_view_blue_tooth.xml | 0 .../src/m2/res/layout/p_m2_view_status_bar.xml | 0 .../res/layout/view_turn_light_status_daytime.xml | 0 .../passenger}/src/m2/res/raw/station_marker.nt3d | Bin .../passenger}/src/m2/res/values/colors.xml | 0 .../passenger}/src/m2/res/values/dimens.xml | 0 .../passenger}/src/m2/res/values/strings.xml | 0 .../passenger}/src/main/AndroidManifest.xml | 0 .../passenger}/src/main/assets/map_style.data | Bin .../passenger}/src/main/assets/map_style_extra.data | Bin .../java/com/mogo/och/bus/passenger/IMogoOCH.java | 0 .../och/bus/passenger/constant/BusPassengerConst.kt | 0 .../utils/BusPassengerMapAssetStyleUtil.java | 0 .../com/mogo/och/bus/passenger/utils/DimenUtil.kt | 0 .../passenger}/src/main/res/raw/bus_di.mp3 | Bin .../com/mogo/och/bus/passenger/ExampleUnitTest.java | 0 app/script/functions/och.gradle | 8 ++++---- settings.gradle | 4 ++-- 430 files changed, 6 insertions(+), 6 deletions(-) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/.gitignore (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/build.gradle (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/consumer-rules.pro (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/gradle.properties (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/proguard-rules.pro (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/AndroidManifest.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/BusProvider.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/IMogoOCH.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/constant/BusConst.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/fragment/BusFragment.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/model/BusLineModel.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/model/OrderModel.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/IBascApiService.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/BusArcView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/SlidePanelView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/color/bus_autopilot_text_color_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_slide_block.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_ic_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi => shuttle/driver/src/main/res/drawable-xhdpi}/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi => shuttle/driver/src/main/res/drawable-xhdpi}/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi => shuttle/driver/src/main/res/drawable-xhdpi}/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_line_panel_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_line_task_arrow.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_no_line_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_och_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_operation_status_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_selected_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_switch_line_close.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_switch_map_long.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_switch_map_medium.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_unselect_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/end_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_ai_collect.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_ai_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_ai_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_bad_case.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_bad_case_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_bad_case_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_no_bus_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_point_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_point_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_point_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_station_start_end.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/no_order_data.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/pingxingjiashi.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/press_start_status.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/start_failure.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/start_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/start_success.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/ai_collect_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bad_case_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bg_bus_traffic_light_background.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_2_status_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_status_bg_check.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_status_bg_nor.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_icon_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_icon_not_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_notice_box_bg.9.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_slide_block.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_checkbox_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_disable_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_ic_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_icon_arrived_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_icon_arriving_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_icon_not_arrive_station.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2 => shuttle/driver/src/main}/res/drawable/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2 => shuttle/driver/src/main}/res/drawable/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2 => shuttle/driver/src/main}/res/drawable/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_dividing_line1_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_dividing_line2_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_panel_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_panel_bg_1.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_loading_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_och_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_operation_status_bg_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_panel_anchor_bkg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_panel_bkg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_right_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_selected_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_setting_btn_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_station_green_dash_line.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_station_v_green_dash.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_line_btn.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_line_btn_commit.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_line_close.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_map_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_map_long.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_map_medium.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_task_time_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_unselect_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_wrong_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/end_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_ai_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_ai_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_arrow_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_arrow_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_arrow_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_bad_case_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_bad_case_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_no_bus_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_point_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_point_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_point_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_station_start_end.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/no_order_data.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/press_start_status.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/start_failure.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/start_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/start_success.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/activity_bus_switch_line.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_base_fragment.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_no_data_common_view.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_no_line_view.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_stations_common_item.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_switch_line_list_item.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_switch_line_list_task_item.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_test_bar_view.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/fragment_och_bus.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_away_passengers.json (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/src/main/res/raw/bus_di.mp3 (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_order_1.json (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_station_list1.json (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_station_list2.json (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/end_marker.nt3d (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/star_marker.nt3d (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/attrs.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/colors.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/dimens.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/strings.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/style.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/xml/bus_switch_line_list_item_scene.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/.gitignore (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/README.md (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/build.gradle (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/consumer-rules.pro (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/gradle.properties (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/proguard-rules.pro (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/auto_close.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/auto_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/station_arrow.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_status_bar.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/brakelight_background_daytime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/progress_item_round.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_base_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_map_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_route_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_stations_common_item.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/p_bus_view_status_bar.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/view_roma_busp_bg.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/values/colors.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/values/dimens.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/values/strings.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/AndroidManifest.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/assets/m2_map_style.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/assets/m2_map_style_extra.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/BPRouteDataTestUtils.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/auto_button_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/bg_driving_info_image.png (100%) rename OCH/{mogo-och-shuttle/src/main/res/drawable-xhdpi => shuttle/passenger/src/m2/res/drawable-nodpi}/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main/res/drawable-xhdpi => shuttle/passenger/src/m2/res/drawable-nodpi}/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main/res/drawable-xhdpi => shuttle/passenger/src/m2/res/drawable-nodpi}/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/clock_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/img_drive_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/img_line_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/img_time_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_arrived_an_0.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_arrived_an_1.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_arrived_an_2.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_bottom_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_line_location_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_car_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_end_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_start_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_staton_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_p_video_holder.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_sky_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_status_bar_logo.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_bottom_left.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_bottom_right.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_top_left.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_top_right.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_youzhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_card_split.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_line_name.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_dashed_line.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_arrived_notice.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_distance_lefttime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_info.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_selector.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_p_m2_arrived_station.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_p_m2_auto.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_p_m2_traffic_light.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_pnc.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/brakelight_background_daytime.xml (100%) rename OCH/{mogo-och-shuttle/src/main => shuttle/passenger/src/m2}/res/drawable/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main => shuttle/passenger/src/m2}/res/drawable/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main => shuttle/passenger/src/m2}/res/drawable/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/m2_power_seekbar_style.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/m2_p_traffic_light_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_driving_info_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_hpmap_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_video_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_video_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_view_blue_tooth.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_view_status_bar.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/view_turn_light_status_daytime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/raw/station_marker.nt3d (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/values/colors.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/values/dimens.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/values/strings.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/AndroidManifest.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/assets/map_style.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/assets/map_style_extra.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/src/main/res/raw/bus_di.mp3 (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java (100%) diff --git a/OCH/mogo-och-shuttle-passenger/.gitignore b/OCH/shuttle/driver/.gitignore similarity index 100% rename from OCH/mogo-och-shuttle-passenger/.gitignore rename to OCH/shuttle/driver/.gitignore diff --git a/OCH/mogo-och-shuttle/build.gradle b/OCH/shuttle/driver/build.gradle similarity index 100% rename from OCH/mogo-och-shuttle/build.gradle rename to OCH/shuttle/driver/build.gradle diff --git a/OCH/mogo-och-shuttle-passenger/consumer-rules.pro b/OCH/shuttle/driver/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle-passenger/consumer-rules.pro rename to OCH/shuttle/driver/consumer-rules.pro diff --git a/OCH/mogo-och-shuttle/gradle.properties b/OCH/shuttle/driver/gradle.properties similarity index 100% rename from OCH/mogo-och-shuttle/gradle.properties rename to OCH/shuttle/driver/gradle.properties diff --git a/OCH/mogo-och-shuttle-passenger/proguard-rules.pro b/OCH/shuttle/driver/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle-passenger/proguard-rules.pro rename to OCH/shuttle/driver/proguard-rules.pro diff --git a/OCH/mogo-och-shuttle/src/main/AndroidManifest.xml b/OCH/shuttle/driver/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/AndroidManifest.xml rename to OCH/shuttle/driver/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/BusProvider.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/IMogoOCH.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/IMogoOCH.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/IMogoOCH.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/constant/BusConst.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/BusLineModel.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/IBascApiService.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/IBascApiService.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/BusArcView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/BusArcView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/SlidePanelView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java diff --git a/OCH/mogo-och-shuttle/src/main/res/color/bus_autopilot_text_color_selector.xml b/OCH/shuttle/driver/src/main/res/color/bus_autopilot_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/color/bus_autopilot_text_color_selector.xml rename to OCH/shuttle/driver/src/main/res/color/bus_autopilot_text_color_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_slide_block.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_slide_block.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_ic_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_ic_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_task_arrow.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_task_arrow.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_no_line_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_no_line_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_och_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_och_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_selected_btn.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_selected_btn.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_line_close.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_line_close.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_long.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_long.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_medium.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_medium.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_unselect_btn.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_unselect_btn.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/end_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/end_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_collect.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_collect.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_normal.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_select.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_normal.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_select.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_no_bus_line.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_no_bus_line.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/no_order_data.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/no_order_data.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/no_order_data.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/pingxingjiashi.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/pingxingjiashi.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/press_start_status.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/press_start_status.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/press_start_status.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_failure.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_failure.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_failure.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_failure.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_success.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_success.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_success.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_success.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/ai_collect_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/ai_collect_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/ai_collect_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/ai_collect_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bad_case_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bad_case_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bad_case_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bad_case_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bg_bus_traffic_light_background.xml b/OCH/shuttle/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bg_bus_traffic_light_background.xml rename to OCH/shuttle/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_2_status_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_2_status_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_check.png b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_check.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_not_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_not_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_notice_box_bg.9.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_notice_box_bg.9.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_slide_block.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_slide_block.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_slide_block.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_checkbox_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_checkbox_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_checkbox_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_checkbox_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_disable_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_disable_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_ic_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_ic_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_ic_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arrived_station.png b/OCH/shuttle/driver/src/main/res/drawable/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arrived_station.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arriving_station.png b/OCH/shuttle/driver/src/main/res/drawable/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arriving_station.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_not_arrive_station.png b/OCH/shuttle/driver/src/main/res/drawable/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_not_arrive_station.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_green_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_green_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_red_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_red_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_lightyellow_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_lightyellow_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line1_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line1_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line2_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line2_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg.png b/OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg_1.png b/OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg_1.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_loading_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_loading_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_och_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_och_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_och_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_operation_status_bg_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_operation_status_bg_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_anchor_bkg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_bkg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_panel_bkg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_bkg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_panel_bkg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_right_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_right_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_selected_btn.png b/OCH/shuttle/driver/src/main/res/drawable/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_selected_btn.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_selected_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_btn_bg.png b/OCH/shuttle/driver/src/main/res/drawable/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_btn_bg.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_green_dash_line.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_station_green_dash_line.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_green_dash_line.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_station_green_dash_line.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_v_green_dash.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_station_v_green_dash.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_v_green_dash.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_station_v_green_dash.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn_commit.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_close.png b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_close.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_close.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_long.png b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_long.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_long.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_medium.png b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_medium.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_medium.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_task_time_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_task_time_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_task_time_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_task_time_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_unselect_btn.png b/OCH/shuttle/driver/src/main/res/drawable/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_unselect_btn.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_unselect_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_wrong_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_wrong_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/end_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/end_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/end_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_normal.png b/OCH/shuttle/driver/src/main/res/drawable/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_normal.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_ai_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_select.png b/OCH/shuttle/driver/src/main/res/drawable/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_select.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_ai_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_normal.png b/OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_normal.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_select.png b/OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_select.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_no_bus_line.png b/OCH/shuttle/driver/src/main/res/drawable/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_no_bus_line.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_no_bus_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_point_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_point_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_point_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_station_start_end.png b/OCH/shuttle/driver/src/main/res/drawable/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_station_start_end.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_station_start_end.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/no_order_data.png b/OCH/shuttle/driver/src/main/res/drawable/no_order_data.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/no_order_data.png rename to OCH/shuttle/driver/src/main/res/drawable/no_order_data.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/press_start_status.png b/OCH/shuttle/driver/src/main/res/drawable/press_start_status.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/press_start_status.png rename to OCH/shuttle/driver/src/main/res/drawable/press_start_status.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/start_failure.png b/OCH/shuttle/driver/src/main/res/drawable/start_failure.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/start_failure.png rename to OCH/shuttle/driver/src/main/res/drawable/start_failure.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/start_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/start_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/start_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/start_success.png b/OCH/shuttle/driver/src/main/res/drawable/start_success.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/start_success.png rename to OCH/shuttle/driver/src/main/res/drawable/start_success.png diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/activity_bus_switch_line.xml b/OCH/shuttle/driver/src/main/res/layout/activity_bus_switch_line.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/activity_bus_switch_line.xml rename to OCH/shuttle/driver/src/main/res/layout/activity_bus_switch_line.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_base_fragment.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_no_data_common_view.xml b/OCH/shuttle/driver/src/main/res/layout/bus_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_no_data_common_view.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_no_data_common_view.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_no_line_view.xml b/OCH/shuttle/driver/src/main/res/layout/bus_no_line_view.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_no_line_view.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_no_line_view.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_stations_common_item.xml b/OCH/shuttle/driver/src/main/res/layout/bus_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_stations_common_item.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_stations_common_item.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_item.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_item.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_item.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_task_item.xml b/OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_task_item.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_task_item.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_task_item.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml b/OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/fragment_och_bus.xml b/OCH/shuttle/driver/src/main/res/layout/fragment_och_bus.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/fragment_och_bus.xml rename to OCH/shuttle/driver/src/main/res/layout/fragment_och_bus.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_away_passengers.json b/OCH/shuttle/driver/src/main/res/raw/bus_away_passengers.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_away_passengers.json rename to OCH/shuttle/driver/src/main/res/raw/bus_away_passengers.json diff --git a/OCH/mogo-och-shuttle-passenger/src/main/res/raw/bus_di.mp3 b/OCH/shuttle/driver/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/res/raw/bus_di.mp3 rename to OCH/shuttle/driver/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_order_1.json b/OCH/shuttle/driver/src/main/res/raw/bus_order_1.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_order_1.json rename to OCH/shuttle/driver/src/main/res/raw/bus_order_1.json diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list1.json b/OCH/shuttle/driver/src/main/res/raw/bus_station_list1.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list1.json rename to OCH/shuttle/driver/src/main/res/raw/bus_station_list1.json diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list2.json b/OCH/shuttle/driver/src/main/res/raw/bus_station_list2.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list2.json rename to OCH/shuttle/driver/src/main/res/raw/bus_station_list2.json diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/end_marker.nt3d b/OCH/shuttle/driver/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/end_marker.nt3d rename to OCH/shuttle/driver/src/main/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/star_marker.nt3d b/OCH/shuttle/driver/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/star_marker.nt3d rename to OCH/shuttle/driver/src/main/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-shuttle/src/main/res/values/attrs.xml b/OCH/shuttle/driver/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/attrs.xml rename to OCH/shuttle/driver/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/colors.xml b/OCH/shuttle/driver/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/colors.xml rename to OCH/shuttle/driver/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/dimens.xml b/OCH/shuttle/driver/src/main/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/dimens.xml rename to OCH/shuttle/driver/src/main/res/values/dimens.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/strings.xml b/OCH/shuttle/driver/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/strings.xml rename to OCH/shuttle/driver/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/style.xml b/OCH/shuttle/driver/src/main/res/values/style.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/style.xml rename to OCH/shuttle/driver/src/main/res/values/style.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/xml/bus_switch_line_list_item_scene.xml b/OCH/shuttle/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/xml/bus_switch_line_list_item_scene.xml rename to OCH/shuttle/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml diff --git a/OCH/mogo-och-shuttle/.gitignore b/OCH/shuttle/passenger/.gitignore similarity index 100% rename from OCH/mogo-och-shuttle/.gitignore rename to OCH/shuttle/passenger/.gitignore diff --git a/OCH/mogo-och-shuttle-passenger/README.md b/OCH/shuttle/passenger/README.md similarity index 100% rename from OCH/mogo-och-shuttle-passenger/README.md rename to OCH/shuttle/passenger/README.md diff --git a/OCH/mogo-och-shuttle-passenger/build.gradle b/OCH/shuttle/passenger/build.gradle similarity index 100% rename from OCH/mogo-och-shuttle-passenger/build.gradle rename to OCH/shuttle/passenger/build.gradle diff --git a/OCH/mogo-och-shuttle/consumer-rules.pro b/OCH/shuttle/passenger/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle/consumer-rules.pro rename to OCH/shuttle/passenger/consumer-rules.pro diff --git a/OCH/mogo-och-shuttle-passenger/gradle.properties b/OCH/shuttle/passenger/gradle.properties similarity index 100% rename from OCH/mogo-och-shuttle-passenger/gradle.properties rename to OCH/shuttle/passenger/gradle.properties diff --git a/OCH/mogo-och-shuttle/proguard-rules.pro b/OCH/shuttle/passenger/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle/proguard-rules.pro rename to OCH/shuttle/passenger/proguard-rules.pro diff --git a/OCH/mogo-och-shuttle-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/progress_item_round.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/progress_item_round.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/progress_item_round.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/progress_item_round.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/colors.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/colors.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/values/colors.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/values/dimens.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/values/strings.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/AndroidManifest.xml b/OCH/shuttle/passenger/src/m2/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/AndroidManifest.xml rename to OCH/shuttle/passenger/src/m2/AndroidManifest.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data b/OCH/shuttle/passenger/src/m2/assets/m2_map_style.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data rename to OCH/shuttle/passenger/src/m2/assets/m2_map_style.data diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data b/OCH/shuttle/passenger/src/m2/assets/m2_map_style_extra.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data rename to OCH/shuttle/passenger/src/m2/assets/m2_map_style_extra.data diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/BPRouteDataTestUtils.java b/OCH/shuttle/passenger/src/m2/java/BPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/BPRouteDataTestUtils.java rename to OCH/shuttle/passenger/src/m2/java/BPRouteDataTestUtils.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/auto_button_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/auto_button_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/auto_button_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/auto_button_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_green_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_red_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/clock_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/clock_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/clock_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/clock_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_drive_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_drive_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_drive_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_drive_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_line_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_line_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_line_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_line_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_time_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_time_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_time_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_time_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_dashed_line.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_dashed_line.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_dashed_line.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_dashed_line.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_info.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_info.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_info.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_info.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_selector.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_selector.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_selector.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_auto.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_auto.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_auto.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_auto.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_pnc.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_pnc.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_pnc.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_pnc.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/brakelight_background_daytime.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_green_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_red_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_lightyellow_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_lightyellow_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml b/OCH/shuttle/passenger/src/m2/res/drawable/m2_power_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/m2_power_seekbar_style.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml b/OCH/shuttle/passenger/src/m2/res/layout/m2_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml rename to OCH/shuttle/passenger/src/m2/res/layout/m2_p_traffic_light_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_view.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_view.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_status_bar.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_status_bar.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml b/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml rename to OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/raw/station_marker.nt3d b/OCH/shuttle/passenger/src/m2/res/raw/station_marker.nt3d similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/raw/station_marker.nt3d rename to OCH/shuttle/passenger/src/m2/res/raw/station_marker.nt3d diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml b/OCH/shuttle/passenger/src/m2/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml rename to OCH/shuttle/passenger/src/m2/res/values/colors.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/dimens.xml b/OCH/shuttle/passenger/src/m2/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/values/dimens.xml rename to OCH/shuttle/passenger/src/m2/res/values/dimens.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml b/OCH/shuttle/passenger/src/m2/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml rename to OCH/shuttle/passenger/src/m2/res/values/strings.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/main/AndroidManifest.xml b/OCH/shuttle/passenger/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/AndroidManifest.xml rename to OCH/shuttle/passenger/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/main/assets/map_style.data b/OCH/shuttle/passenger/src/main/assets/map_style.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/assets/map_style.data rename to OCH/shuttle/passenger/src/main/assets/map_style.data diff --git a/OCH/mogo-och-shuttle-passenger/src/main/assets/map_style_extra.data b/OCH/shuttle/passenger/src/main/assets/map_style_extra.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/assets/map_style_extra.data rename to OCH/shuttle/passenger/src/main/assets/map_style_extra.data diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_di.mp3 b/OCH/shuttle/passenger/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_di.mp3 rename to OCH/shuttle/passenger/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-shuttle-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java b/OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java rename to OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 3495a4f848..1955e3ce2f 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -27,9 +27,9 @@ project.dependencies { } else if (isCurrentPassenger("charter")) { implementation project.project(':OCH:charter:passenger') } else if (isCurrentDriver("shuttle")) { - implementation project(':OCH:mogo-och-shuttle') + implementation project(':OCH:shuttle:driver') } else if (isCurrentPassenger("shuttle")) { - implementation project.project(':OCH:mogo-och-shuttle-passenger') + implementation project.project(':OCH:shuttle:passenger') } else if (isCurrentDriver("sweeperCloud")) { implementation project.project(':OCH:sweeper:sweeper-cloud') } else if (isCurrentDriver("sweeperOperate")) { @@ -48,8 +48,8 @@ project.dependencies { implementation project.project(':OCH:mogo-och-bus-passenger') implementation project.project(':OCH:charter:driver') implementation project.project(':OCH:charter:passenger') - implementation project.project(':OCH:mogo-och-shuttle') - implementation project.project(':OCH:mogo-och-shuttle-passenger') + implementation project.project(':OCH:shuttle:driver') + implementation project.project(':OCH:shuttle:passenger') implementation project.project(':OCH:sweeper:sweeper-cloud') implementation project.project(':OCH:sweeper:sweeper') implementation project.project(':OCH:taxi:driver') diff --git a/settings.gradle b/settings.gradle index 362f21947d..4ef3bc47a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -76,7 +76,7 @@ include ':OCH:sweeper:sweeper-cloud' include ':OCH:charter:driver' include ':OCH:charter:passenger' -include ':OCH:mogo-och-shuttle' -include ':OCH:mogo-och-shuttle-passenger' +include ':OCH:shuttle:driver' +include ':OCH:shuttle:passenger' include ':core:function-impl:mogo-core-function-patch' From e41c908ef456474ae4f4bd9f253946ca1b6cf7f0 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 23 Aug 2023 15:41:23 +0800 Subject: [PATCH 5/8] =?UTF-8?q?[6.0.0]=201=E3=80=81=E5=8E=BB=E9=99=A4marke?= =?UTF-8?q?r=20api=E4=BF=AE=E6=94=B9=202=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BE=85=E6=9C=8D=E5=8A=A1=E7=BA=A2=E7=82=B9=E5=92=8C=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=203=E3=80=81=E5=8E=BB=E6=8E=89=E5=88=B0=E7=AB=99?= =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=8F=96=E6=B6=88=E8=87=AA=E9=A9=BE=E7=9A=84?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/model/TaxiModel.kt | 3 ++- .../mogo/och/taxi/ui/TaxiOrderCancelDialog.java | 2 +- .../och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 7 ++----- .../taxi/ui/task/TaxiCurrentTaskViewModel.kt | 7 ++++--- .../och/taxi/ui/task/TaxiNextTaskFragment.kt | 1 + .../och/taxi/ui/task/TaxiTaskTabFragment.kt | 12 ++++++++++++ .../com/mogo/och/taxi/utils/MapMakerManager.kt | 2 +- .../res/layout/taxi_server_orders_panel.xml | 17 ++++++----------- 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt index 79761fa9ed..7d1d909059 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt @@ -636,7 +636,8 @@ object TaxiModel { mUntruthTask = null if (isArriveEndSite) { cleanStation() - cancelAutopilot() + //2020.8.23 到站后不再调用取消自驾. 原因是取消自驾,D档位会溜车 +// cancelAutopilot() } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index f4c9c07e9f..a86a8f2edd 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -45,7 +45,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi private CommitReasonListener mCommitListener = null; - protected TaxiOrderCancelDialog(Context context, int orderStatus,CommitReasonListener commitListener) { + public TaxiOrderCancelDialog(Context context, int orderStatus,CommitReasonListener commitListener) { super(context,R.style.OrderCancelDialog); this.mOrderStatus = orderStatus; contextWeakReference = new WeakReference<>(context); diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 4d26024b3d..cb5d39a442 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -1,11 +1,10 @@ -package com.mogo.och.taxi.ui +package com.mogo.och.taxi.ui.task import android.annotation.SuppressLint import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.os.Build import android.os.Bundle -import android.text.Html import android.view.View import androidx.annotation.RequiresApi import androidx.core.text.HtmlCompat @@ -39,8 +38,8 @@ import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER import com.mogo.och.taxi.model.TaxiModel +import com.mogo.och.taxi.ui.TaxiOrderCancelDialog import com.mogo.och.taxi.ui.base.TaxiFragment -import com.mogo.och.taxi.ui.task.TaxiCurrentTaskViewModel import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState import com.mogo.och.taxi.ui.unmanned.UnmannedIntent import com.mogo.och.taxi.utils.MapMakerManager @@ -330,8 +329,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } - updateMapMarkers() - updateRemainDistanceAndTime(false) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 0e025303c0..cebcf72667 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -118,11 +118,11 @@ class TaxiCurrentTaskViewModel : BaseViewModel(){ * 更新接单状态 */ private fun updateCarStatus() { - if (!LoginStatusManager.isLogin()) { + if (!isLogin()) { TaxiModel.loginService!!.queryLoginStatusByNet() return } - if (TaxtServingStatusManager.isOpeningOrderStatus()){//接单状态下,去结束 + if (isOpeningOrderStatus()){//接单状态下,去结束 CarServiceManager.endService(mContext, object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { @@ -397,7 +397,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel(){ VoiceNotice.showNotice("乘客已经取消") mCurrentTaskAndOrder = null updateNoTaskAndOrderUi() - TaxiModel.cancelAutopilot() + //2020.8.23 到站后不再调用取消自驾. 原因是取消自驾,D档位会溜车 +// TaxiModel.cancelAutopilot() return } if (data.data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt index c9a38bb0f5..1a90437eb1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt @@ -56,6 +56,7 @@ class TaxiNextTaskFragment : BaseFragment() { if (model.taskType == TaskTypeEnum.VirtualTask.code) { val order = model.order updateOrderUI(order!!) + } else { showNoOrderView() } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt index eebd6b5c69..053f6d8641 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt @@ -15,11 +15,15 @@ import com.google.android.material.tabs.TabLayout import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment +import com.mogo.och.taxi.ui.task.TaxiCurrentTaskFragment import kotlinx.android.synthetic.main.taxi_server_orders_panel.module_och_taxi_tab import kotlinx.android.synthetic.main.taxi_server_orders_panel.module_och_taxi_view_pager +import kotlinx.android.synthetic.main.taxi_server_orders_panel.wait_order_num import me.jessyan.autosize.utils.AutoSizeUtils /** @@ -188,6 +192,14 @@ class TaxiTaskTabFragment : BaseFragment() { fun updateOrderChanged(model: QueryCurrentTaskRespBean.Result?) { if (null == nextTaskFragment) return + if (model != null && model.taskType == TaskTypeEnum.VirtualTask.code + && model.order != null) { + VoiceNotice.showNotice("已为您提前接到下一订单，待完成当前任务后服务") + wait_order_num.visibility = View.VISIBLE + } else { + wait_order_num.visibility = View.GONE + } + nextTaskFragment!!.updateOrderChanged(model) } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt index ffd8b423bd..a2f0feb736 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt @@ -78,7 +78,7 @@ object MapMakerManager { ) val overlayManager = CallerMapUIServiceManager.getOverlayManager() - overlayManager?.removeAllLinesInOwner(owner) + overlayManager?.removeAllPointsInOwner(owner) } OCHThreadPoolManager.getsInstance().execute(removeAllMapMarkerRunnable) } diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml index b52c347f82..ab353393ca 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml @@ -32,19 +32,14 @@ android:background="@drawable/taxi_order_viewpager_bg" app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_tab" app:layout_constraintStart_toStartOf="parent"/> - Date: Wed, 23 Aug 2023 15:51:32 +0800 Subject: [PATCH 6/8] [6.0.0] change the color of fusion --- .../function/business/identify/TrackerSourceFilterHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt index 7fbd402897..15de210698 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt @@ -50,7 +50,7 @@ object TrackerSourceFilterHelper { if(FunctionBuildConfig.isFusionColor){ if(isFusion(data)){ - color = "#71F7FFFF" + color = "#982FFFFF" } if(isV2X(data)){ color = "#F6F6F6FF" From 3edfd25892e21ff89fed94157a7b2bdba9f4c862 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 23 Aug 2023 15:53:44 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[6.0.0]=201=E3=80=81marker=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index cb5d39a442..ae99c9c22a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -329,6 +329,8 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } + updateMapMarkers() + updateRemainDistanceAndTime(false) } From c55dc57f928872ba708a6fc72c49e79393bd66a7 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 23 Aug 2023 15:53:35 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[6.0.0][=E9=AD=94=E6=96=B9]=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9B=B8=E5=85=B3=E7=8A=B6=E6=80=81=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mofang/MoFangAnalyticUtils.kt | 6 ++++++ .../mofang/MoGoMoFangProviderImpl.kt | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt index 5e67e5f4e7..1214c246a3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt @@ -15,6 +15,12 @@ internal class MoFangAnalyticUtils { const val EVENT_SUB_CONNECT_SUCCESS = "event_sub_connect_success" const val EVENT_SUB_START_DISCONNECT = "event_sub_start_disconnect" const val EVENT_SUB_DISCONNECT_SUCCESS = "event_sub_disconnect_success" + const val EVENT_SUB_DISCONNECT_SLEEP = "event_sub_disconnect_sleep" + const val EVENT_SUB_BLUETOOTH_SETTING_REQ = "event_sub_ble_set_req" + const val EVENT_SUB_BLUETOOTH_OPEN_DENY = "event_sub_ble_open_deny" + const val EVENT_SUB_BLUETOOTH_OPEN_AGREE = "event_sub_ble_open_agree" + const val EVENT_SUB_IS_VALID = "event_sub_is_ipt_valid" + const val EVENT_SUB_IS_INVALID = "event_sub_is_ipt_invalid" // 魔方电量 const val EVENT_BATTERY = "event_mofang_battery" diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt index 025212fbd2..fea3bc7849 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt @@ -26,16 +26,20 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_INPUT_SUB_KEYCODE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_INPUT_SUB_TYPE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_MOFANG_CONNECT +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_BLUETOOTH_OPEN_AGREE +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_BLUETOOTH_OPEN_DENY +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_BLUETOOTH_SETTING_REQ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_CONNECT_SUCCESS +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_DISCONNECT_SLEEP import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_DISCONNECT_SUCCESS +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_IS_INVALID +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_IS_VALID import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_START_CONNECT import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_START_DISCONNECT import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.atomic.AtomicReference internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListener { @@ -263,6 +267,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen override fun onBluetoothKeyboardInputInvalid() { Log.d(TAG, "--- onBluetoothKeyboardInputInvalid ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_INVALID to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputInvalid")) UiThreadHandler.post { listeners.values.forEach { @@ -273,21 +278,25 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen override fun onBluetoothKeyboardInputValid() { Log.d(TAG, "--- onBluetoothKeyboardInputValid ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_VALID to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputValid")) } override fun onBluetoothOpenAgreed() { Log.d(TAG, "--- onBluetoothOpenAgreed ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_AGREE to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothOpenAgreed")) } override fun onBluetoothOpenDenied() { Log.d(TAG, "--- onBluetoothOpenDenied ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_DENY to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothOpenDenied")) } override fun onBluetoothSettingRequest() { Log.d(TAG, "--- onBluetoothSettingRequest ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_SETTING_REQ to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothSettingRequest")) UiThreadHandler.post { Toast.makeText(Utils.getApp(), "检测到魔方未正确连接，请在系统蓝牙设置页面，找到魔方并配对连接...", Toast.LENGTH_SHORT).show() @@ -296,6 +305,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen override fun onBluetoothKeyboardAbnormalDisconnected(status: Int) { Log.d(TAG, "--- onBluetoothKeyboardAbnormalDisconnected(status: $status) ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_DISCONNECT_SLEEP to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardAbnormalDisconnected:$status")) } } \ No newline at end of file