diff --git a/OCH/mogo-och-bus-passenger/.gitignore b/OCH/bus/driver/.gitignore similarity index 100% rename from OCH/mogo-och-bus-passenger/.gitignore rename to OCH/bus/driver/.gitignore diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/bus/driver/build.gradle similarity index 100% rename from OCH/mogo-och-bus/build.gradle rename to OCH/bus/driver/build.gradle diff --git a/OCH/mogo-och-bus-passenger/consumer-rules.pro b/OCH/bus/driver/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-bus-passenger/consumer-rules.pro rename to OCH/bus/driver/consumer-rules.pro diff --git a/OCH/mogo-och-bus/gradle.properties b/OCH/bus/driver/gradle.properties similarity index 100% rename from OCH/mogo-och-bus/gradle.properties rename to OCH/bus/driver/gradle.properties diff --git a/OCH/mogo-och-bus-passenger/proguard-rules.pro b/OCH/bus/driver/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-bus-passenger/proguard-rules.pro rename to OCH/bus/driver/proguard-rules.pro diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusOrdersResponse.java diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusRoutesResponse.java diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/bean/BusStationBean.java diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/IBascApiService.java diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/ISAASApiService.java diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/OrderServiceManager.kt diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java b/OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java rename to OCH/bus/driver/src/jinlvvan/java/com/mogo/och/bus/net/login/OchSAASLoginServiceApi.java diff --git a/OCH/mogo-och-bus/src/main/AndroidManifest.xml b/OCH/bus/driver/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/AndroidManifest.xml rename to OCH/bus/driver/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/BusProvider.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/BusProvider.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/IMogoOCH.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/IMogoOCH.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/IMogoOCH.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/BusConst.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/BusArcView.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/BusArcView.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/SlidePanelView.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java similarity index 100% rename from OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java diff --git a/OCH/mogo-och-bus/src/main/res/color/bus_autopilot_text_color_selector.xml b/OCH/bus/driver/src/main/res/color/bus_autopilot_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/color/bus_autopilot_text_color_selector.xml rename to OCH/bus/driver/src/main/res/color/bus_autopilot_text_color_selector.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_slide_block.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_base_slide_block.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_dot_line.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_dot_line.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_dot_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_ic_autopilot.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_ic_autopilot.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_green_nor.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_green_nor.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_red_nor.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_light_red_nor.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_panel_bg.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_panel_bg.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_task_arrow.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_line_task_arrow.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_no_line_icon.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_no_line_icon.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_och_dot_line.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_och_dot_line.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_bg.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_bg.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_selected_btn.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_selected_btn.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_line_close.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_line_close.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_map_long.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_map_long.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_map_medium.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_switch_map_medium.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_unselect_btn.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_unselect_btn.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/end_maker_icon.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/end_maker_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_collect.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_collect.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_normal.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_select.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_ai_select.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_normal.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_select.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_no_bus_line.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_no_bus_line.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_blue_bus.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_blue_bus.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_green_bus.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_green_bus.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_grey_bus.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_point_grey_bus.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/no_order_data.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/no_order_data.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/no_order_data.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/pingxingjiashi.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/pingxingjiashi.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/press_start_status.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/press_start_status.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/press_start_status.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_failure.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/start_failure.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_failure.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/start_failure.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_maker_icon.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/start_maker_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_success.png b/OCH/bus/driver/src/main/res/drawable-xhdpi/start_success.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable-xhdpi/start_success.png rename to OCH/bus/driver/src/main/res/drawable-xhdpi/start_success.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/ai_collect_selector.xml b/OCH/bus/driver/src/main/res/drawable/ai_collect_selector.xml similarity index 98% rename from OCH/mogo-och-bus/src/main/res/drawable/ai_collect_selector.xml rename to OCH/bus/driver/src/main/res/drawable/ai_collect_selector.xml index 879be14e27..a1211f3c47 100755 --- a/OCH/mogo-och-bus/src/main/res/drawable/ai_collect_selector.xml +++ b/OCH/bus/driver/src/main/res/drawable/ai_collect_selector.xml @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bad_case_selector.xml b/OCH/bus/driver/src/main/res/drawable/bad_case_selector.xml similarity index 98% rename from OCH/mogo-och-bus/src/main/res/drawable/bad_case_selector.xml rename to OCH/bus/driver/src/main/res/drawable/bad_case_selector.xml index b0e7932bd4..bc47ce95d7 100755 --- a/OCH/mogo-och-bus/src/main/res/drawable/bad_case_selector.xml +++ b/OCH/bus/driver/src/main/res/drawable/bad_case_selector.xml @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bg_bus_traffic_light_background.xml b/OCH/bus/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bg_bus_traffic_light_background.xml rename to OCH/bus/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_2_status_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_2_status_bg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_status_bg_check.png b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_status_bg_check.png rename to OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_status_bg_nor.png b/OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_autopilot_status_bg_nor.png rename to OCH/bus/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml b/OCH/bus/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml rename to OCH/bus/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_in_autopilot.png rename to OCH/bus/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_not_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_base_icon_not_in_autopilot.png rename to OCH/bus/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_base_notice_box_bg.9.png b/OCH/bus/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_base_notice_box_bg.9.png rename to OCH/bus/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_base_slide_block.png b/OCH/bus/driver/src/main/res/drawable/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_base_slide_block.png rename to OCH/bus/driver/src/main/res/drawable/bus_base_slide_block.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_checkbox_selector.xml b/OCH/bus/driver/src/main/res/drawable/bus_checkbox_selector.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_checkbox_selector.xml rename to OCH/bus/driver/src/main/res/drawable/bus_checkbox_selector.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_disable_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_disable_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_dot_line.png b/OCH/bus/driver/src/main/res/drawable/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_dot_line.png rename to OCH/bus/driver/src/main/res/drawable/bus_dot_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_ic_autopilot.png b/OCH/bus/driver/src/main/res/drawable/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_ic_autopilot.png rename to OCH/bus/driver/src/main/res/drawable/bus_ic_autopilot.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arrived_station.png b/OCH/bus/driver/src/main/res/drawable/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arrived_station.png rename to OCH/bus/driver/src/main/res/drawable/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arriving_station.png b/OCH/bus/driver/src/main/res/drawable/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_icon_arriving_station.png rename to OCH/bus/driver/src/main/res/drawable/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_icon_not_arrive_station.png b/OCH/bus/driver/src/main/res/drawable/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_icon_not_arrive_station.png rename to OCH/bus/driver/src/main/res/drawable/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_light_green_nor.png b/OCH/bus/driver/src/main/res/drawable/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_light_green_nor.png rename to OCH/bus/driver/src/main/res/drawable/bus_light_green_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_light_red_nor.png b/OCH/bus/driver/src/main/res/drawable/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_light_red_nor.png rename to OCH/bus/driver/src/main/res/drawable/bus_light_red_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_lightyellow_nor.png b/OCH/bus/driver/src/main/res/drawable/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_lightyellow_nor.png rename to OCH/bus/driver/src/main/res/drawable/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_line_dividing_line1_selector.xml b/OCH/bus/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_line_dividing_line1_selector.xml rename to OCH/bus/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_line_dividing_line2_selector.xml b/OCH/bus/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_line_dividing_line2_selector.xml rename to OCH/bus/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg.png b/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg.png rename to OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg_1.png b/OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_line_panel_bg_1.png rename to OCH/bus/driver/src/main/res/drawable/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_loading_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_loading_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_och_dot_line.png b/OCH/bus/driver/src/main/res/drawable/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_och_dot_line.png rename to OCH/bus/driver/src/main/res/drawable/bus_och_dot_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg_selector.xml b/OCH/bus/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg_selector.xml rename to OCH/bus/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/bus/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_panel_anchor_bkg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_panel_bkg.xml b/OCH/bus/driver/src/main/res/drawable/bus_panel_bkg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_panel_bkg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_panel_bkg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_right_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_right_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_selected_btn.png b/OCH/bus/driver/src/main/res/drawable/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_selected_btn.png rename to OCH/bus/driver/src/main/res/drawable/bus_selected_btn.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_btn_bg.png b/OCH/bus/driver/src/main/res/drawable/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_setting_btn_bg.png rename to OCH/bus/driver/src/main/res/drawable/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml rename to OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml b/OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml rename to OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml b/OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml rename to OCH/bus/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_station_green_dash_line.xml b/OCH/bus/driver/src/main/res/drawable/bus_station_green_dash_line.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_station_green_dash_line.xml rename to OCH/bus/driver/src/main/res/drawable/bus_station_green_dash_line.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_station_v_green_dash.xml b/OCH/bus/driver/src/main/res/drawable/bus_station_v_green_dash.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_station_v_green_dash.xml rename to OCH/bus/driver/src/main/res/drawable/bus_station_v_green_dash.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/bus/driver/src/main/res/drawable/bus_switch_line_btn.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn.xml rename to OCH/bus/driver/src/main/res/drawable/bus_switch_line_btn.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/bus/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml rename to OCH/bus/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_close.png b/OCH/bus/driver/src/main/res/drawable/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_close.png rename to OCH/bus/driver/src/main/res/drawable/bus_switch_line_close.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_map_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_switch_map_bg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_switch_map_bg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_switch_map_bg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_map_long.png b/OCH/bus/driver/src/main/res/drawable/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_switch_map_long.png rename to OCH/bus/driver/src/main/res/drawable/bus_switch_map_long.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_map_medium.png b/OCH/bus/driver/src/main/res/drawable/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_switch_map_medium.png rename to OCH/bus/driver/src/main/res/drawable/bus_switch_map_medium.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_task_time_bg.xml b/OCH/bus/driver/src/main/res/drawable/bus_task_time_bg.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_task_time_bg.xml rename to OCH/bus/driver/src/main/res/drawable/bus_task_time_bg.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_unselect_btn.png b/OCH/bus/driver/src/main/res/drawable/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_unselect_btn.png rename to OCH/bus/driver/src/main/res/drawable/bus_unselect_btn.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_wrong_autopilot_icon.png b/OCH/bus/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_wrong_autopilot_icon.png rename to OCH/bus/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml b/OCH/bus/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml rename to OCH/bus/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml b/OCH/bus/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml rename to OCH/bus/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml diff --git a/OCH/mogo-och-bus/src/main/res/drawable/end_maker_icon.png b/OCH/bus/driver/src/main/res/drawable/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/end_maker_icon.png rename to OCH/bus/driver/src/main/res/drawable/end_maker_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_ai_normal.png b/OCH/bus/driver/src/main/res/drawable/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_ai_normal.png rename to OCH/bus/driver/src/main/res/drawable/icon_ai_normal.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_ai_select.png b/OCH/bus/driver/src/main/res/drawable/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_ai_select.png rename to OCH/bus/driver/src/main/res/drawable/icon_ai_select.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_blue_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_blue_bus.png rename to OCH/bus/driver/src/main/res/drawable/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_green_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_green_bus.png rename to OCH/bus/driver/src/main/res/drawable/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_grey_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_arrow_grey_bus.png rename to OCH/bus/driver/src/main/res/drawable/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_normal.png b/OCH/bus/driver/src/main/res/drawable/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_normal.png rename to OCH/bus/driver/src/main/res/drawable/icon_bad_case_normal.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_select.png b/OCH/bus/driver/src/main/res/drawable/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_bad_case_select.png rename to OCH/bus/driver/src/main/res/drawable/icon_bad_case_select.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_no_bus_line.png b/OCH/bus/driver/src/main/res/drawable/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_no_bus_line.png rename to OCH/bus/driver/src/main/res/drawable/icon_no_bus_line.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_point_blue_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_point_blue_bus.png rename to OCH/bus/driver/src/main/res/drawable/icon_point_blue_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_point_green_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_point_green_bus.png rename to OCH/bus/driver/src/main/res/drawable/icon_point_green_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_point_grey_bus.png b/OCH/bus/driver/src/main/res/drawable/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_point_grey_bus.png rename to OCH/bus/driver/src/main/res/drawable/icon_point_grey_bus.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/icon_station_start_end.png b/OCH/bus/driver/src/main/res/drawable/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/icon_station_start_end.png rename to OCH/bus/driver/src/main/res/drawable/icon_station_start_end.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/no_order_data.png b/OCH/bus/driver/src/main/res/drawable/no_order_data.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/no_order_data.png rename to OCH/bus/driver/src/main/res/drawable/no_order_data.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/press_start_status.png b/OCH/bus/driver/src/main/res/drawable/press_start_status.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/press_start_status.png rename to OCH/bus/driver/src/main/res/drawable/press_start_status.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/start_failure.png b/OCH/bus/driver/src/main/res/drawable/start_failure.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/start_failure.png rename to OCH/bus/driver/src/main/res/drawable/start_failure.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/start_maker_icon.png b/OCH/bus/driver/src/main/res/drawable/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/start_maker_icon.png rename to OCH/bus/driver/src/main/res/drawable/start_maker_icon.png diff --git a/OCH/mogo-och-bus/src/main/res/drawable/start_success.png b/OCH/bus/driver/src/main/res/drawable/start_success.png similarity index 100% rename from OCH/mogo-och-bus/src/main/res/drawable/start_success.png rename to OCH/bus/driver/src/main/res/drawable/start_success.png diff --git a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml b/OCH/bus/driver/src/main/res/layout/activity_bus_switch_line.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml rename to OCH/bus/driver/src/main/res/layout/activity_bus_switch_line.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml rename to OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_no_data_common_view.xml b/OCH/bus/driver/src/main/res/layout/bus_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/bus_no_data_common_view.xml rename to OCH/bus/driver/src/main/res/layout/bus_no_data_common_view.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml b/OCH/bus/driver/src/main/res/layout/bus_no_line_view.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/bus_no_line_view.xml rename to OCH/bus/driver/src/main/res/layout/bus_no_line_view.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml b/OCH/bus/driver/src/main/res/layout/bus_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/bus_stations_common_item.xml rename to OCH/bus/driver/src/main/res/layout/bus_stations_common_item.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/bus/driver/src/main/res/layout/bus_switch_line_list_item.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_item.xml rename to OCH/bus/driver/src/main/res/layout/bus_switch_line_list_item.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_task_item.xml b/OCH/bus/driver/src/main/res/layout/bus_switch_line_list_task_item.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/bus_switch_line_list_task_item.xml rename to OCH/bus/driver/src/main/res/layout/bus_switch_line_list_task_item.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml b/OCH/bus/driver/src/main/res/layout/bus_test_bar_view.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml rename to OCH/bus/driver/src/main/res/layout/bus_test_bar_view.xml diff --git a/OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml b/OCH/bus/driver/src/main/res/layout/fragment_och_bus.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml rename to OCH/bus/driver/src/main/res/layout/fragment_och_bus.xml diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_away_passengers.json b/OCH/bus/driver/src/main/res/raw/bus_away_passengers.json similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bus_away_passengers.json rename to OCH/bus/driver/src/main/res/raw/bus_away_passengers.json diff --git a/OCH/mogo-och-bus-passenger/src/main/res/raw/bus_di.mp3 b/OCH/bus/driver/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/raw/bus_di.mp3 rename to OCH/bus/driver/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_order_1.json b/OCH/bus/driver/src/main/res/raw/bus_order_1.json similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bus_order_1.json rename to OCH/bus/driver/src/main/res/raw/bus_order_1.json diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json b/OCH/bus/driver/src/main/res/raw/bus_station_list1.json similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bus_station_list1.json rename to OCH/bus/driver/src/main/res/raw/bus_station_list1.json diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json b/OCH/bus/driver/src/main/res/raw/bus_station_list2.json similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bus_station_list2.json rename to OCH/bus/driver/src/main/res/raw/bus_station_list2.json diff --git a/OCH/mogo-och-bus/src/main/res/raw/end_marker.nt3d b/OCH/bus/driver/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/end_marker.nt3d rename to OCH/bus/driver/src/main/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-bus/src/main/res/raw/star_marker.nt3d b/OCH/bus/driver/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/star_marker.nt3d rename to OCH/bus/driver/src/main/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-bus/src/main/res/values/attrs.xml b/OCH/bus/driver/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/values/attrs.xml rename to OCH/bus/driver/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-bus/src/main/res/values/colors.xml b/OCH/bus/driver/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/values/colors.xml rename to OCH/bus/driver/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/bus/driver/src/main/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/values/dimens.xml rename to OCH/bus/driver/src/main/res/values/dimens.xml diff --git a/OCH/mogo-och-bus/src/main/res/values/strings.xml b/OCH/bus/driver/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/values/strings.xml rename to OCH/bus/driver/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-bus/src/main/res/values/style.xml b/OCH/bus/driver/src/main/res/values/style.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/values/style.xml rename to OCH/bus/driver/src/main/res/values/style.xml diff --git a/OCH/mogo-och-bus/src/main/res/xml/bus_switch_line_list_item_scene.xml b/OCH/bus/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml similarity index 100% rename from OCH/mogo-och-bus/src/main/res/xml/bus_switch_line_list_item_scene.xml rename to OCH/bus/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml diff --git a/OCH/mogo-och-bus/.gitignore b/OCH/bus/passenger/.gitignore similarity index 100% rename from OCH/mogo-och-bus/.gitignore rename to OCH/bus/passenger/.gitignore diff --git a/OCH/mogo-och-bus-passenger/README.md b/OCH/bus/passenger/README.md similarity index 100% rename from OCH/mogo-och-bus-passenger/README.md rename to OCH/bus/passenger/README.md diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/bus/passenger/build.gradle similarity index 100% rename from OCH/mogo-och-bus-passenger/build.gradle rename to OCH/bus/passenger/build.gradle diff --git a/OCH/mogo-och-bus/consumer-rules.pro b/OCH/bus/passenger/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-bus/consumer-rules.pro rename to OCH/bus/passenger/consumer-rules.pro diff --git a/OCH/mogo-och-bus-passenger/gradle.properties b/OCH/bus/passenger/gradle.properties similarity index 100% rename from OCH/mogo-och-bus-passenger/gradle.properties rename to OCH/bus/passenger/gradle.properties diff --git a/OCH/mogo-och-bus/proguard-rules.pro b/OCH/bus/passenger/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-bus/proguard-rules.pro rename to OCH/bus/passenger/proguard-rules.pro diff --git a/OCH/mogo-och-bus-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/bus/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/bus/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java rename to OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png b/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/indicator_select.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_select.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/indicator_select.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_select.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/indicator_unselect.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_unselect.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/indicator_unselect.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_unselect.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png b/OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png rename to OCH/bus/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/progress_item_round.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/progress_item_round.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/progress_item_round.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/progress_item_round.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/video_btn_selector.xml b/OCH/bus/passenger/src/jinlvvan/res/drawable/video_btn_selector.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/video_btn_selector.xml rename to OCH/bus/passenger/src/jinlvvan/res/drawable/video_btn_selector.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml b/OCH/bus/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml rename to OCH/bus/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/colors.xml b/OCH/bus/passenger/src/jinlvvan/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/colors.xml rename to OCH/bus/passenger/src/jinlvvan/res/values/colors.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml b/OCH/bus/passenger/src/jinlvvan/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml rename to OCH/bus/passenger/src/jinlvvan/res/values/dimens.xml diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml b/OCH/bus/passenger/src/jinlvvan/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml rename to OCH/bus/passenger/src/jinlvvan/res/values/strings.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/AndroidManifest.xml b/OCH/bus/passenger/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/AndroidManifest.xml rename to OCH/bus/passenger/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/assets/map_style.data b/OCH/bus/passenger/src/main/assets/map_style.data similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/assets/map_style.data rename to OCH/bus/passenger/src/main/assets/map_style.data diff --git a/OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data b/OCH/bus/passenger/src/main/assets/map_style_extra.data similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data rename to OCH/bus/passenger/src/main/assets/map_style_extra.data diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java rename to OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt rename to OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt rename to OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt diff --git a/OCH/mogo-och-bus/src/main/res/raw/bus_di.mp3 b/OCH/bus/passenger/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-bus/src/main/res/raw/bus_di.mp3 rename to OCH/bus/passenger/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-bus-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java b/OCH/bus/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java rename to OCH/bus/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index 753f9410eb..ed21b9ba9d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -52,10 +52,10 @@ import io.reactivex.Observable import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers import mogo.telematics.pad.MessagePad -import mogo_msg.MogoReportMsg import java.util.* import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit +import kotlin.math.max /** * Created on 2022/3/31 @@ -798,49 +798,64 @@ object CharterPassengerModel { } CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let { // 仅计算 距离最近的站点middle 附近5个坐标的夹角 + // middle middle-1 + var middleDegree1 = 0 + // middle middle+1 + var middleDegree2 = 0 + // middle-1 middle-2 + var middleDegree3 = 0 + // middle+1 middle+2 + var middleDegree4 = 0 + if (middle - 1 >= 0) { - val degree = CoordinateCalculateRouteUtil.getDegree( + middleDegree1 = CoordinateCalculateRouteUtil.getDegree( it.longitude, it.latitude, data.get(middle).GcjLon!!, data.get(middle).GcjLat!!, data.get(middle - 1).GcjLon!!, data.get(middle - 1).GcjLat!!, ) - if (degree > 90) { - return Pair(middle, false) - } } if (middle + 1 < data.size) { - val degree = CoordinateCalculateRouteUtil.getDegree( + middleDegree2 = CoordinateCalculateRouteUtil.getDegree( it.longitude, it.latitude, data.get(middle + 1).GcjLon!!, data.get(middle + 1).GcjLat!!, data.get(middle).GcjLon!!, data.get(middle).GcjLat!!, ) - if (degree > 90) { - return Pair(middle + 1, false) - } } if (middle - 2 >= 0) { - val degree = CoordinateCalculateRouteUtil.getDegree( + middleDegree3 = CoordinateCalculateRouteUtil.getDegree( it.longitude, it.latitude, data.get(middle - 1).GcjLon!!, data.get(middle - 1).GcjLat!!, data.get(middle - 2).GcjLon!!, data.get(middle - 2).GcjLat!!, ) - if (degree > 90) { - return Pair(middle - 1, false) - } } if (middle + 2 < data.size) { - val degree = CoordinateCalculateRouteUtil.getDegree( + middleDegree4 = CoordinateCalculateRouteUtil.getDegree( it.longitude, it.latitude, data.get(middle + 2).GcjLon!!, data.get(middle + 2).GcjLat!!, data.get(middle + 1).GcjLon!!, data.get(middle + 1).GcjLat!!, ) - if (degree > 90) { + } + val max1 = max(middleDegree1, middleDegree2) + val max2 = max(middleDegree3, middleDegree4) + d(M_BUS_P + TAG, "角度1:$middleDegree1---角度2:$middleDegree2--角度3:$middleDegree3----角度4:$middleDegree4") + when (max(max1, max2)) { + middleDegree1 -> { + return Pair(middle, false) + } + middleDegree2 -> { + return Pair(middle + 1, false) + } + middleDegree3 -> { + return Pair(middle - 1, false) + } + middleDegree4 -> { return Pair(middle + 2, false) } + else -> {} } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt index a9860cd670..2fc39f56df 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt @@ -94,7 +94,7 @@ class GoViewWithArrive @JvmOverloads constructor( CharterPassengerModel.leaveStation() } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showToastShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") + ToastCharterUtils.showToastShort("安全守护中，无需操作～") } else -> {} } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt index 1d89dc4089..9ac5fbc5ce 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt @@ -1,5 +1,6 @@ package com.mogo.och.charter.passenger.ui.selectline +import android.view.View import androidx.lifecycle.ViewModel import com.elegant.utils.UiThreadHandler import com.mogo.commons.AbsMogoApplication @@ -110,7 +111,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } init { - CharterPassengerModel.setStatusChangeListener(TAG, this) + } override fun onCleared() { @@ -118,17 +119,18 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { this.viewCallback = null RxUtils.disposeSubscribe(subscribeSelectSite) BizLoopManager.removeLoopFunction(TAGLINELOOP) - CharterPassengerModel.setStatusChangeListener(TAG, null) } fun addMsgListener() { CallerTelematicListenerManager.addListener(TAG, msgReceived) + CharterPassengerModel.setStatusChangeListener(TAG, this) } fun removeMsgListener() { RxUtils.disposeSubscribe(subscribeSelectSite) BizLoopManager.removeLoopFunction(TAGLINELOOP) CallerTelematicListenerManager.removeListener(TAG) + CharterPassengerModel.setStatusChangeListener(TAG, null) } override fun onStatusChange(currentStatus: OrderStatusEnum) { diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_light.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_light.png deleted file mode 100644 index 3d4acc9951..0000000000 Binary files a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_light.png and /dev/null differ diff --git a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml index 8b076ef230..3515c4025c 100644 --- a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml +++ b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml @@ -19,7 +19,6 @@ android:layout_height="match_parent" app:bottomPadding="200" app:carDrawable="@drawable/bug_p_overmap_car_model" - app:compassDrawable="@drawable/charter_p_car_light" app:isClearArrived="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt index 142f4d77a3..ba3f7891b6 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt @@ -47,10 +47,10 @@ class TaxiUnmannedConst { const val TEST_USER = "内测" // 埋点key：接管后点击'自动驾驶'按钮启动 - const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_och_taxi_restart_autopilot" + const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_unmanned_taxi_restart_autopilot" // 埋点key：开始服务开启自动驾驶（成功/失败） - const val EVENT_KEY_START_SERVICE = "event_key_och_taxi_start_service" + const val EVENT_KEY_START_SERVICE = "event_key_unmanned_taxi_start_service" const val EVENT_PARAM_SN = "sn" const val EVENT_PARAM_TIME = "time" const val EVENT_PARAM_START_NAME = "start_name" diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 3a7587c1cb..f57b295596 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -1109,16 +1109,22 @@ object TaxiTaskModel { "judgeEndStation() stationAngle = $stationAngle" ) + if ((!checkCurrentTaskCondition() + || (getCurTaskStatus() == TaskStatusEnum.StartTask.code)) + ) { + i(TAG, "task null or TaskStatus = ${getCurTaskStatus()}") + return + } //3、刚过站且过站距离在15m内， 提交到站 - if (stationAngle > 90 && distance <= TaxiUnmannedConst.ARRIVE_AT_START_STATION_DISTANCE) { - if ((!checkCurrentTaskCondition() - || (getCurTaskStatus() == TaskStatusEnum.StartTask.code)) - ) { - i(TAG, "task null or TaskStatus = ${getCurTaskStatus()}") - return - } + if (stationAngle > 90) { i(TAG, "judgeEndStation() = 刚过站且在15m内") submitArriveSite(endSite.siteId, true) + }else{ + // 4、 没有过站距离小于15m 速度小于0.5(根据M1来的模数 可能要调) + if (currentLocation.gnssSpeed < 0.5) { + i(TAG, "judgeEndStation() = 没有过站、速度基本为零且在15m内") + submitArriveSite(endSite.siteId, true) + } } } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index 2c679a3be0..18dafa30be 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -18,10 +18,10 @@ class TaxiPassengerConst { const val VEHICLE_TYPE = 9 // 埋点key：接管后点击'自动驾驶'按钮启动 - const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_och_taxi_restart_autopilot" + const val EVENT_KEY_RESTART_AUTOPILOT = "event_key_unmanned_taxi_restart_autopilot" // 埋点key：开始服务开启自动驾驶（成功/失败） - const val EVENT_KEY_START_SERVICE = "event_key_och_taxi_start_service" + const val EVENT_KEY_START_SERVICE = "event_key_unmanned_taxi_start_service" const val EVENT_PARAM_SN = "sn" const val EVENT_PARAM_TIME = "time" const val EVENT_PARAM_START_NAME = "start_name" diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 1955e3ce2f..41e69962e2 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -19,9 +19,9 @@ project.dependencies { if (isCurrentDriver("noop")) { noopImplementation(project(':OCH:mogo-och-noop')) } else if (isCurrentDriver("bus")) { - implementation project.project(':OCH:mogo-och-bus') + implementation project.project(':OCH:bus:driver') } else if (isCurrentPassenger("bus")) { - implementation project.project(':OCH:mogo-och-bus-passenger') + implementation project.project(':OCH:bus:passenger') } else if (isCurrentDriver("charter")) { implementation project.project(':OCH:charter:driver') } else if (isCurrentPassenger("charter")) { @@ -44,8 +44,8 @@ project.dependencies { implementation project.project(':OCH:taxi:passenger') } else { noopImplementation(project(':OCH:mogo-och-noop')) - implementation project.project(':OCH:mogo-och-bus') - implementation project.project(':OCH:mogo-och-bus-passenger') + implementation project.project(':OCH:bus:driver') + implementation project.project(':OCH:bus:passenger') implementation project.project(':OCH:charter:driver') implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:shuttle:driver') diff --git a/config.gradle b/config.gradle index 031da09377..ee98fd6a33 100644 --- a/config.gradle +++ b/config.gradle @@ -215,7 +215,7 @@ ext { btrace : "com.bytedance.btrace:rhea-core:2.0.0", mofang_runtime : "com.mogo.eagle.core.mofang:runtime:2.0.6", - log_runtime : "com.mogo.eagle.core.log.record:runtime:1.0.8", + log_runtime : "com.mogo.eagle.core.log.record:runtime:1.0.9", // 安全证书 passport_secret : "com.zhidaoauto:sdk-java:1.0.5-SNAPSHOT", diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt index 2b52095da7..fd87bac403 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt @@ -1,6 +1,7 @@ package com.zhjt.mogo_core_function_devatools.logcat import android.content.* +import android.os.Build import android.os.Process import android.os.SystemClock import android.util.Log @@ -10,6 +11,9 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.core.log.record.* import com.mogo.core.log.record.config.* import com.mogo.core.log.record.config.crash.* +import com.mogo.core.log.record.config.state.IStateProvider +import com.mogo.core.log.record.model.UploadError +import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.function.api.devatools.logcat.* import com.zhidao.loglib.bean.RemoteLogPushContent import com.zhjt.mogo_core_function_devatools.logcat.config.LogRecordConfig @@ -43,6 +47,62 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider, .recordDir(File(context.getExternalFilesDir(null), "logcat")) .pid(Process.myPid()) .generateZipDir(zipDir.absolutePath) + .stateProvider(object : IStateProvider { + override fun provide(divider:String?): Map { + return mutableMapOf().also { itx -> + itx["build_sdk_version"] = Build.VERSION.SDK_INT + itx["build_device"] = Build.DEVICE + itx["build_host"] = Build.HOST + itx["build_id"] = Build.ID + itx["build_host"] = Build.HOST + itx["build_brand"] = Build.BRAND + itx["build_model"] = Build.MODEL + itx["build_product"] = Build.PRODUCT + itx["build_board"] = Build.BOARD + itx["build_bootloader"] = Build.BOOTLOADER + itx["${divider}-1"] = divider + itx["应用名称"] = AppConfigInfo.appName + itx["应用版本名称"] = AppConfigInfo.appVersionName + itx["应用版本号"] = AppConfigInfo.appVersionCode + itx["渠道"] = AppConfigInfo.flavor + itx["GIT分支"] = AppConfigInfo.workingBranchName + itx["GIT分支HASH"] = AppConfigInfo.workingBranchHash + itx["${divider}-2"] = divider + itx["MAP-SDK版本"] = AppConfigInfo.mapSdkVersion + itx["MAP-OPT-SDK版本"] = AppConfigInfo.mapSdkOptVersion + itx["ADAS-SDK版本"] = AppConfigInfo.adasSdkVersion + itx["${divider}-3"] = divider + itx["OBU-SDk版本"] = AppConfigInfo.obuSdkVersion + itx["OBU-INFO"] = AppConfigInfo.obuInfo + itx["${divider}-4"] = divider + itx["数字版权ID"] = AppConfigInfo.widevineIDMd5 + itx["设备唯一标识"] = AppConfigInfo.uniqueDeviceId + itx["中台分配的SN"] = AppConfigInfo.mogoSN + itx["中台分配的令牌"] = AppConfigInfo.mogoToken + itx["当前网络连接模式"] = AppConfigInfo.netMode + itx["网络是否正常"] = AppConfigInfo.isConnectNet + itx["Socket是否正常"] = AppConfigInfo.isConnectSocket + itx["ADAS连接是否正常"] = AppConfigInfo.isConnectAutopilot + itx["OBU连接是否正常"] = AppConfigInfo.isConnectObu + itx["连接工控机状态描述"] = AppConfigInfo.connectStatusDescribe + itx["${divider}-5"] = divider + itx["是否司机端"] = AppConfigInfo.isDriver + itx["是否是乘客端"] = !AppConfigInfo.isDriver + if (!AppConfigInfo.isDriver) { + itx["当前车机是乘客屏，对应的司机屏SN"] = AppConfigInfo.serverSn + } + itx["司乘屏连接状态"] = AppConfigInfo.isConnectedNetty + itx["${divider}-6"] = divider + itx["车牌号"] = AppConfigInfo.plateNumber + itx["mac"] = AppConfigInfo.iPCMacAddress + itx["docker版本"] = AppConfigInfo.dockerVersion + itx["协议版本号"] = AppConfigInfo.protocolVersionNumber + itx["${divider}-7"] = divider + itx["角色"] = AppConfigInfo.role + + } + } + }) .crashConfig(CrashConfig.Builder() .enabled(true) .crashDir(File(context.getExternalFilesDir(null), "logcat/crash")) @@ -119,6 +179,13 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider, return LogcatManager.export() } + override fun upload(): Unit = runBlocking { + val state = LogcatManager.upload(0, System.currentTimeMillis()) + if (state is UploadError) { + throw AssertionError(state.toString()) + } + } + override fun testJavaCrash(runOnNewThread: Boolean) { LogcatManager.testJavaCrash(runOnNewThread) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/uploader/LogRecordUploader.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/uploader/LogRecordUploader.kt index 03f1145b63..5600de0d8d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/uploader/LogRecordUploader.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/uploader/LogRecordUploader.kt @@ -8,10 +8,11 @@ import com.zhidao.cosupload.callback.CosStatusCallback import com.zhidao.cosupload.callback.CosStatusCallbackManager import com.zhidao.cosupload.model.CallbackData import com.zhidao.loglib.upload.UploadManager -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.asCoroutineDispatcher -import kotlinx.coroutines.flow.channelFlow -import kotlinx.coroutines.flow.firstOrNull +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOn internal class LogRecordUploader : ILogcatUploader { @@ -20,10 +21,10 @@ internal class LogRecordUploader : ILogcatUploader { private const val TAG = "LogRecordUploader" } - @OptIn(ExperimentalCoroutinesApi::class) override suspend fun upload(startTime: Long, endTime: Long, generatedZipPath: String): UploadState = - channelFlow { + flow { Log.d(TAG, "---- 开始上传 --- 1 ---") + val channel = Channel() CosStatusCallbackManager.getInstance().register(object : CosStatusCallback { override fun onStartUpload(data: CallbackData?) { @@ -35,7 +36,7 @@ internal class LogRecordUploader : ILogcatUploader { override fun uploadCosCompleted(data: CallbackData?) { if (data?.localPath == generatedZipPath) { Log.d(TAG, "---- uploadCosCompleted ---: $data") - trySend(UploadSuccess) + channel.trySend(UploadSuccess) CosStatusCallbackManager.getInstance().unregister(this) } } @@ -43,7 +44,7 @@ internal class LogRecordUploader : ILogcatUploader { override fun uploadCosFailed(data: CallbackData?) { if (data?.localPath == generatedZipPath) { Log.d(TAG, "---- uploadCosFailed ---: $data") - trySend(UploadError(Reason(data.exception))) + channel.trySend(UploadError(Reason(data.exception))) CosStatusCallbackManager.getInstance().unregister(this) } } @@ -58,8 +59,13 @@ internal class LogRecordUploader : ILogcatUploader { UploadManager.getInstance().uploadSingleFile(generatedZipPath) } catch (t: Throwable) { Log.d(TAG, "---- 上传失败 ---: ${t.message}") - trySend(UploadError(Reason(t.message ?: ""))) + channel.send(UploadError(Reason(t.message ?: ""))) } - }.flowOn(ThreadUtils.getIoPool().asCoroutineDispatcher()).firstOrNull() ?: UploadError(Reason("UnKnown reason")) + val iterator = channel.iterator() + while (iterator.hasNext()) { + val next = iterator.next() + emit(next) + } + }.flowOn(ThreadUtils.getIoPool().asCoroutineDispatcher()).filter { it is UploadError || it == UploadSuccess }.first() } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 0122f7417c..9afcb519c2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -1381,27 +1381,19 @@ internal class DebugSettingView @JvmOverloads constructor( v.visibility = View.INVISIBLE logLoadingView?.visibility = View.VISIBLE v.scope.launch(Dispatchers.IO) { - val file = CallerDevaToolsManager.logcat()?.export() - if (file != null && file.exists()) { - withContext(Dispatchers.Main) { - var activity = AppStateManager.currentActivity() - while (activity == null) { - delay(2000) - activity = AppStateManager.currentActivity() - if (activity != null) { - break - } - } - activity?.startActivity(Intent.createChooser(Intent().also { - it.action = Intent.ACTION_SEND - it.type = "application/zip" - it.putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(activity, "${activity.packageName}.fileProvider", file)) - }, "分享全量日志压缩包到")) - } - } else { - ToastUtils.showShort("全量日志压缩文件生成失败") + var isUploadSuccess = false + try { + CallerDevaToolsManager.logcat()?.upload() + isUploadSuccess = true + } catch (t: Throwable) { + t.printStackTrace() } withContext(Dispatchers.Main) { + if (isUploadSuccess) { + ToastUtils.showShort("上传成功") + } else { + ToastUtils.showShort("上传失败") + } logLoadingView?.visibility = View.INVISIBLE exportAllLogs?.visibility = View.VISIBLE } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index c377837ecb..52650e45ff 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -2246,7 +2246,7 @@ android:layout_gravity="center"> diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java index 12287a8b76..f94abff990 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/MarkerExploreWay.java @@ -145,16 +145,6 @@ public class MarkerExploreWay implements Serializable { return infoId; } - - public int getInfoIdInt() { - try { - return Integer.parseInt(infoId); - } catch (NumberFormatException e) { - e.printStackTrace(); - return -1; - } - } - public void setInfoId(String infoId) { this.infoId = infoId; } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/logcat/IMoGoLogRecordProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/logcat/IMoGoLogRecordProvider.kt index 7d3a906462..8b1956a9fd 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/logcat/IMoGoLogRecordProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/logcat/IMoGoLogRecordProvider.kt @@ -13,6 +13,8 @@ interface IMoGoLogRecordProvider { fun export(): File? + fun upload() + fun testJavaCrash(runOnNewThread: Boolean) fun testNativeCrash(runOnNewThread: Boolean) diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt index c30c2e5f6f..b86812d443 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.widget.media.video +import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet import android.view.Surface @@ -150,8 +151,13 @@ class SimpleVideoPlayer : StandardGSYVideoPlayer { isPostBufferUpdate = false } + @Suppress("SENSELESS_COMPARISON") private var runnable = object :Runnable { override fun run() { + // 外层对象倍回收 延时继续运行 慎重删除 + if(this@SimpleVideoPlayer==null){ + return + } updateTimer++ postDelayed(this, 1000) if (updateTimer >= 3) { diff --git a/gradle/ext.gradle b/gradle/ext.gradle index 3721f7bc2e..2337daae66 100644 --- a/gradle/ext.gradle +++ b/gradle/ext.gradle @@ -2,6 +2,6 @@ ext { gradle_version = '3.5.3' kotlin_plugin_version = '1.5.30' plugin_version = '10.0.0_mogo' - service_chain_version = '5.3.5' + service_chain_version = '5.3.6' lancetx_plugin_version = '10.0.4_mogo' } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4ef3bc47a0..1759321b7d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -56,8 +56,8 @@ include ':test:crashreport' include ':test:crashreport-apmbyte' //OCH 业务模块 -include ':OCH:mogo-och-bus' -include ':OCH:mogo-och-bus-passenger' +include ':OCH:bus:driver' +include ':OCH:bus:passenger' include ':OCH:taxi:driver' include ':OCH:taxi:passenger'