From 0b17fd5ca39ce8245a1ac60cd856aa8aec49a3ef Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 23 Aug 2023 15:37:11 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20[shuttle]=20[=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driver}/.gitignore | 0 .../driver}/build.gradle | 0 .../driver}/consumer-rules.pro | 0 .../driver}/gradle.properties | 0 .../driver}/proguard-rules.pro | 0 .../driver}/src/main/AndroidManifest.xml | 0 .../src/main/java/com/mogo/och/bus/BusProvider.java | 0 .../src/main/java/com/mogo/och/bus/IMogoOCH.java | 0 .../com/mogo/och/bus/bean/BusCloseTaskRequest.java | 0 .../och/bus/bean/BusOperationStatusRequest.java | 0 .../java/com/mogo/och/bus/bean/BusOrderBean.java | 0 .../com/mogo/och/bus/bean/BusOrdersResponse.java | 0 .../och/bus/bean/BusQueryLineStationsRequest.java | 0 .../mogo/och/bus/bean/BusQueryLineTaskResponse.java | 0 .../mogo/och/bus/bean/BusQueryLinesResponse.java | 0 .../bean/BusQueryWriteOffPassengersResponse.java | 0 .../och/bus/bean/BusResetDrivingLineRequest.java | 0 .../och/bus/bean/BusResetLineStatusRequest.java | 0 .../och/bus/bean/BusRoutePlanningUpdateReqBean.java | 0 .../com/mogo/och/bus/bean/BusRoutesResponse.java | 0 .../och/bus/bean/BusUpdateSiteStatusRequest.java | 0 .../bus/bean/BusWriteOffPassengersQueryRequest.java | 0 .../com/mogo/och/bus/bean/CarHeartbeatReqBean.java | 0 .../bus/bean/QueryLeaveAwayPassengersRequest.java | 0 .../bus/bean/QueryLeaveAwayPassengersResponse.java | 0 .../com/mogo/och/bus/bean/WriteOffPassenger.java | 0 .../och/bus/callback/IBusADASStatusCallback.java | 0 .../bus/callback/IBusControllerStatusCallback.java | 0 .../mogo/och/bus/callback/IBusLinesCallback.java | 0 .../mogo/och/bus/callback/IPassengerCallback.java | 0 .../bus/callback/IRefreshBusStationsCallback.java | 0 .../och/bus/callback/ISlidePannelHideCallback.java | 0 .../main/java/com/mogo/och/bus/constant/BusConst.kt | 0 .../mogo/och/bus/fragment/BaseBusTabFragment.java | 0 .../java/com/mogo/och/bus/fragment/BusFragment.java | 0 .../java/com/mogo/och/bus/model/BusLineModel.java | 0 .../java/com/mogo/och/bus/model/OrderModel.java | 0 .../java/com/mogo/och/bus/net/IBascApiService.java | 0 .../com/mogo/och/bus/net/OrderServiceManager.kt | 0 .../java/com/mogo/och/bus/net/login/LoginBusImpl.kt | 0 .../och/bus/net/login/OchCommonServiceManager.kt | 0 .../mogo/och/bus/net/login/OchLoginServiceApi.java | 0 .../mogo/och/bus/presenter/BusLinePresenter.java | 0 .../mogo/och/bus/presenter/BusModelLoopManager.java | 0 .../com/mogo/och/bus/presenter/BusPresenter.java | 0 .../och/bus/receiver/TestBusBroadcastReceiver.java | 0 .../com/mogo/och/bus/ui/BusStationCommonItem.kt | 0 .../com/mogo/och/bus/ui/BusSwitchLineActivity.kt | 0 .../java/com/mogo/och/bus/ui/BusSwitchLineView.java | 0 .../mogo/och/bus/ui/adapter/OpenItemAnimator.java | 0 .../mogo/och/bus/ui/adapter/SwitchLineAdapter.kt | 0 .../och/bus/ui/adapter/SwitchLineTaskAdapter.kt | 0 .../com/mogo/och/bus/util/BDRouteDataTestUtils.java | 0 .../com/mogo/och/bus/util/BusAnalyticsManager.java | 0 .../com/mogo/och/bus/util/BusSendTripInfoManager.kt | 0 .../com/mogo/och/bus/util/BusTrajectoryManager.java | 0 .../main/java/com/mogo/och/bus/view/BusArcView.java | 0 .../mogo/och/bus/view/NoTouchConstraintLayout.java | 0 .../java/com/mogo/och/bus/view/SlidePanelView.java | 0 .../com/mogo/och/bus/view/VerticalDashLineView.java | 0 .../res/color/bus_autopilot_text_color_selector.xml | 0 .../drawable-xhdpi/bus_base_icon_in_autopilot.png | Bin .../bus_base_icon_not_in_autopilot.png | Bin .../res/drawable-xhdpi/bus_base_notice_box_bg.9.png | Bin .../res/drawable-xhdpi/bus_base_slide_block.png | Bin .../drawable-xhdpi/bus_disable_autopilot_icon.png | Bin .../src/main/res/drawable-xhdpi/bus_dot_line.png | Bin .../main/res/drawable-xhdpi/bus_ic_autopilot.png | Bin .../res/drawable-xhdpi/bus_icon_arrived_station.png | Bin .../drawable-xhdpi/bus_icon_arriving_station.png | Bin .../drawable-xhdpi/bus_icon_not_arrive_station.png | Bin .../res/drawable-xhdpi}/bus_light_green_nor.png | Bin .../main/res/drawable-xhdpi}/bus_light_red_nor.png | Bin .../res/drawable-xhdpi}/bus_lightyellow_nor.png | Bin .../main/res/drawable-xhdpi/bus_line_panel_bg.png | Bin .../main/res/drawable-xhdpi/bus_line_panel_bg_1.png | Bin .../main/res/drawable-xhdpi/bus_line_task_arrow.png | Bin .../drawable-xhdpi/bus_loading_autopilot_icon.png | Bin .../main/res/drawable-xhdpi/bus_no_line_icon.png | Bin .../main/res/drawable-xhdpi/bus_och_dot_line.png | Bin .../res/drawable-xhdpi/bus_operation_status_bg.png | Bin .../bus_operation_status_select_bg.png | Bin .../res/drawable-xhdpi/bus_right_autopilot_icon.png | Bin .../main/res/drawable-xhdpi/bus_selected_btn.png | Bin .../main/res/drawable-xhdpi/bus_setting_btn_bg.png | Bin .../res/drawable-xhdpi/bus_switch_line_close.png | Bin .../main/res/drawable-xhdpi/bus_switch_map_long.png | Bin .../res/drawable-xhdpi/bus_switch_map_medium.png | Bin .../main/res/drawable-xhdpi/bus_unselect_btn.png | Bin .../res/drawable-xhdpi/bus_wrong_autopilot_icon.png | Bin .../src/main/res/drawable-xhdpi/end_maker_icon.png | Bin .../src/main/res/drawable-xhdpi/icon_ai_collect.png | Bin .../src/main/res/drawable-xhdpi/icon_ai_normal.png | Bin .../src/main/res/drawable-xhdpi/icon_ai_select.png | Bin .../main/res/drawable-xhdpi/icon_arrow_blue_bus.png | Bin .../res/drawable-xhdpi/icon_arrow_green_bus.png | Bin .../main/res/drawable-xhdpi/icon_arrow_grey_bus.png | Bin .../src/main/res/drawable-xhdpi/icon_bad_case.png | Bin .../res/drawable-xhdpi/icon_bad_case_normal.png | Bin .../res/drawable-xhdpi/icon_bad_case_select.png | Bin .../main/res/drawable-xhdpi/icon_no_bus_line.png | Bin .../main/res/drawable-xhdpi/icon_point_blue_bus.png | Bin .../res/drawable-xhdpi/icon_point_green_bus.png | Bin .../main/res/drawable-xhdpi/icon_point_grey_bus.png | Bin .../res/drawable-xhdpi/icon_station_start_end.png | Bin .../src/main/res/drawable-xhdpi/no_order_data.png | Bin .../src/main/res/drawable-xhdpi/pingxingjiashi.png | Bin .../main/res/drawable-xhdpi/press_start_status.png | Bin .../src/main/res/drawable-xhdpi/start_failure.png | Bin .../main/res/drawable-xhdpi/start_maker_icon.png | Bin .../src/main/res/drawable-xhdpi/start_success.png | Bin .../src/main/res/drawable/ai_collect_selector.xml | 0 .../src/main/res/drawable/bad_case_selector.xml | 0 .../drawable/bg_bus_traffic_light_background.xml | 0 .../res/drawable/bus_autopilot_0_1_status_bg.xml | 0 .../main/res/drawable/bus_autopilot_2_status_bg.xml | 0 .../res/drawable/bus_autopilot_status_bg_check.png | Bin .../res/drawable/bus_autopilot_status_bg_nor.png | Bin .../bus_base_autopilot_status_icon_selector.xml | 0 .../res/drawable/bus_base_icon_in_autopilot.png | Bin .../res/drawable/bus_base_icon_not_in_autopilot.png | Bin .../main/res/drawable/bus_base_notice_box_bg.9.png | Bin .../src/main/res/drawable/bus_base_slide_block.png | Bin .../src/main/res/drawable/bus_checkbox_selector.xml | 0 .../res/drawable/bus_disable_autopilot_icon.png | Bin .../driver}/src/main/res/drawable/bus_dot_line.png | Bin .../src/main/res/drawable/bus_ic_autopilot.png | Bin .../main/res/drawable/bus_icon_arrived_station.png | Bin .../main/res/drawable/bus_icon_arriving_station.png | Bin .../res/drawable/bus_icon_not_arrive_station.png | Bin .../src/main}/res/drawable/bus_light_green_nor.png | Bin .../src/main}/res/drawable/bus_light_red_nor.png | Bin .../src/main}/res/drawable/bus_lightyellow_nor.png | Bin .../drawable/bus_line_dividing_line1_selector.xml | 0 .../drawable/bus_line_dividing_line2_selector.xml | 0 .../src/main/res/drawable/bus_line_panel_bg.png | Bin .../src/main/res/drawable/bus_line_panel_bg_1.png | Bin .../res/drawable/bus_loading_autopilot_icon.png | Bin .../src/main/res/drawable/bus_och_dot_line.png | Bin .../drawable/bus_operation_status_bg_selector.xml | 0 .../src/main/res/drawable/bus_panel_anchor_bkg.xml | 0 .../driver}/src/main/res/drawable/bus_panel_bkg.xml | 0 .../main/res/drawable/bus_right_autopilot_icon.png | Bin .../src/main/res/drawable/bus_selected_btn.png | Bin .../src/main/res/drawable/bus_setting_btn_bg.png | Bin .../res/drawable/bus_setting_tip_red_cir_bg.xml | 0 .../bus_shape_select_line_item_bg_normal.xml | 0 .../bus_shape_select_line_item_bg_selected.xml | 0 .../drawable/bus_shape_select_line_item_time_bg.xml | 0 .../bus_shape_select_line_item_time_bg_selected.xml | 0 .../res/drawable/bus_station_green_dash_line.xml | 0 .../main/res/drawable/bus_station_v_green_dash.xml | 0 .../src/main/res/drawable/bus_switch_line_btn.xml | 0 .../res/drawable/bus_switch_line_btn_commit.xml | 0 .../src/main/res/drawable/bus_switch_line_close.png | Bin .../src/main/res/drawable/bus_switch_map_bg.xml | 0 .../src/main/res/drawable/bus_switch_map_long.png | Bin .../src/main/res/drawable/bus_switch_map_medium.png | Bin .../src/main/res/drawable/bus_task_time_bg.xml | 0 .../src/main/res/drawable/bus_unselect_btn.png | Bin .../main/res/drawable/bus_wrong_autopilot_icon.png | Bin .../main/res/drawable/bus_yi_biao_pan_bg_nor.xml | 0 .../res/drawable/bus_yi_biao_pan_bg_speeding.xml | 0 .../src/main/res/drawable/end_maker_icon.png | Bin .../src/main/res/drawable/icon_ai_normal.png | Bin .../src/main/res/drawable/icon_ai_select.png | Bin .../src/main/res/drawable/icon_arrow_blue_bus.png | Bin .../src/main/res/drawable/icon_arrow_green_bus.png | Bin .../src/main/res/drawable/icon_arrow_grey_bus.png | Bin .../src/main/res/drawable/icon_bad_case_normal.png | Bin .../src/main/res/drawable/icon_bad_case_select.png | Bin .../src/main/res/drawable/icon_no_bus_line.png | Bin .../src/main/res/drawable/icon_point_blue_bus.png | Bin .../src/main/res/drawable/icon_point_green_bus.png | Bin .../src/main/res/drawable/icon_point_grey_bus.png | Bin .../main/res/drawable/icon_station_start_end.png | Bin .../driver}/src/main/res/drawable/no_order_data.png | Bin .../src/main/res/drawable/press_start_status.png | Bin .../driver}/src/main/res/drawable/start_failure.png | Bin .../src/main/res/drawable/start_maker_icon.png | Bin .../driver}/src/main/res/drawable/start_success.png | Bin .../main/res/layout/activity_bus_switch_line.xml | 0 .../src/main/res/layout/bus_base_fragment.xml | 0 .../src/main/res/layout/bus_no_data_common_view.xml | 0 .../src/main/res/layout/bus_no_line_view.xml | 0 .../main/res/layout/bus_stations_common_item.xml | 0 .../main/res/layout/bus_switch_line_list_item.xml | 0 .../res/layout/bus_switch_line_list_task_item.xml | 0 .../src/main/res/layout/bus_test_bar_view.xml | 0 .../src/main/res/layout/fragment_och_bus.xml | 0 .../src/main/res/raw/bus_away_passengers.json | 0 .../driver}/src/main/res/raw/bus_di.mp3 | Bin .../driver}/src/main/res/raw/bus_order_1.json | 0 .../driver}/src/main/res/raw/bus_station_list1.json | 0 .../driver}/src/main/res/raw/bus_station_list2.json | 0 .../driver}/src/main/res/raw/end_marker.nt3d | Bin .../driver}/src/main/res/raw/star_marker.nt3d | Bin .../driver}/src/main/res/values/attrs.xml | 0 .../driver}/src/main/res/values/colors.xml | 0 .../driver}/src/main/res/values/dimens.xml | 0 .../driver}/src/main/res/values/strings.xml | 0 .../driver}/src/main/res/values/style.xml | 0 .../res/xml/bus_switch_line_list_item_scene.xml | 0 .../passenger}/.gitignore | 0 .../passenger}/README.md | 0 .../passenger}/build.gradle | 0 .../passenger}/consumer-rules.pro | 0 .../passenger}/gradle.properties | 0 .../passenger}/proguard-rules.pro | 0 .../och/bus/passenger/ExampleInstrumentedTest.java | 0 .../mogo/och/bus/passenger/MogoOCHBusPassenger.java | 0 .../adapter/BusPassengerLineStationsAdapter.java | 0 .../bean/BusPassengerOperationStatusResponse.java | 0 .../bean/BusPassengerQueryLineRequest.java | 0 .../passenger/bean/BusPassengerRoutesResponse.java | 0 .../passenger/bean/BusPassengerRoutesResult.java | 0 .../och/bus/passenger/bean/BusPassengerStation.java | 0 .../callback/IBusPassegerDriverStatusCallback.java | 0 .../callback/IBusPassengerADASStatusCallback.java | 0 .../IBusPassengerAutopilotPlanningCallback.java | 0 .../IBusPassengerControllerStatusCallback.java | 0 .../callback/IBusPassengerMapViewCallback.java | 0 .../IBusPassengerRouteLineInfoCallback.java | 0 .../och/bus/passenger/model/BusPassengerModel.java | 0 .../network/BusPassengerModelLoopManager.java | 0 .../passenger/network/BusPassengerServiceManager.kt | 0 .../network/ShettlePassengerServiceApi.java | 0 .../presenter/BaseBusPassengerPresenter.java | 0 .../bus/passenger/provider/B1StatusViewManager.java | 0 .../mogo/och/bus/passenger/ui/BusPBlueToothView.kt | 0 .../mogo/och/bus/passenger/ui/BusPStatusBarView.kt | 0 .../bus/passenger/ui/BusPassengerBaseFragment.java | 0 .../passenger/ui/BusPassengerMapDirectionView.java | 0 .../bus/passenger/ui/BusPassengerRouteFragment.java | 0 .../passenger/ui/BusPassengerTrafficLightView.kt | 0 .../passenger/ui/IBusPassengerMapDirectionView.java | 0 .../ui/layoutmanager/CenterLayoutManager.java | 0 .../bus/passenger/ui/widget/BusPTurnLightView.kt | 0 .../bus/passenger/utils/BPRouteDataTestUtils.java | 0 .../src/jinlvvan/res/drawable-nodpi/auto_close.png | Bin .../src/jinlvvan/res/drawable-nodpi/auto_open.png | Bin .../res/drawable-nodpi/bg_bus_p_arrived_station.png | Bin .../res/drawable-nodpi/bg_bus_p_end_tag_bg.png | Bin .../res/drawable-nodpi/bg_bus_p_start_tag_bg.png | Bin .../jinlvvan/res/drawable-nodpi/bus_line_logo.png | Bin .../res/drawable-nodpi/bus_p_arrive_line_blue.png | Bin .../res/drawable-nodpi/bus_p_arrive_line_green.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png | Bin .../res/drawable-nodpi/bus_p_blue_tooth_close.png | Bin .../res/drawable-nodpi/bus_p_blue_tooth_open.png | Bin .../res/drawable-nodpi/bus_p_light_green_nor.png | Bin .../res/drawable-nodpi/bus_p_light_red_nor.png | Bin .../res/drawable-nodpi/bus_p_light_yellow_nor.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_line_blue.png | Bin .../res/drawable-nodpi/bus_p_line_green.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_line_grey.png | Bin .../res/drawable-nodpi/bus_p_map_arrived_point.png | Bin .../res/drawable-nodpi/bus_p_map_arrow_arrived.png | Bin .../drawable-nodpi/bus_p_map_arrow_un_arrive.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_map_car.png | Bin .../res/drawable-nodpi/bus_p_map_end_point.png | Bin .../res/drawable-nodpi/bus_p_map_start_point.png | Bin .../drawable-nodpi/bus_p_map_unarrived_point.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png | Bin .../res/drawable-nodpi/bus_p_no_order_data.png | Bin .../res/drawable-nodpi/bus_p_point_blue.png | Bin .../res/drawable-nodpi/bus_p_point_gray.png | Bin .../res/drawable-nodpi/bus_p_right_route_bg.png | Bin .../jinlvvan/res/drawable-nodpi/bus_p_route_bg.png | Bin .../res/drawable-nodpi/bus_p_status_bar_logo.png | Bin .../res/drawable-nodpi/bus_p_un_auto_nor.png | Bin .../res/drawable-nodpi/bus_p_youzhuan_open.png | Bin .../res/drawable-nodpi/bus_p_youzhuan_un_open.png | Bin .../res/drawable-nodpi/bus_p_zuozhuan_open.png | Bin .../res/drawable-nodpi/bus_p_zuozhuan_un_open.png | Bin .../res/drawable-nodpi/card_split_line_bg.png | Bin .../res/drawable-nodpi/cur_station_arrived_bg.png | Bin .../drawable-nodpi/cur_station_un_arrived_bg.png | Bin .../res/drawable-nodpi/m2_blue_tooth_open.png | Bin .../res/drawable-nodpi/route_line_name_bg.png | Bin .../res/drawable-nodpi/speak_arrived_icon_0.png | Bin .../res/drawable-nodpi/speak_arrived_icon_1.png | Bin .../res/drawable-nodpi/speak_arrived_icon_2.png | Bin .../jinlvvan/res/drawable-nodpi/station_arrow.png | Bin .../res/drawable/bg_bus_p_end_station_circle.xml | 0 .../res/drawable/bg_bus_p_middle_station_circle.xml | 0 .../res/drawable/bg_bus_p_start_station_circle.xml | 0 .../drawable/bg_bus_p_traffic_light_background.xml | 0 .../res/drawable/bg_p_speak_icon_arrived.xml | 0 .../src/jinlvvan/res/drawable/bg_status_bar.xml | 0 .../res/drawable/brakelight_background_daytime.xml | 0 .../res/drawable/bus_p_dividing_line_bg.xml | 0 .../res/drawable/bus_p_panel_cur_station_panel.xml | 0 .../jinlvvan/res/drawable/bus_progress_bar_bg.xml | 0 .../res/drawable/iv_roma_bus_passenger_bg.png | Bin .../res/drawable/iv_roma_bus_passenger_press_bg.png | Bin .../jinlvvan/res/drawable/progress_item_round.xml | 0 .../res/drawable/roma_bus_p_bg_selector.xml | 0 .../src/jinlvvan/res/layout/bus_p_base_fragment.xml | 0 .../src/jinlvvan/res/layout/bus_p_map_view.xml | 0 .../res/layout/bus_p_no_data_common_view.xml | 0 .../jinlvvan/res/layout/bus_p_route_fragment.xml | 0 .../res/layout/bus_p_stations_common_item.xml | 0 .../res/layout/bus_p_traffic_light_view.xml | 0 .../jinlvvan/res/layout/p_bus_view_blue_tooth.xml | 0 .../jinlvvan/res/layout/p_bus_view_status_bar.xml | 0 .../src/jinlvvan/res/layout/view_roma_busp_bg.xml | 0 .../res/layout/view_turn_light_status_daytime.xml | 0 .../passenger}/src/jinlvvan/res/values/colors.xml | 0 .../passenger}/src/jinlvvan/res/values/dimens.xml | 0 .../passenger}/src/jinlvvan/res/values/strings.xml | 0 .../passenger}/src/m2/AndroidManifest.xml | 0 .../passenger}/src/m2/assets/m2_map_style.data | Bin .../src/m2/assets/m2_map_style_extra.data | Bin .../src/m2/java/BPRouteDataTestUtils.java | 0 .../com/mogo/och/bus/passenger/BusPassengerM2.kt | 0 .../passenger/bean/PM2OperationStatusResponse.java | 0 .../och/bus/passenger/bean/PM2QueryLineRequest.java | 0 .../och/bus/passenger/bean/PM2RoutesResponse.java | 0 .../och/bus/passenger/bean/PM2RoutesResult.java | 0 .../com/mogo/och/bus/passenger/bean/PM2Station.java | 0 .../mogo/och/bus/passenger/callback/ADASCallback.kt | 0 .../passenger/callback/AutoPilotStatusCallback.kt | 0 .../bus/passenger/callback/DrivingInfoCallback.kt | 0 .../com/mogo/och/bus/passenger/constant/M2Const.kt | 0 .../mogo/och/bus/passenger/model/PM2ADASModel.kt | 0 .../mogo/och/bus/passenger/model/PM2DrivingModel.kt | 0 .../och/bus/passenger/model/PM2ServiceManager.kt | 0 .../bus/passenger/network/PM2ModelLoopManager.kt | 0 .../och/bus/passenger/network/PM2ServiceApi.java | 0 .../och/bus/passenger/presenter/PM2ADASPresenter.kt | 0 .../bus/passenger/presenter/PM2DrivingPresenter.kt | 0 .../och/bus/passenger/presenter/PM2Presenter.kt | 0 .../bus/passenger/presenter/PM2VideoPresenter.kt | 0 .../bus/passenger/provider/M2StatusViewManager.java | 0 .../mogo/och/bus/passenger/ui/PM2BaseFragment.kt | 0 .../och/bus/passenger/ui/PM2DrivingInfoFragment.kt | 0 .../mogo/och/bus/passenger/ui/PM2HPMapFragment.kt | 0 .../och/bus/passenger/ui/video/PM2VideoFragment.kt | 0 .../och/bus/passenger/ui/widget/M2BlueToothView.kt | 0 .../bus/passenger/ui/widget/M2PTrafficLightView.kt | 0 .../och/bus/passenger/ui/widget/M2StatusBarView.kt | 0 .../och/bus/passenger/ui/widget/M2TurnLightView.kt | 0 .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 0 .../passenger/ui/widget/video/AdvanceImageView.kt | 0 .../ui/widget/video/AdvancePagerAdapter.kt | 0 .../passenger/ui/widget/video/AdvanceVideoView.kt | 0 .../passenger/ui/widget/video/AdvanceViewPager.kt | 0 .../ui/widget/video/ImageAndVideoRotation.kt | 0 .../m2/res/drawable-nodpi/amap_custom_corner_m2.png | Bin .../src/m2/res/drawable-nodpi/auto_button_bg.png | Bin .../m2/res/drawable-nodpi/bg_driving_info_image.png | Bin .../m2/res/drawable-nodpi}/bus_light_green_nor.png | Bin .../m2/res/drawable-nodpi}/bus_light_red_nor.png | Bin .../m2/res/drawable-nodpi}/bus_lightyellow_nor.png | Bin .../src/m2/res/drawable-nodpi/clock_bg.png | Bin .../src/m2/res/drawable-nodpi/img_drive_bg.png | Bin .../src/m2/res/drawable-nodpi/img_line_bg.png | Bin .../src/m2/res/drawable-nodpi/img_time_bg.png | Bin .../m2/res/drawable-nodpi/m2_amap_arrived_road.png | Bin .../m2/res/drawable-nodpi/m2_amap_arriving_road.png | Bin .../src/m2/res/drawable-nodpi/m2_arrived_an_0.png | Bin .../src/m2/res/drawable-nodpi/m2_arrived_an_1.png | Bin .../src/m2/res/drawable-nodpi/m2_arrived_an_2.png | Bin .../m2/res/drawable-nodpi/m2_blue_tooth_close.png | Bin .../m2/res/drawable-nodpi/m2_blue_tooth_open.png | Bin .../src/m2/res/drawable-nodpi/m2_bottom_bg.png | Bin .../m2/res/drawable-nodpi/m2_light_green_nor.png | Bin .../src/m2/res/drawable-nodpi/m2_light_red_nor.png | Bin .../m2/res/drawable-nodpi/m2_light_yellow_nor.png | Bin .../m2/res/drawable-nodpi/m2_line_location_bg.png | Bin .../src/m2/res/drawable-nodpi/m2_map_car_icon.png | Bin .../src/m2/res/drawable-nodpi/m2_map_end_icon.png | Bin .../src/m2/res/drawable-nodpi/m2_map_start_icon.png | Bin .../drawable-nodpi/m2_map_staton_arrived_icon.png | Bin .../m2/res/drawable-nodpi/m2_map_staton_icon.png | Bin .../src/m2/res/drawable-nodpi/m2_p_video_holder.png | Bin .../src/m2/res/drawable-nodpi/m2_sky_bg.png | Bin .../m2/res/drawable-nodpi/m2_status_bar_logo.png | Bin .../m2/res/drawable-nodpi/m2_video_bottom_left.png | Bin .../m2/res/drawable-nodpi/m2_video_bottom_right.png | Bin .../src/m2/res/drawable-nodpi/m2_video_top_left.png | Bin .../m2/res/drawable-nodpi/m2_video_top_right.png | Bin .../src/m2/res/drawable-nodpi/m2_youzhuan_open.png | Bin .../m2/res/drawable-nodpi/m2_youzhuan_un_open.png | Bin .../src/m2/res/drawable-nodpi/m2_zuozhuan_open.png | Bin .../m2/res/drawable-nodpi/m2_zuozhuan_un_open.png | Bin .../m2/res/drawable-nodpi/shuttle_p_card_split.png | Bin .../m2/res/drawable-nodpi/shuttle_p_line_name.png | Bin .../res/drawable-nodpi/shuttle_p_line_noselect.png | Bin .../m2/res/drawable-nodpi/shuttle_p_line_tile.png | Bin .../src/m2/res/drawable/bg_dashed_line.xml | 0 .../m2/res/drawable/bg_driving_arrived_notice.xml | 0 .../res/drawable/bg_driving_distance_lefttime.xml | 0 .../src/m2/res/drawable/bg_driving_info.xml | 0 .../src/m2/res/drawable/bg_driving_selector.xml | 0 .../src/m2/res/drawable/bg_p_m2_arrived_station.xml | 0 .../passenger}/src/m2/res/drawable/bg_p_m2_auto.xml | 0 .../src/m2/res/drawable/bg_p_m2_traffic_light.xml | 0 .../passenger}/src/m2/res/drawable/bg_pnc.xml | 0 .../res/drawable/brakelight_background_daytime.xml | 0 .../src/m2}/res/drawable/bus_light_green_nor.png | Bin .../src/m2}/res/drawable/bus_light_red_nor.png | Bin .../src/m2}/res/drawable/bus_lightyellow_nor.png | Bin .../src/m2/res/drawable/m2_power_seekbar_style.xml | 0 .../src/m2/res/layout/m2_p_traffic_light_view.xml | 0 .../m2/res/layout/p_m2_driving_info_fragment.xml | 0 .../passenger}/src/m2/res/layout/p_m2_fragment.xml | 0 .../src/m2/res/layout/p_m2_hpmap_fragment.xml | 0 .../src/m2/res/layout/p_m2_video_fragment.xml | 0 .../src/m2/res/layout/p_m2_video_view.xml | 0 .../src/m2/res/layout/p_m2_view_blue_tooth.xml | 0 .../src/m2/res/layout/p_m2_view_status_bar.xml | 0 .../res/layout/view_turn_light_status_daytime.xml | 0 .../passenger}/src/m2/res/raw/station_marker.nt3d | Bin .../passenger}/src/m2/res/values/colors.xml | 0 .../passenger}/src/m2/res/values/dimens.xml | 0 .../passenger}/src/m2/res/values/strings.xml | 0 .../passenger}/src/main/AndroidManifest.xml | 0 .../passenger}/src/main/assets/map_style.data | Bin .../passenger}/src/main/assets/map_style_extra.data | Bin .../java/com/mogo/och/bus/passenger/IMogoOCH.java | 0 .../och/bus/passenger/constant/BusPassengerConst.kt | 0 .../utils/BusPassengerMapAssetStyleUtil.java | 0 .../com/mogo/och/bus/passenger/utils/DimenUtil.kt | 0 .../passenger}/src/main/res/raw/bus_di.mp3 | Bin .../com/mogo/och/bus/passenger/ExampleUnitTest.java | 0 app/script/functions/och.gradle | 8 ++++---- settings.gradle | 4 ++-- 430 files changed, 6 insertions(+), 6 deletions(-) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/.gitignore (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/build.gradle (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/consumer-rules.pro (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/gradle.properties (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/proguard-rules.pro (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/AndroidManifest.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/BusProvider.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/IMogoOCH.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/constant/BusConst.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/fragment/BusFragment.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/model/BusLineModel.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/model/OrderModel.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/IBascApiService.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/BusArcView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/SlidePanelView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/color/bus_autopilot_text_color_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_base_slide_block.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_ic_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi => shuttle/driver/src/main/res/drawable-xhdpi}/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi => shuttle/driver/src/main/res/drawable-xhdpi}/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi => shuttle/driver/src/main/res/drawable-xhdpi}/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_line_panel_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_line_task_arrow.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_no_line_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_och_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_operation_status_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_selected_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_switch_line_close.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_switch_map_long.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_switch_map_medium.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_unselect_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/end_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_ai_collect.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_ai_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_ai_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_bad_case.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_bad_case_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_bad_case_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_no_bus_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_point_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_point_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_point_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/icon_station_start_end.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/no_order_data.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/pingxingjiashi.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/press_start_status.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/start_failure.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/start_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable-xhdpi/start_success.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/ai_collect_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bad_case_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bg_bus_traffic_light_background.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_2_status_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_status_bg_check.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_autopilot_status_bg_nor.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_icon_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_icon_not_in_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_notice_box_bg.9.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_base_slide_block.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_checkbox_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_disable_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_ic_autopilot.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_icon_arrived_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_icon_arriving_station.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_icon_not_arrive_station.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2 => shuttle/driver/src/main}/res/drawable/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2 => shuttle/driver/src/main}/res/drawable/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger/src/m2 => shuttle/driver/src/main}/res/drawable/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_dividing_line1_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_dividing_line2_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_panel_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_line_panel_bg_1.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_loading_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_och_dot_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_operation_status_bg_selector.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_panel_anchor_bkg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_panel_bkg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_right_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_selected_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_setting_btn_bg.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_station_green_dash_line.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_station_v_green_dash.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_line_btn.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_line_btn_commit.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_line_close.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_map_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_map_long.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_switch_map_medium.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_task_time_bg.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_unselect_btn.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_wrong_autopilot_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/end_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_ai_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_ai_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_arrow_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_arrow_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_arrow_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_bad_case_normal.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_bad_case_select.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_no_bus_line.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_point_blue_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_point_green_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_point_grey_bus.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/icon_station_start_end.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/no_order_data.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/press_start_status.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/start_failure.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/start_maker_icon.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/drawable/start_success.png (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/activity_bus_switch_line.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_base_fragment.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_no_data_common_view.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_no_line_view.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_stations_common_item.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_switch_line_list_item.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_switch_line_list_task_item.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/bus_test_bar_view.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/layout/fragment_och_bus.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_away_passengers.json (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/driver}/src/main/res/raw/bus_di.mp3 (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_order_1.json (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_station_list1.json (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/bus_station_list2.json (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/end_marker.nt3d (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/raw/star_marker.nt3d (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/attrs.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/colors.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/dimens.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/strings.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/values/style.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/driver}/src/main/res/xml/bus_switch_line_list_item_scene.xml (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/.gitignore (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/README.md (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/build.gradle (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/consumer-rules.pro (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/gradle.properties (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/proguard-rules.pro (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/auto_close.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/auto_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable-nodpi/station_arrow.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bg_status_bar.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/brakelight_background_daytime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/progress_item_round.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_base_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_map_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_route_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_stations_common_item.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/p_bus_view_status_bar.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/view_roma_busp_bg.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/values/colors.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/values/dimens.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/jinlvvan/res/values/strings.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/AndroidManifest.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/assets/m2_map_style.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/assets/m2_map_style_extra.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/BPRouteDataTestUtils.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/auto_button_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/bg_driving_info_image.png (100%) rename OCH/{mogo-och-shuttle/src/main/res/drawable-xhdpi => shuttle/passenger/src/m2/res/drawable-nodpi}/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main/res/drawable-xhdpi => shuttle/passenger/src/m2/res/drawable-nodpi}/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main/res/drawable-xhdpi => shuttle/passenger/src/m2/res/drawable-nodpi}/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/clock_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/img_drive_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/img_line_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/img_time_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_arrived_an_0.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_arrived_an_1.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_arrived_an_2.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_bottom_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_line_location_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_car_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_end_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_start_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_map_staton_icon.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_p_video_holder.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_sky_bg.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_status_bar_logo.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_bottom_left.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_bottom_right.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_top_left.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_video_top_right.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_youzhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_card_split.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_line_name.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_dashed_line.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_arrived_notice.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_distance_lefttime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_info.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_driving_selector.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_p_m2_arrived_station.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_p_m2_auto.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_p_m2_traffic_light.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/bg_pnc.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/brakelight_background_daytime.xml (100%) rename OCH/{mogo-och-shuttle/src/main => shuttle/passenger/src/m2}/res/drawable/bus_light_green_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main => shuttle/passenger/src/m2}/res/drawable/bus_light_red_nor.png (100%) rename OCH/{mogo-och-shuttle/src/main => shuttle/passenger/src/m2}/res/drawable/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/drawable/m2_power_seekbar_style.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/m2_p_traffic_light_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_driving_info_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_hpmap_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_video_fragment.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_video_view.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_view_blue_tooth.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/p_m2_view_status_bar.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/layout/view_turn_light_status_daytime.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/raw/station_marker.nt3d (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/values/colors.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/values/dimens.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/m2/res/values/strings.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/AndroidManifest.xml (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/assets/map_style.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/assets/map_style_extra.data (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt (100%) rename OCH/{mogo-och-shuttle => shuttle/passenger}/src/main/res/raw/bus_di.mp3 (100%) rename OCH/{mogo-och-shuttle-passenger => shuttle/passenger}/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java (100%) diff --git a/OCH/mogo-och-shuttle-passenger/.gitignore b/OCH/shuttle/driver/.gitignore similarity index 100% rename from OCH/mogo-och-shuttle-passenger/.gitignore rename to OCH/shuttle/driver/.gitignore diff --git a/OCH/mogo-och-shuttle/build.gradle b/OCH/shuttle/driver/build.gradle similarity index 100% rename from OCH/mogo-och-shuttle/build.gradle rename to OCH/shuttle/driver/build.gradle diff --git a/OCH/mogo-och-shuttle-passenger/consumer-rules.pro b/OCH/shuttle/driver/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle-passenger/consumer-rules.pro rename to OCH/shuttle/driver/consumer-rules.pro diff --git a/OCH/mogo-och-shuttle/gradle.properties b/OCH/shuttle/driver/gradle.properties similarity index 100% rename from OCH/mogo-och-shuttle/gradle.properties rename to OCH/shuttle/driver/gradle.properties diff --git a/OCH/mogo-och-shuttle-passenger/proguard-rules.pro b/OCH/shuttle/driver/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle-passenger/proguard-rules.pro rename to OCH/shuttle/driver/proguard-rules.pro diff --git a/OCH/mogo-och-shuttle/src/main/AndroidManifest.xml b/OCH/shuttle/driver/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/AndroidManifest.xml rename to OCH/shuttle/driver/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/BusProvider.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/BusProvider.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/IMogoOCH.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/IMogoOCH.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/IMogoOCH.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IPassengerCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/constant/BusConst.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/BusLineModel.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/IBascApiService.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/IBascApiService.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/LoginBusImpl.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusModelLoopManager.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/receiver/TestBusBroadcastReceiver.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusStationCommonItem.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BDRouteDataTestUtils.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/BusArcView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/BusArcView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/SlidePanelView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java similarity index 100% rename from OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java diff --git a/OCH/mogo-och-shuttle/src/main/res/color/bus_autopilot_text_color_selector.xml b/OCH/shuttle/driver/src/main/res/color/bus_autopilot_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/color/bus_autopilot_text_color_selector.xml rename to OCH/shuttle/driver/src/main/res/color/bus_autopilot_text_color_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_slide_block.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_base_slide_block.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_ic_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_ic_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_task_arrow.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_line_task_arrow.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_no_line_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_no_line_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_och_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_och_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_selected_btn.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_selected_btn.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_line_close.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_line_close.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_long.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_long.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_medium.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_switch_map_medium.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_unselect_btn.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_unselect_btn.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/end_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/end_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_collect.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_collect.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_normal.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_ai_select.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_ai_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_normal.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_bad_case_select.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_bad_case_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_no_bus_line.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_no_bus_line.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_point_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/no_order_data.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/no_order_data.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/no_order_data.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/pingxingjiashi.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/pingxingjiashi.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/press_start_status.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/press_start_status.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/press_start_status.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_failure.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_failure.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_failure.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_failure.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_success.png b/OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_success.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/start_success.png rename to OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_success.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/ai_collect_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/ai_collect_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/ai_collect_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/ai_collect_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bad_case_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bad_case_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bad_case_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bad_case_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bg_bus_traffic_light_background.xml b/OCH/shuttle/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bg_bus_traffic_light_background.xml rename to OCH/shuttle/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_2_status_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_2_status_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_check.png b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_check.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_autopilot_status_bg_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_not_in_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_icon_not_in_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_notice_box_bg.9.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_notice_box_bg.9.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_slide_block.png b/OCH/shuttle/driver/src/main/res/drawable/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_base_slide_block.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_base_slide_block.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_checkbox_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_checkbox_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_checkbox_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_checkbox_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_disable_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_disable_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_ic_autopilot.png b/OCH/shuttle/driver/src/main/res/drawable/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_ic_autopilot.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_ic_autopilot.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arrived_station.png b/OCH/shuttle/driver/src/main/res/drawable/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arrived_station.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arriving_station.png b/OCH/shuttle/driver/src/main/res/drawable/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_arriving_station.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_not_arrive_station.png b/OCH/shuttle/driver/src/main/res/drawable/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_icon_not_arrive_station.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_green_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_green_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_red_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_light_red_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_lightyellow_nor.png b/OCH/shuttle/driver/src/main/res/drawable/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bus_lightyellow_nor.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line1_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line1_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line2_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_dividing_line2_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg.png b/OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg_1.png b/OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_line_panel_bg_1.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_loading_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_loading_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_och_dot_line.png b/OCH/shuttle/driver/src/main/res/drawable/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_och_dot_line.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_och_dot_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_operation_status_bg_selector.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_operation_status_bg_selector.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_anchor_bkg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_bkg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_panel_bkg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_panel_bkg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_panel_bkg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_right_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_right_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_selected_btn.png b/OCH/shuttle/driver/src/main/res/drawable/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_selected_btn.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_selected_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_btn_bg.png b/OCH/shuttle/driver/src/main/res/drawable/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_btn_bg.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_green_dash_line.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_station_green_dash_line.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_green_dash_line.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_station_green_dash_line.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_v_green_dash.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_station_v_green_dash.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_station_v_green_dash.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_station_v_green_dash.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_btn_commit.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_close.png b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_line_close.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_line_close.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_long.png b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_long.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_long.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_medium.png b/OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_switch_map_medium.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_switch_map_medium.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_task_time_bg.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_task_time_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_task_time_bg.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_task_time_bg.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_unselect_btn.png b/OCH/shuttle/driver/src/main/res/drawable/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_unselect_btn.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_unselect_btn.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_wrong_autopilot_icon.png b/OCH/shuttle/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_wrong_autopilot_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml b/OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml rename to OCH/shuttle/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/end_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/end_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/end_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_normal.png b/OCH/shuttle/driver/src/main/res/drawable/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_normal.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_ai_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_select.png b/OCH/shuttle/driver/src/main/res/drawable/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_ai_select.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_ai_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_arrow_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_normal.png b/OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_normal.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_normal.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_select.png b/OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_select.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_bad_case_select.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_bad_case_select.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_no_bus_line.png b/OCH/shuttle/driver/src/main/res/drawable/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_no_bus_line.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_no_bus_line.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_blue_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_blue_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_point_blue_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_green_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_green_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_point_green_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_grey_bus.png b/OCH/shuttle/driver/src/main/res/drawable/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_point_grey_bus.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_point_grey_bus.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/icon_station_start_end.png b/OCH/shuttle/driver/src/main/res/drawable/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/icon_station_start_end.png rename to OCH/shuttle/driver/src/main/res/drawable/icon_station_start_end.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/no_order_data.png b/OCH/shuttle/driver/src/main/res/drawable/no_order_data.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/no_order_data.png rename to OCH/shuttle/driver/src/main/res/drawable/no_order_data.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/press_start_status.png b/OCH/shuttle/driver/src/main/res/drawable/press_start_status.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/press_start_status.png rename to OCH/shuttle/driver/src/main/res/drawable/press_start_status.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/start_failure.png b/OCH/shuttle/driver/src/main/res/drawable/start_failure.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/start_failure.png rename to OCH/shuttle/driver/src/main/res/drawable/start_failure.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/start_maker_icon.png b/OCH/shuttle/driver/src/main/res/drawable/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/start_maker_icon.png rename to OCH/shuttle/driver/src/main/res/drawable/start_maker_icon.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/start_success.png b/OCH/shuttle/driver/src/main/res/drawable/start_success.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/start_success.png rename to OCH/shuttle/driver/src/main/res/drawable/start_success.png diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/activity_bus_switch_line.xml b/OCH/shuttle/driver/src/main/res/layout/activity_bus_switch_line.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/activity_bus_switch_line.xml rename to OCH/shuttle/driver/src/main/res/layout/activity_bus_switch_line.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_base_fragment.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_no_data_common_view.xml b/OCH/shuttle/driver/src/main/res/layout/bus_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_no_data_common_view.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_no_data_common_view.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_no_line_view.xml b/OCH/shuttle/driver/src/main/res/layout/bus_no_line_view.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_no_line_view.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_no_line_view.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_stations_common_item.xml b/OCH/shuttle/driver/src/main/res/layout/bus_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_stations_common_item.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_stations_common_item.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_item.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_item.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_item.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_task_item.xml b/OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_task_item.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_switch_line_list_task_item.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_task_item.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml b/OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml rename to OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/fragment_och_bus.xml b/OCH/shuttle/driver/src/main/res/layout/fragment_och_bus.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/layout/fragment_och_bus.xml rename to OCH/shuttle/driver/src/main/res/layout/fragment_och_bus.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_away_passengers.json b/OCH/shuttle/driver/src/main/res/raw/bus_away_passengers.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_away_passengers.json rename to OCH/shuttle/driver/src/main/res/raw/bus_away_passengers.json diff --git a/OCH/mogo-och-shuttle-passenger/src/main/res/raw/bus_di.mp3 b/OCH/shuttle/driver/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/res/raw/bus_di.mp3 rename to OCH/shuttle/driver/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_order_1.json b/OCH/shuttle/driver/src/main/res/raw/bus_order_1.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_order_1.json rename to OCH/shuttle/driver/src/main/res/raw/bus_order_1.json diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list1.json b/OCH/shuttle/driver/src/main/res/raw/bus_station_list1.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list1.json rename to OCH/shuttle/driver/src/main/res/raw/bus_station_list1.json diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list2.json b/OCH/shuttle/driver/src/main/res/raw/bus_station_list2.json similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_station_list2.json rename to OCH/shuttle/driver/src/main/res/raw/bus_station_list2.json diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/end_marker.nt3d b/OCH/shuttle/driver/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/end_marker.nt3d rename to OCH/shuttle/driver/src/main/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/star_marker.nt3d b/OCH/shuttle/driver/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/star_marker.nt3d rename to OCH/shuttle/driver/src/main/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-shuttle/src/main/res/values/attrs.xml b/OCH/shuttle/driver/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/attrs.xml rename to OCH/shuttle/driver/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/colors.xml b/OCH/shuttle/driver/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/colors.xml rename to OCH/shuttle/driver/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/dimens.xml b/OCH/shuttle/driver/src/main/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/dimens.xml rename to OCH/shuttle/driver/src/main/res/values/dimens.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/strings.xml b/OCH/shuttle/driver/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/strings.xml rename to OCH/shuttle/driver/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/values/style.xml b/OCH/shuttle/driver/src/main/res/values/style.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/values/style.xml rename to OCH/shuttle/driver/src/main/res/values/style.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/xml/bus_switch_line_list_item_scene.xml b/OCH/shuttle/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/xml/bus_switch_line_list_item_scene.xml rename to OCH/shuttle/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml diff --git a/OCH/mogo-och-shuttle/.gitignore b/OCH/shuttle/passenger/.gitignore similarity index 100% rename from OCH/mogo-och-shuttle/.gitignore rename to OCH/shuttle/passenger/.gitignore diff --git a/OCH/mogo-och-shuttle-passenger/README.md b/OCH/shuttle/passenger/README.md similarity index 100% rename from OCH/mogo-och-shuttle-passenger/README.md rename to OCH/shuttle/passenger/README.md diff --git a/OCH/mogo-och-shuttle-passenger/build.gradle b/OCH/shuttle/passenger/build.gradle similarity index 100% rename from OCH/mogo-och-shuttle-passenger/build.gradle rename to OCH/shuttle/passenger/build.gradle diff --git a/OCH/mogo-och-shuttle/consumer-rules.pro b/OCH/shuttle/passenger/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle/consumer-rules.pro rename to OCH/shuttle/passenger/consumer-rules.pro diff --git a/OCH/mogo-och-shuttle-passenger/gradle.properties b/OCH/shuttle/passenger/gradle.properties similarity index 100% rename from OCH/mogo-och-shuttle-passenger/gradle.properties rename to OCH/shuttle/passenger/gradle.properties diff --git a/OCH/mogo-och-shuttle/proguard-rules.pro b/OCH/shuttle/passenger/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-shuttle/proguard-rules.pro rename to OCH/shuttle/passenger/proguard-rules.pro diff --git a/OCH/mogo-och-shuttle-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java rename to OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/iv_roma_bus_passenger_press_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/progress_item_round.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/progress_item_round.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/progress_item_round.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/progress_item_round.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml b/OCH/shuttle/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_map_view.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/view_roma_busp_bg.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml b/OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/colors.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/colors.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/values/colors.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/values/dimens.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml b/OCH/shuttle/passenger/src/jinlvvan/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml rename to OCH/shuttle/passenger/src/jinlvvan/res/values/strings.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/AndroidManifest.xml b/OCH/shuttle/passenger/src/m2/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/AndroidManifest.xml rename to OCH/shuttle/passenger/src/m2/AndroidManifest.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data b/OCH/shuttle/passenger/src/m2/assets/m2_map_style.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style.data rename to OCH/shuttle/passenger/src/m2/assets/m2_map_style.data diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data b/OCH/shuttle/passenger/src/m2/assets/m2_map_style_extra.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/assets/m2_map_style_extra.data rename to OCH/shuttle/passenger/src/m2/assets/m2_map_style_extra.data diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/BPRouteDataTestUtils.java b/OCH/shuttle/passenger/src/m2/java/BPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/BPRouteDataTestUtils.java rename to OCH/shuttle/passenger/src/m2/java/BPRouteDataTestUtils.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/bean/PM2Station.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/ADASCallback.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/constant/M2Const.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ADASModel.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/network/PM2ServiceApi.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt rename to OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/auto_button_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/auto_button_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/auto_button_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/auto_button_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bg_driving_info_image.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_green_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_light_red_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/clock_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/clock_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/clock_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/clock_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_drive_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_drive_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_drive_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_drive_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_line_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_line_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_line_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_line_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_time_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_time_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/img_time_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/img_time_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arrived_road.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_amap_arriving_road.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_1.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_2.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_bottom_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_green_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_red_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_light_yellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_car_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_end_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_start_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_arrived_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_map_staton_icon.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_p_video_holder.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_sky_bg.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_youzhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_zuozhuan_un_open.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_card_split.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_noselect.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png rename to OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_dashed_line.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_dashed_line.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_dashed_line.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_dashed_line.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_distance_lefttime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_info.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_info.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_info.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_info.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_selector.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_selector.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_selector.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_driving_selector.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_arrived_station.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_auto.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_auto.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_auto.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_auto.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_pnc.xml b/OCH/shuttle/passenger/src/m2/res/drawable/bg_pnc.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_pnc.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/bg_pnc.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/brakelight_background_daytime.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_green_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_green_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable/bus_light_green_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_red_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_light_red_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable/bus_light_red_nor.png diff --git a/OCH/mogo-och-shuttle/src/main/res/drawable/bus_lightyellow_nor.png b/OCH/shuttle/passenger/src/m2/res/drawable/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/drawable/bus_lightyellow_nor.png rename to OCH/shuttle/passenger/src/m2/res/drawable/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml b/OCH/shuttle/passenger/src/m2/res/drawable/m2_power_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml rename to OCH/shuttle/passenger/src/m2/res/drawable/m2_power_seekbar_style.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml b/OCH/shuttle/passenger/src/m2/res/layout/m2_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml rename to OCH/shuttle/passenger/src/m2/res/layout/m2_p_traffic_light_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_fragment.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_fragment.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_fragment.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_view.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_view.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_video_view.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_video_view.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_status_bar.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml rename to OCH/shuttle/passenger/src/m2/res/layout/p_m2_view_status_bar.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml b/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/layout/view_turn_light_status_daytime.xml rename to OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/raw/station_marker.nt3d b/OCH/shuttle/passenger/src/m2/res/raw/station_marker.nt3d similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/raw/station_marker.nt3d rename to OCH/shuttle/passenger/src/m2/res/raw/station_marker.nt3d diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml b/OCH/shuttle/passenger/src/m2/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml rename to OCH/shuttle/passenger/src/m2/res/values/colors.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/dimens.xml b/OCH/shuttle/passenger/src/m2/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/values/dimens.xml rename to OCH/shuttle/passenger/src/m2/res/values/dimens.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml b/OCH/shuttle/passenger/src/m2/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml rename to OCH/shuttle/passenger/src/m2/res/values/strings.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/main/AndroidManifest.xml b/OCH/shuttle/passenger/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/AndroidManifest.xml rename to OCH/shuttle/passenger/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-shuttle-passenger/src/main/assets/map_style.data b/OCH/shuttle/passenger/src/main/assets/map_style.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/assets/map_style.data rename to OCH/shuttle/passenger/src/main/assets/map_style.data diff --git a/OCH/mogo-och-shuttle-passenger/src/main/assets/map_style_extra.data b/OCH/shuttle/passenger/src/main/assets/map_style_extra.data similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/assets/map_style_extra.data rename to OCH/shuttle/passenger/src/main/assets/map_style_extra.data diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java diff --git a/OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt rename to OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt diff --git a/OCH/mogo-och-shuttle/src/main/res/raw/bus_di.mp3 b/OCH/shuttle/passenger/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-shuttle/src/main/res/raw/bus_di.mp3 rename to OCH/shuttle/passenger/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-shuttle-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java b/OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java similarity index 100% rename from OCH/mogo-och-shuttle-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java rename to OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 3495a4f848..1955e3ce2f 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -27,9 +27,9 @@ project.dependencies { } else if (isCurrentPassenger("charter")) { implementation project.project(':OCH:charter:passenger') } else if (isCurrentDriver("shuttle")) { - implementation project(':OCH:mogo-och-shuttle') + implementation project(':OCH:shuttle:driver') } else if (isCurrentPassenger("shuttle")) { - implementation project.project(':OCH:mogo-och-shuttle-passenger') + implementation project.project(':OCH:shuttle:passenger') } else if (isCurrentDriver("sweeperCloud")) { implementation project.project(':OCH:sweeper:sweeper-cloud') } else if (isCurrentDriver("sweeperOperate")) { @@ -48,8 +48,8 @@ project.dependencies { implementation project.project(':OCH:mogo-och-bus-passenger') implementation project.project(':OCH:charter:driver') implementation project.project(':OCH:charter:passenger') - implementation project.project(':OCH:mogo-och-shuttle') - implementation project.project(':OCH:mogo-och-shuttle-passenger') + implementation project.project(':OCH:shuttle:driver') + implementation project.project(':OCH:shuttle:passenger') implementation project.project(':OCH:sweeper:sweeper-cloud') implementation project.project(':OCH:sweeper:sweeper') implementation project.project(':OCH:taxi:driver') diff --git a/settings.gradle b/settings.gradle index 362f21947d..4ef3bc47a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -76,7 +76,7 @@ include ':OCH:sweeper:sweeper-cloud' include ':OCH:charter:driver' include ':OCH:charter:passenger' -include ':OCH:mogo-och-shuttle' -include ':OCH:mogo-och-shuttle-passenger' +include ':OCH:shuttle:driver' +include ':OCH:shuttle:passenger' include ':core:function-impl:mogo-core-function-patch'