From e3fffc0ac64a333c610dc4444c24dccc9a41a35a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 6 Dec 2023 17:42:09 +0800 Subject: [PATCH] [6.2.4] [bus_p_jl] [mv file] --- OCH/bus/passenger/build.gradle | 20 ++++++++++++++++++ .../bus/passenger/MogoOCHBusPassenger.java | 8 ++----- .../BusPassengerLineStationsAdapter.java | 0 .../BusPassengerOperationStatusResponse.java | 0 .../bean/BusPassengerQueryLineRequest.java | 0 .../bean/BusPassengerRoutesResponse.java | 0 .../bean/BusPassengerRoutesResult.java | 0 .../passenger/bean/BusPassengerStation.java | 0 .../IBusPassegerDriverStatusCallback.java | 0 .../IBusPassengerADASStatusCallback.java | 0 ...BusPassengerAutopilotPlanningCallback.java | 0 ...IBusPassengerControllerStatusCallback.java | 0 .../IBusPassengerMapViewCallback.java | 0 .../IBusPassengerRouteLineInfoCallback.java | 0 .../bus/passenger/model/BusPassengerModel.kt | 0 .../network/BusPassengerModelLoopManager.java | 0 .../network/BusPassengerServiceManager.kt | 0 .../network/PassengerSAASServiceApi.java | 0 .../network/PassengerServiceApi.java | 0 .../presenter/BaseBusPassengerPresenter.java | 0 .../provider/BusPStatusViewManager.java | 0 .../och/bus/passenger/ui/BusPBlueToothView.kt | 2 +- .../och/bus/passenger/ui/BusPStatusBarView.kt | 0 .../ui/BusPassengerBaseFragment.java | 0 .../ui/BusPassengerMapDirectionView.kt | 0 .../ui/BusPassengerRouteFragment.java | 0 .../ui/BusPassengerTrafficLightView.kt | 4 +++- .../ui/IBusPassengerMapDirectionView.java | 0 .../bus/passenger/ui/MapAndLiveVideoView.kt | 0 .../ui/layoutmanager/CenterLayoutManager.java | 0 .../passenger/ui/widget/BusPTurnLightView.kt | 0 .../passenger/utils/BPRouteDataTestUtils.java | 0 .../res/jinlv}/drawable-nodpi/auto_close.png | Bin .../res/jinlv}/drawable-nodpi/auto_open.png | Bin .../bg_bus_p_arrived_station.png | Bin .../drawable-nodpi/bg_bus_p_end_tag_bg.png | Bin .../drawable-nodpi/bg_bus_p_start_tag_bg.png | Bin .../jinlv}/drawable-nodpi/bus_line_logo.png | Bin .../drawable-nodpi/bus_p_arrive_line_blue.png | Bin .../bus_p_arrive_line_green.png | Bin .../jinlv}/drawable-nodpi/bus_p_arrow_nor.png | Bin .../jinlv}/drawable-nodpi/bus_p_auto_nor.png | Bin .../drawable-nodpi/bus_p_blue_tooth_close.png | Bin .../drawable-nodpi/bus_p_blue_tooth_open.png | Bin .../drawable-nodpi/bus_p_light_green_nor.png | Bin .../drawable-nodpi/bus_p_light_red_nor.png | Bin .../drawable-nodpi/bus_p_light_yellow_nor.png | Bin .../jinlv}/drawable-nodpi/bus_p_line_blue.png | Bin .../drawable-nodpi/bus_p_line_green.png | Bin .../jinlv}/drawable-nodpi/bus_p_line_grey.png | Bin .../bus_p_map_arrived_point.png | Bin .../bus_p_map_arrow_arrived.png | Bin .../bus_p_map_arrow_un_arrive.png | Bin .../jinlv}/drawable-nodpi/bus_p_map_car.png | Bin .../drawable-nodpi/bus_p_map_end_point.png | Bin .../drawable-nodpi/bus_p_map_start_point.png | Bin .../bus_p_map_unarrived_point.png | Bin .../jinlv}/drawable-nodpi/bus_p_mogo_nor.png | Bin .../drawable-nodpi/bus_p_no_order_data.png | Bin .../drawable-nodpi/bus_p_point_blue.png | Bin .../drawable-nodpi/bus_p_point_gray.png | Bin .../drawable-nodpi/bus_p_point_green.png | Bin .../drawable-nodpi/bus_p_right_route_bg.png | Bin .../jinlv}/drawable-nodpi/bus_p_route_bg.png | Bin .../drawable-nodpi/bus_p_status_bar_logo.png | Bin .../drawable-nodpi/bus_p_un_auto_nor.png | Bin .../drawable-nodpi/bus_p_youzhuan_open.png | Bin .../drawable-nodpi/bus_p_youzhuan_un_open.png | Bin .../drawable-nodpi/bus_p_zuozhuan_open.png | Bin .../drawable-nodpi/bus_p_zuozhuan_un_open.png | Bin .../drawable-nodpi/card_split_line_bg.png | Bin .../drawable-nodpi/cur_station_arrived_bg.png | Bin .../cur_station_un_arrived_bg.png | Bin .../drawable-nodpi/icon_video_close.png | Bin .../jinlv}/drawable-nodpi/icon_video_open.png | Bin .../drawable-nodpi/live_view_loading_bg.png | Bin .../drawable-nodpi/m2_blue_tooth_open.png | Bin .../drawable-nodpi/route_line_name_bg.png | Bin .../drawable-nodpi/speak_arrived_icon_0.png | Bin .../drawable-nodpi/speak_arrived_icon_1.png | Bin .../drawable-nodpi/speak_arrived_icon_2.png | Bin .../jinlv}/drawable-nodpi/station_arrow.png | Bin .../drawable/bg_bus_p_end_station_circle.xml | 0 .../bg_bus_p_middle_station_circle.xml | 0 .../bg_bus_p_start_station_circle.xml | 0 .../bg_bus_p_traffic_light_background.xml | 0 .../drawable/bg_p_speak_icon_arrived.xml | 0 .../res/jinlv}/drawable/bg_status_bar.xml | 0 .../res/jinlv}/drawable/bottom_radius_bg.xml | 0 .../brakelight_background_daytime.xml | 0 .../drawable/bus_p_dividing_line_bg.xml | 0 .../bus_p_panel_cur_station_panel.xml | 0 .../jinlv}/drawable/bus_p_roma_checked.png | Bin .../res/jinlv}/drawable/bus_p_roma_normal.png | Bin .../jinlv}/drawable/bus_progress_bar_bg.xml | 0 .../res/jinlv}/drawable/indicator_select.xml | 0 .../jinlv}/drawable/indicator_unselect.xml | 0 .../jinlv}/drawable/progress_item_round.xml | 0 .../drawable/roma_bus_p_bg_selector.xml | 0 .../jinlv}/drawable/video_btn_selector.xml | 0 .../res/jinlv}/layout/bus_p_base_fragment.xml | 0 .../layout/bus_p_driver_monitor_view.xml | 0 .../res/jinlv}/layout/bus_p_map_view.xml | 0 .../layout/bus_p_no_data_common_view.xml | 0 .../jinlv}/layout/bus_p_route_fragment.xml | 0 .../layout/bus_p_stations_common_item.xml | 0 .../layout/bus_p_traffic_light_view.xml | 0 .../jinlv}/layout/p_bus_view_blue_tooth.xml | 0 .../jinlv}/layout/p_bus_view_status_bar.xml | 0 .../layout/view_turn_light_status_daytime.xml | 0 .../res => main/res/jinlv}/values/colors.xml | 0 .../res => main/res/jinlv}/values/dimens.xml | 0 .../res => main/res/jinlv}/values/strings.xml | 0 .../passenger/ExampleInstrumentedTest.java | 0 .../och/bus => }/passenger/ExampleUnitTest.kt | 0 .../{com/mogo/och/bus => }/passenger/Model.kt | 0 .../mogo/och/bus => }/passenger/ModelX.kt | 0 .../passenger/ExampleInstrumentedTest.java | 0 .../bean/PM2OperationStatusResponse.java | 0 .../passenger/bean/PM2QueryLineRequest.java | 0 .../passenger/bean/PM2RoutesResponse.java | 0 .../passenger/bean/PM2RoutesResult.java | 0 .../bus => }/passenger/bean/PM2Station.java | 0 .../passenger/callback/ADASCallback.kt | 0 .../callback/AutoPilotStatusCallback.kt | 0 .../passenger/callback/DrivingInfoCallback.kt | 0 .../bus => }/passenger/constant/M2Const.kt | 0 .../bus => }/passenger/model/PM2ADASModel.kt | 0 .../passenger/model/PM2DrivingModel.kt | 0 .../passenger/model/PM2ServiceManager.kt | 0 .../passenger/network/PM2ModelLoopManager.kt | 0 .../passenger/network/PM2ServiceApi.java | 0 .../passenger/presenter/PM2ADASPresenter.kt | 0 .../presenter/PM2DrivingPresenter.kt | 0 .../passenger/presenter/PM2Presenter.kt | 0 .../passenger/presenter/PM2VideoPresenter.kt | 0 .../provider/M2StatusViewManager.java | 0 .../bus => }/passenger/ui/PM2BaseFragment.kt | 0 .../passenger/ui/PM2DrivingInfoFragment.kt | 0 .../bus => }/passenger/ui/PM2HPMapFragment.kt | 0 .../passenger/ui/video/PM2VideoFragment.kt | 0 .../passenger/ui/widget/M2BlueToothView.kt | 0 .../ui/widget/M2PTrafficLightView.kt | 0 .../passenger/ui/widget/M2StatusBarView.kt | 0 .../passenger/ui/widget/M2TurnLightView.kt | 0 .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 0 .../ui/widget/video/AdvanceImageView.kt | 0 .../ui/widget/video/AdvancePagerAdapter.kt | 0 .../ui/widget/video/AdvanceVideoView.kt | 0 .../ui/widget/video/AdvanceViewPager.kt | 0 .../ui/widget/video/ImageAndVideoRotation.kt | 0 .../mogo/och/bus => }/passenger/IMogoOCH.java | 0 .../passenger/MogoOCHShuttlePassenger.kt | 0 .../passenger/constant/BusPassengerConst.kt | 0 .../utils/BusPassengerMapAssetStyleUtil.java | 0 .../och/bus => }/passenger/utils/DimenUtil.kt | 0 .../bus => }/passenger/ExampleUnitTest.java | 0 157 files changed, 26 insertions(+), 8 deletions(-) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java (95%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/bean/BusPassengerStation.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/model/BusPassengerModel.kt (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/network/PassengerServiceApi.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt (93%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt (95%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt (100%) rename OCH/bus/passenger/src/{jinlvvan/java => main/java/jinlv}/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/auto_close.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/auto_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bg_bus_p_arrived_station.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bg_bus_p_end_tag_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bg_bus_p_start_tag_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_line_logo.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_arrive_line_blue.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_arrive_line_green.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_arrow_nor.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_auto_nor.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_blue_tooth_close.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_blue_tooth_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_light_green_nor.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_light_red_nor.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_light_yellow_nor.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_line_blue.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_line_green.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_line_grey.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_map_arrived_point.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_map_arrow_arrived.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_map_arrow_un_arrive.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_map_car.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_map_end_point.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_map_start_point.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_map_unarrived_point.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_mogo_nor.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_no_order_data.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_point_blue.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_point_gray.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_point_green.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_right_route_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_route_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_status_bar_logo.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_un_auto_nor.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_youzhuan_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_youzhuan_un_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_zuozhuan_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/bus_p_zuozhuan_un_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/card_split_line_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/cur_station_arrived_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/cur_station_un_arrived_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/icon_video_close.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/icon_video_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/live_view_loading_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/m2_blue_tooth_open.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/route_line_name_bg.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/speak_arrived_icon_0.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/speak_arrived_icon_1.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/speak_arrived_icon_2.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/station_arrow.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bg_bus_p_end_station_circle.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bg_bus_p_middle_station_circle.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bg_bus_p_start_station_circle.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bg_bus_p_traffic_light_background.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bg_p_speak_icon_arrived.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bg_status_bar.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bottom_radius_bg.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/brakelight_background_daytime.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bus_p_dividing_line_bg.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bus_p_panel_cur_station_panel.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bus_p_roma_checked.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bus_p_roma_normal.png (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/bus_progress_bar_bg.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/indicator_select.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/indicator_unselect.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/progress_item_round.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/roma_bus_p_bg_selector.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/video_btn_selector.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/bus_p_base_fragment.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/bus_p_driver_monitor_view.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/bus_p_map_view.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/bus_p_no_data_common_view.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/bus_p_route_fragment.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/bus_p_stations_common_item.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/bus_p_traffic_light_view.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/p_bus_view_blue_tooth.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/p_bus_view_status_bar.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/view_turn_light_status_daytime.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/values/colors.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/values/dimens.xml (100%) rename OCH/bus/passenger/src/{jinlvvan/res => main/res/jinlv}/values/strings.xml (100%) rename OCH/charter/passenger/src/androidTest/java/{com/mogo/och/bus => }/passenger/ExampleInstrumentedTest.java (100%) rename OCH/charter/passenger/src/test/java/{com/mogo/och/bus => }/passenger/ExampleUnitTest.kt (100%) rename OCH/charter/passenger/src/test/java/{com/mogo/och/bus => }/passenger/Model.kt (100%) rename OCH/charter/passenger/src/test/java/{com/mogo/och/bus => }/passenger/ModelX.kt (100%) rename OCH/shuttle/passenger/src/androidTest/java/{com/mogo/och/bus => }/passenger/ExampleInstrumentedTest.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/bean/PM2OperationStatusResponse.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/bean/PM2QueryLineRequest.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/bean/PM2RoutesResponse.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/bean/PM2RoutesResult.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/bean/PM2Station.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/callback/ADASCallback.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/callback/AutoPilotStatusCallback.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/callback/DrivingInfoCallback.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/constant/M2Const.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/model/PM2ADASModel.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/model/PM2DrivingModel.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/model/PM2ServiceManager.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/network/PM2ModelLoopManager.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/network/PM2ServiceApi.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/presenter/PM2ADASPresenter.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/presenter/PM2DrivingPresenter.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/presenter/PM2Presenter.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/presenter/PM2VideoPresenter.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/provider/M2StatusViewManager.java (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/PM2BaseFragment.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/PM2DrivingInfoFragment.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/PM2HPMapFragment.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/video/PM2VideoFragment.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/M2BlueToothView.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/M2PTrafficLightView.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/M2StatusBarView.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/M2TurnLightView.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/video/AdvanceImageView.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/video/AdvancePagerAdapter.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/video/AdvanceVideoView.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/video/AdvanceViewPager.kt (100%) rename OCH/shuttle/passenger/src/main/java/m2/{com/mogo/och/bus => }/passenger/ui/widget/video/ImageAndVideoRotation.kt (100%) rename OCH/shuttle/passenger/src/main/java/{com/mogo/och/bus => }/passenger/IMogoOCH.java (100%) rename OCH/shuttle/passenger/src/main/java/{com/mogo/och/bus => }/passenger/MogoOCHShuttlePassenger.kt (100%) rename OCH/shuttle/passenger/src/main/java/{com/mogo/och/bus => }/passenger/constant/BusPassengerConst.kt (100%) rename OCH/shuttle/passenger/src/main/java/{com/mogo/och/bus => }/passenger/utils/BusPassengerMapAssetStyleUtil.java (100%) rename OCH/shuttle/passenger/src/main/java/{com/mogo/och/bus => }/passenger/utils/DimenUtil.kt (100%) rename OCH/shuttle/passenger/src/test/java/{com/mogo/och/bus => }/passenger/ExampleUnitTest.java (100%) diff --git a/OCH/bus/passenger/build.gradle b/OCH/bus/passenger/build.gradle index 052dd90c20..2c836f13b4 100644 --- a/OCH/bus/passenger/build.gradle +++ b/OCH/bus/passenger/build.gradle @@ -44,6 +44,21 @@ android { } } + sourceSets { + main { + res.srcDirs = [ + 'src/main/res', + 'src/main/res/m2', + 'src/main/res/jinlv', + ] + java.srcDirs = [ + 'src/main/java', + 'src/main/java/m2', + 'src/main/java/jinlv', + ] + } + } + flavorDimensions "vehicle" productFlavors { // 车型：金旅星辰、开沃 小巴业务 @@ -51,6 +66,11 @@ android { dimension "vehicle" buildConfigField 'int', 'NEW_TEST', '0' } + // 车型：金旅m1 小巴业务 + m2 { + dimension "vehicle" + buildConfigField 'int', 'NEW_TEST', '1' + } } } diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java similarity index 95% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index cf1643aa61..f7c7c47bf2 100644 --- a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentManager; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.config.FunctionBuildConfig; +import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; @@ -28,18 +29,13 @@ import org.jetbrains.annotations.Nullable; * Created on 2022/3/29 */ @Route(path = BusPassengerConst.PATH) -public class MogoOCHBusPassenger implements IMogoOCH { +public class MogoOCHBusPassenger implements IMoGoFunctionProvider { private static final String TAG = MogoOCHBusPassenger.class.getSimpleName(); private FragmentActivity mActivity; private int mContainerId; private BusPassengerRouteFragment mPassengerFragment; - @Override - public void createCoverage(FragmentActivity activity, int containerId) { - - } - @Nullable @Override public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) { diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerStation.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/bean/BusPassengerStation.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerServiceApi.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/network/PassengerServiceApi.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/provider/BusPStatusViewManager.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt similarity index 93% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt index ac8504e5dd..8e4fef8281 100644 --- a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt @@ -7,7 +7,7 @@ import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.jinlvvan.p_bus_view_blue_tooth.view.* +import kotlinx.android.synthetic.main.p_bus_view_blue_tooth.view.blueView /** * 魔戒蓝牙控件 diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt similarity index 95% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt index 67fbc4b554..13f3a349df 100644 --- a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt @@ -10,7 +10,9 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListen import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.jinlvvan.bus_p_traffic_light_view.view.* +import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_bg +import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_iv +import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.bus_p_traffic_light_time_tv /** * bus乘客端：红绿灯view diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/MapAndLiveVideoView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt diff --git a/OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java rename to OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_close.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_close.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_close.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/auto_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/auto_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_arrived_station.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_arrived_station.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_arrived_station.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_end_tag_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_end_tag_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_end_tag_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_start_tag_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bg_bus_p_start_tag_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bg_bus_p_start_tag_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_line_logo.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_line_logo.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_line_logo.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_blue.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_blue.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_blue.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_green.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrive_line_green.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrive_line_green.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrow_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_arrow_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_arrow_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_auto_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_auto_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_auto_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_close.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_close.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_close.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_blue_tooth_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_blue_tooth_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_green_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_green_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_green_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_red_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_red_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_red_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_yellow_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_light_yellow_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_light_yellow_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_blue.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_blue.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_blue.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_green.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_green.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_green.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_grey.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_line_grey.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_line_grey.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrived_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrived_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrived_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_arrived.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_arrived.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_arrived.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_arrow_un_arrive.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_car.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_car.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_car.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_end_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_end_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_end_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_start_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_start_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_start_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_unarrived_point.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_map_unarrived_point.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_map_unarrived_point.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_mogo_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_mogo_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_mogo_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_no_order_data.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_no_order_data.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_no_order_data.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_blue.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_blue.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_blue.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_gray.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_gray.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_gray.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_green.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_point_green.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_point_green.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_right_route_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_right_route_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_route_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_route_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_route_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_status_bar_logo.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_status_bar_logo.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_status_bar_logo.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_un_auto_nor.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_un_auto_nor.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_un_auto_nor.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_un_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_youzhuan_un_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_un_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/bus_p_zuozhuan_un_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/card_split_line_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/card_split_line_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/card_split_line_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_arrived_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_arrived_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_arrived_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_un_arrived_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/cur_station_un_arrived_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/cur_station_un_arrived_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_close.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_close.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_close.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/icon_video_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/icon_video_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/live_view_loading_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/live_view_loading_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/live_view_loading_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/m2_blue_tooth_open.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/m2_blue_tooth_open.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/m2_blue_tooth_open.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/route_line_name_bg.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/route_line_name_bg.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/route_line_name_bg.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_0.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_0.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_0.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_1.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_1.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_1.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_2.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/speak_arrived_icon_2.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/speak_arrived_icon_2.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png b/OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/station_arrow.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable-nodpi/station_arrow.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable-nodpi/station_arrow.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_end_station_circle.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_end_station_circle.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_end_station_circle.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_middle_station_circle.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_middle_station_circle.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_start_station_circle.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_start_station_circle.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_start_station_circle.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_traffic_light_background.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_bus_p_traffic_light_background.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_bus_p_traffic_light_background.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_p_speak_icon_arrived.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_p_speak_icon_arrived.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_p_speak_icon_arrived.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bg_status_bar.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bg_status_bar.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bg_status_bar.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bottom_radius_bg.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bottom_radius_bg.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bottom_radius_bg.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/brakelight_background_daytime.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/brakelight_background_daytime.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_dividing_line_bg.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_dividing_line_bg.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_panel_cur_station_panel.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_panel_cur_station_panel.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_checked.png b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_checked.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_checked.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_checked.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_normal.png b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_normal.png similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_p_roma_normal.png rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_p_roma_normal.png diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/bus_progress_bar_bg.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/bus_progress_bar_bg.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/bus_progress_bar_bg.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_select.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_select.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_select.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_select.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_unselect.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_unselect.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/indicator_unselect.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/indicator_unselect.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/progress_item_round.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/progress_item_round.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/progress_item_round.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/progress_item_round.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/roma_bus_p_bg_selector.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/roma_bus_p_bg_selector.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/roma_bus_p_bg_selector.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/drawable/video_btn_selector.xml b/OCH/bus/passenger/src/main/res/jinlv/drawable/video_btn_selector.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/drawable/video_btn_selector.xml rename to OCH/bus/passenger/src/main/res/jinlv/drawable/video_btn_selector.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_driver_monitor_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_driver_monitor_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_driver_monitor_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_map_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_map_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_map_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_no_data_common_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_no_data_common_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_stations_common_item.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_stations_common_item.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_traffic_light_view.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/bus_p_traffic_light_view.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_traffic_light_view.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_blue_tooth.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_blue_tooth.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_blue_tooth.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/p_bus_view_status_bar.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/p_bus_view_status_bar.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/view_turn_light_status_daytime.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml rename to OCH/bus/passenger/src/main/res/jinlv/layout/view_turn_light_status_daytime.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/values/colors.xml b/OCH/bus/passenger/src/main/res/jinlv/values/colors.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/values/colors.xml rename to OCH/bus/passenger/src/main/res/jinlv/values/colors.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/values/dimens.xml b/OCH/bus/passenger/src/main/res/jinlv/values/dimens.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/values/dimens.xml rename to OCH/bus/passenger/src/main/res/jinlv/values/dimens.xml diff --git a/OCH/bus/passenger/src/jinlvvan/res/values/strings.xml b/OCH/bus/passenger/src/main/res/jinlv/values/strings.xml similarity index 100% rename from OCH/bus/passenger/src/jinlvvan/res/values/strings.xml rename to OCH/bus/passenger/src/main/res/jinlv/values/strings.xml diff --git a/OCH/charter/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/charter/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/charter/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/charter/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java diff --git a/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt b/OCH/charter/passenger/src/test/java/passenger/ExampleUnitTest.kt similarity index 100% rename from OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt rename to OCH/charter/passenger/src/test/java/passenger/ExampleUnitTest.kt diff --git a/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt b/OCH/charter/passenger/src/test/java/passenger/Model.kt similarity index 100% rename from OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt rename to OCH/charter/passenger/src/test/java/passenger/Model.kt diff --git a/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt b/OCH/charter/passenger/src/test/java/passenger/ModelX.kt similarity index 100% rename from OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt rename to OCH/charter/passenger/src/test/java/passenger/ModelX.kt diff --git a/OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/shuttle/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/shuttle/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/shuttle/passenger/src/androidTest/java/passenger/ExampleInstrumentedTest.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java b/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2OperationStatusResponse.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2OperationStatusResponse.java rename to OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2OperationStatusResponse.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java b/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2QueryLineRequest.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2QueryLineRequest.java rename to OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2QueryLineRequest.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java b/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResponse.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2RoutesResponse.java rename to OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResponse.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java b/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResult.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2RoutesResult.java rename to OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2RoutesResult.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2Station.java b/OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2Station.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/bean/PM2Station.java rename to OCH/shuttle/passenger/src/main/java/m2/passenger/bean/PM2Station.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/callback/ADASCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/ADASCallback.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/callback/ADASCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/callback/ADASCallback.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/AutoPilotStatusCallback.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/callback/AutoPilotStatusCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/callback/AutoPilotStatusCallback.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/callback/DrivingInfoCallback.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/callback/DrivingInfoCallback.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/constant/M2Const.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/constant/M2Const.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/constant/M2Const.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/model/PM2ADASModel.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ADASModel.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/model/PM2ADASModel.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ADASModel.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2DrivingModel.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2DrivingModel.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ServiceManager.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/model/PM2ServiceManager.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/model/PM2ServiceManager.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ModelLoopManager.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/network/PM2ModelLoopManager.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ModelLoopManager.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/network/PM2ServiceApi.java b/OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ServiceApi.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/network/PM2ServiceApi.java rename to OCH/shuttle/passenger/src/main/java/m2/passenger/network/PM2ServiceApi.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2ADASPresenter.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2ADASPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2ADASPresenter.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2DrivingPresenter.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2DrivingPresenter.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2Presenter.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2Presenter.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2VideoPresenter.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/presenter/PM2VideoPresenter.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/presenter/PM2VideoPresenter.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java b/OCH/shuttle/passenger/src/main/java/m2/passenger/provider/M2StatusViewManager.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java rename to OCH/shuttle/passenger/src/main/java/m2/passenger/provider/M2StatusViewManager.java diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2BaseFragment.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2BaseFragment.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2DrivingInfoFragment.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2DrivingInfoFragment.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2HPMapFragment.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/PM2HPMapFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/PM2HPMapFragment.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/video/PM2VideoFragment.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/video/PM2VideoFragment.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2BlueToothView.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2BlueToothView.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2PTrafficLightView.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2PTrafficLightView.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2StatusBarView.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2StatusBarView.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2TurnLightView.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/M2TurnLightView.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceImageView.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceImageView.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceImageView.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvancePagerAdapter.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvancePagerAdapter.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceVideoView.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceVideoView.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceViewPager.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/AdvanceViewPager.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/AdvanceViewPager.kt diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt b/OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/ImageAndVideoRotation.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/bus/passenger/ui/widget/video/ImageAndVideoRotation.kt rename to OCH/shuttle/passenger/src/main/java/m2/passenger/ui/widget/video/ImageAndVideoRotation.kt diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/shuttle/passenger/src/main/java/passenger/IMogoOCH.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java rename to OCH/shuttle/passenger/src/main/java/passenger/IMogoOCH.java diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt b/OCH/shuttle/passenger/src/main/java/passenger/MogoOCHShuttlePassenger.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHShuttlePassenger.kt rename to OCH/shuttle/passenger/src/main/java/passenger/MogoOCHShuttlePassenger.kt diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/shuttle/passenger/src/main/java/passenger/constant/BusPassengerConst.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt rename to OCH/shuttle/passenger/src/main/java/passenger/constant/BusPassengerConst.kt diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/shuttle/passenger/src/main/java/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 100% rename from OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/shuttle/passenger/src/main/java/passenger/utils/BusPassengerMapAssetStyleUtil.java diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt b/OCH/shuttle/passenger/src/main/java/passenger/utils/DimenUtil.kt similarity index 100% rename from OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/utils/DimenUtil.kt rename to OCH/shuttle/passenger/src/main/java/passenger/utils/DimenUtil.kt diff --git a/OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java b/OCH/shuttle/passenger/src/test/java/passenger/ExampleUnitTest.java similarity index 100% rename from OCH/shuttle/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.java rename to OCH/shuttle/passenger/src/test/java/passenger/ExampleUnitTest.java