From a3b595703e446682e02dcae0570c4f774937438a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 10 Aug 2023 20:42:30 +0800 Subject: [PATCH] =?UTF-8?q?[5.0.0]=20[=E5=8C=85=E8=BD=A6moudle=E4=BF=AE?= =?UTF-8?q?=E6=94=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/driverm1/AndroidManifest.xml | 0 .../com/magic/mogo/och/charter/CharterProvider.kt | 0 .../och/charter/bean/CheckOrderCountDownResponse.kt | 0 .../och/charter/bean/QueryBusinessStatusResponse.kt | 0 .../och/charter/bean/QueryCurrentOrderResponse.kt | 0 .../mogo/och/charter/bean/QueryRoutesResponse.kt | 0 .../mogo/och/charter/bean/RequestChangeDest.kt | 0 .../java/com/magic/mogo/och/charter/bean/Station.kt | 0 .../mogo/och/charter/bean/WriteOffPassenger.java | 0 .../mogo/och/charter/callback/ChangeDestCallback.kt | 0 .../och/charter/callback/DriverM1OrderCallback.kt | 0 .../callback/IDriverM1ControllerStatusCallback.kt | 0 .../mogo/och/charter/fragment/DriverM1Fragment.kt | 0 .../charter/manager/CharterAnalyticsManager.java | 0 .../och/charter/manager/CharterTrajectoryManager.kt | 0 .../mogo/och/charter/model/DriverM1LooperManager.kt | 0 .../magic/mogo/och/charter/model/DriverM1Model.kt | 0 .../mogo/och/charter/net/DriverM1ServiceManager.kt | 0 .../magic/mogo/och/charter/net/IDriverM1Service.kt | 0 .../mogo/och/charter/net/login/LoginDriverM1Impl.kt | 0 .../charter/net/login/OchCommonServiceManager.kt | 0 .../och/charter/net/login/OchLoginServiceApi.java | 0 .../mogo/och/charter/presenter/DriverM1Presenter.kt | 0 .../magic/mogo/och/charter/view/SlidePanelView.kt | 0 .../src/driverm1/res/layout/bus_no_line_view.xml | 0 .../src/driverm1/res/layout/fragment_driver_m1.xml | 0 .../src/driverm1/res/raw/bus_away_passengers.json | 0 .../driver}/src/driverm1/res/raw/bus_order_1.json | 0 .../src/driverm1/res/raw/bus_station_list1.json | 0 .../src/driverm1/res/raw/bus_station_list2.json | 0 .../driver}/src/driverm1/res/raw/end_marker.nt3d | Bin .../driver}/src/driverm1/res/raw/m1_voice_di.mp3 | Bin .../driver}/src/driverm1/res/raw/star_marker.nt3d | Bin .../driver}/src/driverm1/res/values/attrs.xml | 0 .../driver}/src/driverm1/res/values/colors.xml | 0 .../driver}/src/driverm1/res/values/strings.xml | 0 .../res/xml/bus_switch_line_list_item_scene.xml | 0 .../driver}/src/main/AndroidManifest.xml | 0 .../com/magic/mogo/och/charter/ICharterOCH.java | 0 .../mogo/och/charter/base/CharterBaseFragment.kt | 0 .../magic/mogo/och/charter/constant/CharterConst.kt | 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 .../main/res/drawable-xhdpi/bus_light_green_nor.png | Bin .../main/res/drawable-xhdpi/bus_light_red_nor.png | Bin .../main/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 .../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 .../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_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_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 .../src/main/res/layout/bus_test_bar_view.xml | 0 .../src/main/res/layout/bus_traffic_light_view.xml | 0 .../src/main/res/layout/charter_base_fragment.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 .../com/magic/mogo/och/charter/ExampleUnitTest.kt | 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 .../passenger}/src/main/AndroidManifest.xml | 0 .../passenger}/src/main/assets/m1_style.data | Bin .../passenger}/src/main/assets/m1_style_extra.data | Bin .../java/com/mogo/och/bus/passenger/IMogoOCH.java | 0 .../mogo/och/bus/passenger/MogoOCHBusPassenger.kt | 0 .../bus/passenger/bean/TaxiPassengerVideoPlay.java | 0 .../com/mogo/och/bus/passenger/bean/Temperature.kt | 0 .../mogo/och/bus/passenger/bean/event/DebugView.kt | 0 .../och/bus/passenger/bean/event/EventLineSites.kt | 0 .../bus/passenger/bean/request/ArriveDestRequest.kt | 0 .../bean/request/BusPassengerQueryLineRequest.java | 0 .../bus/passenger/bean/request/EndOrderRequest.kt | 0 .../bean/response/BusinessStatusResponse.kt | 0 .../passenger/bean/response/BusinessTimeResponse.kt | 0 .../passenger/bean/response/LineInfoListResponse.kt | 0 .../bus/passenger/bean/response/LineInfoResponse.kt | 0 .../bus/passenger/bean/response/LocusResponse.kt | 0 .../bean/response/M1DriverLoginStatusResponse.kt | 0 .../passenger/bean/response/OrderInfoResponse.kt | 0 .../bus/passenger/bean/response/SiteInfoResponse.kt | 0 .../passenger/bean/response/TrajectoriesResponse.kt | 0 .../IBusPassengerControllerStatusCallback.java | 0 .../ICharterPassengerAutoStatusChangeCallback.kt | 0 .../och/bus/passenger/callback/IDistanceCallback.kt | 0 .../bus/passenger/callback/IOrderChangeCallback.kt | 0 .../och/bus/passenger/callback/ITimeCallback.kt | 0 .../bus/passenger/constant/CharterPassengerConst.kt | 0 .../bus/passenger/model/CharterPassengerModel.kt | 0 .../mogo/och/bus/passenger/model/OrderStatusEnum.kt | 0 .../bus/passenger/net/BusPassengerServiceManager.kt | 0 .../och/bus/passenger/net/PassengerServiceApi.kt | 0 .../BusBasePassengerFunctionDevicePresenter.kt | 0 .../BusPassengerCarUseAndNoOrderPresenter.kt | 0 .../presenter/BusPassengerFunctionOrderPresenter.kt | 0 .../presenter/BusPassengerFunctionPresenter.kt | 0 .../presenter/BusPassengerFunctionSoftPresenter.kt | 0 .../presenter/BusPassengerFunctionVideoPresenter.kt | 0 .../passenger/presenter/BusPassengerPresenter.kt | 0 .../CharterPassengerNoviceGuidancePresenter.kt | 0 .../bus/passenger/presenter/OrderInfoPresenter.kt | 0 .../bus/passenger/provider/StatusViewManager.java | 0 .../mogo/och/bus/passenger/receive/DriverMessage.kt | 0 .../com/mogo/och/bus/passenger/ui/MainFragment.kt | 0 .../passenger/ui/adapter/OrderLineItemAdapter.kt | 0 .../passenger/ui/adapter/OrderSiteItemAdapter.kt | 0 .../ui/adapter/RecyclerItemVideoHolder.java | 0 .../passenger/ui/adapter/RecyclerVideoAdapter.java | 0 .../passenger/ui/adapter/TemperatureAdapter.java | 0 .../ui/dialogfragment/M1CarUserNoOrderFragment.kt | 0 .../ui/dialogfragment/M1ContainFragment.kt | 0 .../ui/dialogfragment/NoviceGuidanceFragment.kt | 0 .../dialogfragment/fragment/M1OrderLineFragment.kt | 0 .../ui/dialogfragment/fragment/M1SoftFragment.kt | 0 .../ui/dialogfragment/fragment/M1VideoFragment.kt | 0 .../ui/dialogfragment/fragment/OrderInfoFragment.kt | 0 .../ui/layoutmanage/CarouselLayoutManager.java | 0 .../CarouselZoomPostLayoutListener.java | 0 .../ui/layoutmanage/CenterScrollListener.java | 0 .../ui/layoutmanage/ItemTransformation.java | 0 .../ui/layoutmanage/PagerCenterSnapHelper.kt | 0 .../mogo/och/bus/passenger/ui/view/EndOrderView.kt | 0 .../och/bus/passenger/ui/view/bottom/BottomBar.kt | 0 .../bus/passenger/ui/view/bottom/BottomCheckView.kt | 0 .../bus/passenger/ui/view/bottom/BottomClickView.kt | 0 .../passenger/ui/view/bottom/BottomOrderInfoView.kt | 0 .../passenger/ui/view/bottom/impl/CloseDoorView.kt | 0 .../ui/view/bottom/impl/GoViewWithArrive.kt | 0 .../passenger/ui/view/bottom/impl/OpenDoorView.kt | 0 .../passenger/ui/view/bottom/impl/StopSiteView.kt | 0 .../utils/BusPassengerMapAssetStyleUtil.java | 0 .../mogo/och/bus/passenger/utils/FullVideoUtils.kt | 0 .../och/bus/passenger/utils/ToastCharterUtils.kt | 0 .../och/bus/passenger/utils/VoiceFocusManager.kt | 0 .../mogo/och/bus/passenger/utils/ZoomDrawable.kt | 0 .../och/bus/passenger/view/BottomDecoration.java | 0 .../och/bus/passenger/view/ConsultVideoPlayer.kt | 0 .../mogo/och/bus/passenger/view/DrawBitmapView.kt | 0 .../och/bus/passenger/view/DrawableCheckBox.java | 0 .../bus/passenger/view/HorizontalDecoration.java | 0 .../och/bus/passenger/view/MakerWithSiteName.kt | 0 .../och/bus/passenger/view/PickerLayoutManager.java | 0 .../passenger/view/RecyclerViewCornerRadius.java | 0 .../mogo/och/bus/passenger/view/ToastCharterView.kt | 0 .../bus/passenger/view/statusbar/M1BlueToothView.kt | 0 .../bus/passenger/view/statusbar/StatusBarView.kt | 0 .../src/main/res/anim/alpha_hide_show.xml | 0 .../main/res/color/bus_p_aircondition_enable.xml | 0 ...tion_airconditon_pattern_text_color_selector.xml | 0 .../color/charter_p_select_city_name_textcolor.xml | 0 .../res/drawable-nodpi/bg_taxi_p_video_index.png | Bin .../drawable-nodpi/bg_taxi_p_video_thumb_big.png | Bin .../drawable-nodpi/bg_taxi_p_video_thumb_small.png | Bin .../res/drawable-nodpi/bug_p_overmap_car_model.png | Bin .../src/main/res/drawable-nodpi/bus_p_car_speed.png | Bin .../res/drawable-nodpi/bus_p_distance_info_bg.png | Bin .../bus_p_function_aircondition_nor.png | Bin ...bus_p_function_aircondition_pattern_selected.png | Bin .../bus_p_function_aircondition_select.png | Bin .../bus_p_function_aircondition_selected.png | Bin .../bus_p_function_aircondition_switch_selected.png | Bin .../bus_p_function_atmosphere_nor.png | Bin .../bus_p_function_atmosphere_select.png | Bin .../bus_p_function_device_closedoor_normal_src.png | Bin .../bus_p_function_device_closedoor_press_src.png | Bin .../bus_p_function_device_go_normal_src.png | Bin .../bus_p_function_device_go_press_src.png | Bin .../drawable-nodpi/bus_p_function_device_normal.png | Bin .../bus_p_function_device_opendoor_normal_src.png | Bin .../bus_p_function_device_opendoor_press_src.png | Bin .../drawable-nodpi/bus_p_function_device_press.png | Bin .../bus_p_function_device_stopside_normal_src.png | Bin .../bus_p_function_device_stopside_press_src.png | Bin .../bus_p_function_information_normal.png | Bin .../bus_p_function_information_press.png | Bin .../bus_p_function_left_bg_selected.png | Bin .../bus_p_function_light_check_select.png | Bin .../bus_p_function_light_check_selected.png | Bin .../bus_p_function_light_middle_selected.png | Bin .../res/drawable-nodpi/bus_p_function_light_nor.png | Bin .../drawable-nodpi/bus_p_function_light_select.png | Bin .../bus_p_function_light_select_left.png | Bin .../bus_p_function_light_select_right.png | Bin .../bus_p_function_light_selected.png | Bin .../bus_p_function_light_switch_bg_selected.png | Bin .../drawable-nodpi/bus_p_function_order_normal.png | Bin .../drawable-nodpi/bus_p_function_order_press.png | Bin .../drawable-nodpi/bus_p_function_soft_normal.png | Bin .../drawable-nodpi/bus_p_function_soft_press.png | Bin .../drawable-nodpi/bus_p_function_voice_humb.png | Bin .../bus_p_function_voice_left_select_src.png | Bin .../bus_p_function_voice_left_selected_src.png | Bin .../res/drawable-nodpi/bus_p_function_voice_max.png | Bin .../bus_p_function_voice_middle_select.png | Bin .../bus_p_function_voice_middle_selected.png | Bin .../res/drawable-nodpi/bus_p_function_voice_min.png | Bin .../src/main/res/drawable-nodpi/bus_p_loading.png | Bin .../drawable-nodpi/bus_p_m1_blue_tooth_close.png | Bin .../res/drawable-nodpi/bus_p_m1_blue_tooth_open.png | Bin .../res/drawable-nodpi/bus_p_m1_status_bar_logo.png | Bin .../main/res/drawable-nodpi/bus_p_overmap_reset.png | Bin .../drawable-nodpi/bus_p_player_change_normal.png | Bin .../bus_pm1_aircondition_wind_high.png | Bin .../bus_pm1_aircondition_wind_low.png | Bin .../bus_pm1_aircondition_wind_middle.png | Bin .../res/drawable-nodpi/bus_pm1_warm_wind_high.png | Bin .../res/drawable-nodpi/bus_pm1_warm_wind_lod.png | Bin .../res/drawable-nodpi/bus_pm1_warm_wind_middle.png | Bin .../drawable-nodpi/charter_bottom_bar_select_bg.png | Bin .../charter_end_order_openclosedoor.webp | Bin .../res/drawable-nodpi/charter_endorder_head.png | Bin .../res/drawable-nodpi/charter_p_bottom_bar_bg.png | Bin .../charter_p_bottom_center_normal.png | Bin .../charter_p_bottom_center_press.png | Bin .../charter_p_bottom_closedoor_normal.png | Bin .../charter_p_bottom_closedoor_press.png | Bin .../drawable-nodpi/charter_p_bottom_line_normal.png | Bin .../drawable-nodpi/charter_p_bottom_line_press.png | Bin .../charter_p_bottom_opendoor_normal_nor_src.png | Bin .../charter_p_bottom_opendoor_normal_press_src.png | Bin .../charter_p_bottom_softsettiing_normal.png | Bin .../charter_p_bottom_softsettiing_press.png | Bin .../charter_p_bottom_stopsite_normal.png | Bin .../charter_p_bottom_stopsite_press.png | Bin .../res/drawable-nodpi/charter_p_driver_agree.png | Bin .../res/drawable-nodpi/charter_p_driver_refuse.png | Bin .../res/drawable-nodpi/charter_p_guidace_1.webp | Bin .../res/drawable-nodpi/charter_p_guidace_2.webp | Bin .../res/drawable-nodpi/charter_p_guidace_3.webp | Bin .../res/drawable-nodpi/charter_p_guidace_4.webp | Bin .../charter_p_image_welcome_info_bg.png | Bin .../drawable-nodpi/charter_p_image_welcome_nor.webp | Bin .../charter_p_order_closedoor_normal.png | Bin .../charter_p_order_closedoor_press.png | Bin .../res/drawable-nodpi/charter_p_right_arrow_go.png | Bin .../charter_p_right_arrow_novice_guidance.png | Bin .../res/drawable-nodpi/charter_p_select_line_bg.png | Bin .../drawable-nodpi/charter_p_trajectory_line.png | Bin .../src/main/res/drawable-nodpi/charter_p_video.png | Bin .../charter_p_wait_driver_submit01.webp | Bin .../charter_p_wait_driver_submit02.webp | Bin .../charter_p_wait_driver_submit03.webp | Bin .../charter_p_wait_driver_submit04.webp | Bin .../charter_p_wait_driver_submit05.webp | Bin .../charter_p_wait_driver_submit06.webp | Bin .../charter_p_wait_driver_submit07.webp | Bin .../charter_p_wait_driver_submit08.webp | Bin .../charter_p_wait_driver_submit09.webp | Bin .../charter_p_wait_driver_submit10.webp | Bin .../charter_p_wait_driver_submit11.webp | Bin .../charter_p_wait_driver_submit12.webp | Bin .../charter_p_wait_driver_submit13.webp | Bin .../charter_p_wait_driver_submit14.webp | Bin .../charter_p_wait_driver_submit15.webp | Bin .../charter_p_wait_driver_submit16.webp | Bin .../charter_p_wait_driver_submit17.webp | Bin .../charter_p_wait_driver_submit18.webp | Bin .../charter_p_wait_driver_submit19.webp | Bin .../charter_p_wait_driver_submit20.webp | Bin .../charter_p_wait_driver_submit21.webp | Bin .../charter_p_wait_driver_submit22.webp | Bin .../charter_p_wait_driver_submit23.webp | Bin .../charter_p_wait_driver_submit24.webp | Bin .../charter_p_wait_driver_submit25.webp | Bin .../charter_p_wait_driver_submit26.webp | Bin .../charter_p_wait_driver_submit27.webp | Bin .../charter_p_wait_driver_submit28.webp | Bin .../charter_p_wait_driver_submit29.webp | Bin .../charter_p_wait_driver_submit30.webp | Bin .../src/main/res/drawable-nodpi/m1_function_bg.webp | Bin .../res/drawable-nodpi/m1_line_cancle_submit_bg.png | Bin .../main/res/drawable-nodpi/m1_order_early_end.png | Bin .../src/main/res/drawable-nodpi/m1_order_end.png | Bin .../main/res/drawable-nodpi/m1_order_end_car.png | Bin .../main/res/drawable-nodpi/m1_order_net_fail.png | Bin .../main/res/drawable-nodpi/m1_order_noorder.png | Bin .../res/drawable-nodpi/m1_order_opendoor_normal.png | Bin .../res/drawable-nodpi/m1_order_opendoor_press.png | Bin .../main/res/drawable-nodpi/m1_order_site_check.png | Bin .../drawable-nodpi/m1_order_site_check_enable.png | Bin .../res/drawable-nodpi/m1_order_site_checked.png | Bin .../drawable-nodpi/m1_order_switch_line_enable.png | Bin .../m1_order_switch_line_unenable.png | Bin .../res/drawable-nodpi/m1_site_cancle_submit_bg.png | Bin .../main/res/drawable-nodpi/m1_site_submit_bg.png | Bin .../drawable-nodpi/m1_small_map_view_dir_end.png | Bin .../src/main/res/drawable-nodpi/map_staton_icon.png | Bin .../res/drawable-nodpi/notice_video_pause_big.png | Bin .../res/drawable-nodpi/notice_video_pause_small.png | Bin .../res/drawable-nodpi/notice_video_start_big.png | Bin .../res/drawable-nodpi/notice_video_start_small.png | Bin .../main/res/drawable-nodpi/taxi_p_change_full.png | Bin .../res/drawable-nodpi/taxi_p_mogo_video_play.png | Bin .../res/drawable-nodpi/taxi_p_video_bg_bottom.png | Bin .../main/res/drawable-nodpi/taxi_p_video_bg_top.png | Bin .../res/drawable-nodpi/taxi_p_video_holder.webp | Bin .../src/main/res/drawable/bg_taxi_p_video_bg.xml | 0 .../main/res/drawable/bg_taxi_p_video_bg_shape.xml | 0 .../main/res/drawable/bg_taxi_p_video_bg_top.xml | 0 .../bus_p_function_aircondition_common_bg.xml | 0 .../bus_p_function_aircondition_common_bg_01.xml | 0 .../bus_p_function_aircondition_left_select.xml | 0 .../bus_p_function_aircondition_left_selected.xml | 0 ...bus_p_function_aircondition_pattern_selecotr.xml | 0 .../bus_p_function_aircondition_pattern_select.xml | 0 .../bus_p_function_aircondition_switch_select.xml | 0 .../bus_p_function_aircondition_switch_selector.xml | 0 .../bus_p_function_airconditon_bg_selector.xml | 0 .../bus_p_function_airconditon_left_selector.xml | 0 ...s_p_function_airconditon_text_color_selector.xml | 0 .../bus_p_function_bottom_device_bg_selector.xml | 0 ...us_p_function_bottom_information_bg_selector.xml | 0 .../bus_p_function_bottom_order_bg_selector.xml | 0 .../bus_p_function_bottom_soft_bg_selector.xml | 0 .../bus_p_function_device_closedoor_normal.xml | 0 .../bus_p_function_device_closedoor_press.xml | 0 ...us_p_function_device_closedoor_press_selecor.xml | 0 .../drawable/bus_p_function_device_go_normal.xml | 0 .../res/drawable/bus_p_function_device_go_press.xml | 0 .../bus_p_function_device_go_press_selecor.xml | 0 .../bus_p_function_device_opendoor_normal.xml | 0 .../bus_p_function_device_opendoor_press.xml | 0 ...bus_p_function_device_opendoor_press_selecor.xml | 0 .../bus_p_function_device_stopside_normal.xml | 0 .../bus_p_function_device_stopside_press.xml | 0 ...bus_p_function_device_stopside_press_selecor.xml | 0 .../drawable/bus_p_function_distance_split_bg.xml | 0 .../res/drawable/bus_p_function_left_bg_select.xml | 0 .../drawable/bus_p_function_light_left_select.xml | 0 .../drawable/bus_p_function_light_left_selected.xml | 0 .../drawable/bus_p_function_light_left_selector.xml | 0 .../bus_p_function_light_switch_bg_select.xml | 0 .../bus_p_function_light_switch_bg_selector.xml | 0 .../bus_p_function_setting_soft_b_shape.xml | 0 .../drawable/bus_p_function_switch_left_select.xml | 0 .../bus_p_function_switch_left_selected.xml | 0 .../bus_p_function_switch_left_selector.xml | 0 .../bus_p_function_video_player_change_full.xml | 0 .../bus_p_function_video_player_change_normal.xml | 0 .../bus_p_function_video_player_pause_big.xml | 0 .../bus_p_function_video_player_pause_small.xml | 0 .../bus_p_function_video_player_start_big.xml | 0 .../bus_p_function_video_player_start_small.xml | 0 .../bus_p_function_video_player_thumb_big.xml | 0 .../bus_p_function_video_player_thumb_samll.xml | 0 .../drawable/bus_p_function_voice_left_select.xml | 0 .../drawable/bus_p_function_voice_left_selected.xml | 0 .../drawable/bus_p_function_voice_left_selector.xml | 0 .../bus_p_function_voice_right_process_humb.xml | 0 .../main/res/drawable/bus_p_overmap_reset_size.xml | 0 .../res/drawable/charter_p_bottom_go_selector.xml | 0 .../drawable/charter_p_bottom_opendoor_normal.xml | 0 .../drawable/charter_p_bottom_opendoor_press.xml | 0 .../drawable/charter_p_bottom_opendoor_selector.xml | 0 .../drawable/charter_p_selct_site_bottom_corner.xml | 0 .../charter_p_selct_site_name_shape_normal.xml | 0 .../charter_p_selct_site_name_shape_selected.xml | 0 .../charter_p_selct_site_name_shape_selector.xml | 0 .../charter_p_shape_cancle_line_site_change.xml | 0 .../main/res/drawable/charter_p_shape_end_order.xml | 0 .../res/drawable/charter_p_shape_end_order_left.xml | 0 .../drawable/charter_p_shape_line_switch_left.xml | 0 .../res/drawable/charter_p_shape_order_info.xml | 0 .../charter_p_shape_submit_line_site_change.xml | 0 .../src/main/res/drawable/charter_p_toast_shape.xml | 0 .../drawable/charter_p_wait_driver_submit_ani.xml | 0 .../main/res/drawable/charter_p_welcome_explore.xml | 0 .../drawable/m1_order_end_closedoor_selecotr.xml | 0 .../res/drawable/m1_order_end_opendoor_selecotr.xml | 0 .../res/drawable/m1_order_line_checked_shape.xml | 0 .../src/main/res/drawable/m1_order_line_shape.xml | 0 .../res/drawable/taxi_power_size_seekbar_style.xml | 0 .../main/res/drawable/taxi_video_seekbar_style.xml | 0 .../passenger}/src/main/res/font/din.ttf | Bin .../src/main/res/layout/charter_p_view_toast.xml | 0 .../src/main/res/layout/m1_bottom_bar.xml | 0 .../passenger}/src/main/res/layout/m1_bottom_go.xml | 0 .../src/main/res/layout/m1_bottom_orderinfo.xml | 0 .../src/main/res/layout/m1_bottom_stop_site.xml | 0 .../src/main/res/layout/m1_contain_fragment.xml | 0 .../src/main/res/layout/m1_devices_fragment.xml | 0 .../src/main/res/layout/m1_main_fragment.xml | 0 .../main/res/layout/m1_novice_guidance_fragment.xml | 0 .../m1_novice_guidance_welcome_1_fragment.xml | 0 .../m1_novice_guidance_welcome_2_fragment.xml | 0 .../m1_novice_guidance_welcome_3_fragment.xml | 0 .../m1_novice_guidance_welcome_4_fragment.xml | 0 .../layout/m1_novice_guidance_welcome_fragment.xml | 0 .../passenger}/src/main/res/layout/m1_order_end.xml | 0 .../src/main/res/layout/m1_order_fragment.xml | 0 .../src/main/res/layout/m1_order_line_item.xml | 0 .../src/main/res/layout/m1_order_loading.xml | 0 .../src/main/res/layout/m1_order_net_fail.xml | 0 .../src/main/res/layout/m1_order_noorder.xml | 0 .../src/main/res/layout/m1_order_site_item.xml | 0 .../src/main/res/layout/m1_soft_fragment.xml | 0 .../main/res/layout/m1_soft_temperature_item.xml | 0 .../main/res/layout/m1_statusview_blue_tooth.xml | 0 .../src/main/res/layout/m1_statusview_datetime.xml | 0 .../src/main/res/layout/m1_video_fragment.xml | 0 .../src/main/res/layout/m1_video_item.xml | 0 .../src/main/res/layout/m1_video_view.xml | 0 .../src/main/res/layout/orderinfo_fragment.xml | 0 .../src/main/res/layout/view_maker_sitename.xml | 0 .../passenger}/src/main/res/raw/aiqinghao.nt3d | Bin .../passenger}/src/main/res/raw/bus_di.mp3 | Bin .../passenger}/src/main/res/raw/jiatinghao.nt3d | Bin .../passenger}/src/main/res/raw/m1.nt3d | Bin .../passenger}/src/main/res/raw/m1_voice_di.mp3 | Bin .../passenger}/src/main/res/raw/pengyouhao.nt3d | Bin .../passenger}/src/main/res/values/attrs.xml | 0 .../passenger}/src/main/res/values/color.xml | 0 .../passenger}/src/main/res/values/strings.xml | 0 .../passenger}/src/main/res/values/styles.xml | 0 .../com/mogo/och/bus/passenger/ExampleUnitTest.kt | 0 .../test/java/com/mogo/och/bus/passenger/Model.kt | 0 .../test/java/com/mogo/och/bus/passenger/ModelX.kt | 0 app/script/functions/och.gradle | 8 ++++---- settings.gradle | 4 ++-- 542 files changed, 6 insertions(+), 6 deletions(-) rename OCH/{mogo-och-charter-passenger => charter/driver}/.gitignore (100%) rename OCH/{mogo-och-charter => charter/driver}/build.gradle (100%) rename OCH/{mogo-och-charter-passenger => charter/driver}/consumer-rules.pro (100%) rename OCH/{mogo-och-charter => charter/driver}/gradle.properties (100%) rename OCH/{mogo-och-charter-passenger => charter/driver}/proguard-rules.pro (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/AndroidManifest.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/layout/bus_no_line_view.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/layout/fragment_driver_m1.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/raw/bus_away_passengers.json (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/raw/bus_order_1.json (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/raw/bus_station_list1.json (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/raw/bus_station_list2.json (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/raw/end_marker.nt3d (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/raw/m1_voice_di.mp3 (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/raw/star_marker.nt3d (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/values/attrs.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/values/colors.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/values/strings.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/AndroidManifest.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/color/bus_autopilot_text_color_selector.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_base_slide_block.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_dot_line.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_ic_autopilot.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_light_green_nor.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_light_red_nor.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_line_panel_bg.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_line_task_arrow.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_no_line_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_och_dot_line.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_operation_status_bg.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_selected_btn.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_switch_line_close.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_switch_map_long.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_switch_map_medium.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_unselect_btn.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/end_maker_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_ai_collect.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_ai_normal.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_ai_select.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_bad_case.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_no_bus_line.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_point_blue_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_point_green_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_point_grey_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/icon_station_start_end.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/no_order_data.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/pingxingjiashi.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/press_start_status.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/start_failure.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/start_maker_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable-xhdpi/start_success.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bg_bus_traffic_light_background.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_autopilot_2_status_bg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_autopilot_status_bg_check.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_autopilot_status_bg_nor.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_base_icon_in_autopilot.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_base_icon_not_in_autopilot.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_base_notice_box_bg.9.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_base_slide_block.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_checkbox_selector.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_disable_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_dot_line.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_ic_autopilot.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_icon_arrived_station.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_icon_arriving_station.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_icon_not_arrive_station.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_light_green_nor.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_light_red_nor.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_lightyellow_nor.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_line_dividing_line1_selector.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_line_dividing_line2_selector.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_line_panel_bg.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_line_panel_bg_1.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_loading_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_och_dot_line.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_operation_status_bg_selector.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_panel_anchor_bkg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_panel_bkg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_right_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_selected_btn.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_setting_btn_bg.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_station_green_dash_line.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_station_v_green_dash.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_switch_line_btn.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_switch_line_btn_commit.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_switch_line_close.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_switch_map_bg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_switch_map_long.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_switch_map_medium.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_task_time_bg.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_unselect_btn.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_wrong_autopilot_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/end_maker_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_arrow_blue_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_arrow_green_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_arrow_grey_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_bad_case_normal.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_no_bus_line.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_point_blue_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_point_green_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_point_grey_bus.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/icon_station_start_end.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/no_order_data.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/press_start_status.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/start_failure.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/start_maker_icon.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/drawable/start_success.png (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/layout/bus_test_bar_view.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/layout/bus_traffic_light_view.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/layout/charter_base_fragment.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/raw/bus_away_passengers.json (100%) rename OCH/{mogo-och-charter-passenger => charter/driver}/src/main/res/raw/bus_di.mp3 (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/raw/bus_order_1.json (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/raw/bus_station_list1.json (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/raw/bus_station_list2.json (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/raw/end_marker.nt3d (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/raw/star_marker.nt3d (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/values/attrs.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/values/colors.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/values/dimens.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/values/strings.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/values/style.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/main/res/xml/bus_switch_line_list_item_scene.xml (100%) rename OCH/{mogo-och-charter => charter/driver}/src/test/java/com/magic/mogo/och/charter/ExampleUnitTest.kt (100%) rename OCH/{mogo-och-charter => charter/passenger}/.gitignore (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/README.md (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/build.gradle (100%) rename OCH/{mogo-och-charter => charter/passenger}/consumer-rules.pro (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/gradle.properties (100%) rename OCH/{mogo-och-charter => charter/passenger}/proguard-rules.pro (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/AndroidManifest.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/assets/m1_style.data (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/assets/m1_style_extra.data (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/presenter/OrderInfoPresenter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1SoftFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1VideoFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/OrderInfoFragment.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomBar.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomCheckView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomClickView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/CloseDoorView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/OpenDoorView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/StopSiteView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/ToastCharterView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/anim/alpha_hide_show.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/color/bus_p_aircondition_enable.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/color/charter_p_select_city_name_textcolor.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_car_speed.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_information_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_information_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_nor.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_select.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_order_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_order_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_soft_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_voice_max.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_function_voice_min.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_loading.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_overmap_reset.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_p_player_change_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_endorder_head.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_bar_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_line_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_line_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_nor_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_press_src.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_driver_agree.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_driver_refuse.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_guidace_1.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_guidace_2.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_guidace_3.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_guidace_4.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_image_welcome_info_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_image_welcome_nor.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_select_line_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_trajectory_line.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_video.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_function_bg.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_early_end.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_end.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_end_car.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_net_fail.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_noorder.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_opendoor_press.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_site_check.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_site_check_enable.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_site_checked.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_site_submit_bg.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/map_staton_icon.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/notice_video_pause_big.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/notice_video_pause_small.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/notice_video_start_big.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/notice_video_start_small.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/taxi_p_change_full.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable-nodpi/taxi_p_video_holder.webp (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bg_taxi_p_video_bg.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bg_taxi_p_video_bg_top.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_left_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_closedoor_press.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_go_normal.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_go_press.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_opendoor_press.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_stopside_normal.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_stopside_press.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_distance_split_bg.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_left_bg_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_light_left_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_light_left_selected.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_light_left_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_switch_left_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_switch_left_selected.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_switch_left_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_change_full.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_change_normal.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_pause_big.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_pause_small.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_start_big.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_start_small.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_voice_left_select.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_voice_left_selected.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_voice_left_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/bus_p_overmap_reset_size.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_bottom_go_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_bottom_opendoor_normal.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_bottom_opendoor_press.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_bottom_opendoor_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_shape_end_order.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_shape_end_order_left.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_shape_line_switch_left.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_shape_order_info.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_toast_shape.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/charter_p_welcome_explore.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/m1_order_line_checked_shape.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/m1_order_line_shape.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/taxi_power_size_seekbar_style.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/drawable/taxi_video_seekbar_style.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/font/din.ttf (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/charter_p_view_toast.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_bottom_bar.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_bottom_go.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_bottom_orderinfo.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_bottom_stop_site.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_contain_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_devices_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_main_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_novice_guidance_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_novice_guidance_welcome_1_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_novice_guidance_welcome_2_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_novice_guidance_welcome_3_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_novice_guidance_welcome_4_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_order_end.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_order_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_order_line_item.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_order_loading.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_order_net_fail.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_order_noorder.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_order_site_item.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_soft_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_soft_temperature_item.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_statusview_blue_tooth.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_statusview_datetime.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_video_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_video_item.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/m1_video_view.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/orderinfo_fragment.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/layout/view_maker_sitename.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/raw/aiqinghao.nt3d (100%) rename OCH/{mogo-och-charter => charter/passenger}/src/main/res/raw/bus_di.mp3 (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/raw/jiatinghao.nt3d (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/raw/m1.nt3d (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/raw/m1_voice_di.mp3 (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/raw/pengyouhao.nt3d (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/values/attrs.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/values/color.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/values/strings.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/main/res/values/styles.xml (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/test/java/com/mogo/och/bus/passenger/Model.kt (100%) rename OCH/{mogo-och-charter-passenger => charter/passenger}/src/test/java/com/mogo/och/bus/passenger/ModelX.kt (100%) diff --git a/OCH/mogo-och-charter-passenger/.gitignore b/OCH/charter/driver/.gitignore similarity index 100% rename from OCH/mogo-och-charter-passenger/.gitignore rename to OCH/charter/driver/.gitignore diff --git a/OCH/mogo-och-charter/build.gradle b/OCH/charter/driver/build.gradle similarity index 100% rename from OCH/mogo-och-charter/build.gradle rename to OCH/charter/driver/build.gradle diff --git a/OCH/mogo-och-charter-passenger/consumer-rules.pro b/OCH/charter/driver/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-charter-passenger/consumer-rules.pro rename to OCH/charter/driver/consumer-rules.pro diff --git a/OCH/mogo-och-charter/gradle.properties b/OCH/charter/driver/gradle.properties similarity index 100% rename from OCH/mogo-och-charter/gradle.properties rename to OCH/charter/driver/gradle.properties diff --git a/OCH/mogo-och-charter-passenger/proguard-rules.pro b/OCH/charter/driver/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-charter-passenger/proguard-rules.pro rename to OCH/charter/driver/proguard-rules.pro diff --git a/OCH/mogo-och-charter/src/driverm1/AndroidManifest.xml b/OCH/charter/driver/src/driverm1/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/AndroidManifest.xml rename to OCH/charter/driver/src/driverm1/AndroidManifest.xml diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/CheckOrderCountDownResponse.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryBusinessStatusResponse.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryRoutesResponse.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/RequestChangeDest.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/ChangeDestCallback.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/callback/IDriverM1ControllerStatusCallback.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1LooperManager.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/LoginDriverM1Impl.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/login/OchLoginServiceApi.java diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt rename to OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/view/SlidePanelView.kt diff --git a/OCH/mogo-och-charter/src/driverm1/res/layout/bus_no_line_view.xml b/OCH/charter/driver/src/driverm1/res/layout/bus_no_line_view.xml similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/layout/bus_no_line_view.xml rename to OCH/charter/driver/src/driverm1/res/layout/bus_no_line_view.xml diff --git a/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml b/OCH/charter/driver/src/driverm1/res/layout/fragment_driver_m1.xml similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml rename to OCH/charter/driver/src/driverm1/res/layout/fragment_driver_m1.xml diff --git a/OCH/mogo-och-charter/src/driverm1/res/raw/bus_away_passengers.json b/OCH/charter/driver/src/driverm1/res/raw/bus_away_passengers.json similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/raw/bus_away_passengers.json rename to OCH/charter/driver/src/driverm1/res/raw/bus_away_passengers.json diff --git a/OCH/mogo-och-charter/src/driverm1/res/raw/bus_order_1.json b/OCH/charter/driver/src/driverm1/res/raw/bus_order_1.json similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/raw/bus_order_1.json rename to OCH/charter/driver/src/driverm1/res/raw/bus_order_1.json diff --git a/OCH/mogo-och-charter/src/driverm1/res/raw/bus_station_list1.json b/OCH/charter/driver/src/driverm1/res/raw/bus_station_list1.json similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/raw/bus_station_list1.json rename to OCH/charter/driver/src/driverm1/res/raw/bus_station_list1.json diff --git a/OCH/mogo-och-charter/src/driverm1/res/raw/bus_station_list2.json b/OCH/charter/driver/src/driverm1/res/raw/bus_station_list2.json similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/raw/bus_station_list2.json rename to OCH/charter/driver/src/driverm1/res/raw/bus_station_list2.json diff --git a/OCH/mogo-och-charter/src/driverm1/res/raw/end_marker.nt3d b/OCH/charter/driver/src/driverm1/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/raw/end_marker.nt3d rename to OCH/charter/driver/src/driverm1/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-charter/src/driverm1/res/raw/m1_voice_di.mp3 b/OCH/charter/driver/src/driverm1/res/raw/m1_voice_di.mp3 similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/raw/m1_voice_di.mp3 rename to OCH/charter/driver/src/driverm1/res/raw/m1_voice_di.mp3 diff --git a/OCH/mogo-och-charter/src/driverm1/res/raw/star_marker.nt3d b/OCH/charter/driver/src/driverm1/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/raw/star_marker.nt3d rename to OCH/charter/driver/src/driverm1/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-charter/src/driverm1/res/values/attrs.xml b/OCH/charter/driver/src/driverm1/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/values/attrs.xml rename to OCH/charter/driver/src/driverm1/res/values/attrs.xml diff --git a/OCH/mogo-och-charter/src/driverm1/res/values/colors.xml b/OCH/charter/driver/src/driverm1/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/values/colors.xml rename to OCH/charter/driver/src/driverm1/res/values/colors.xml diff --git a/OCH/mogo-och-charter/src/driverm1/res/values/strings.xml b/OCH/charter/driver/src/driverm1/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/values/strings.xml rename to OCH/charter/driver/src/driverm1/res/values/strings.xml diff --git a/OCH/mogo-och-charter/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml b/OCH/charter/driver/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml similarity index 100% rename from OCH/mogo-och-charter/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml rename to OCH/charter/driver/src/driverm1/res/xml/bus_switch_line_list_item_scene.xml diff --git a/OCH/mogo-och-charter/src/main/AndroidManifest.xml b/OCH/charter/driver/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/AndroidManifest.xml rename to OCH/charter/driver/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java similarity index 100% rename from OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/ICharterOCH.java diff --git a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt similarity index 100% rename from OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt diff --git a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt similarity index 100% rename from OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt rename to OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt diff --git a/OCH/mogo-och-charter/src/main/res/color/bus_autopilot_text_color_selector.xml b/OCH/charter/driver/src/main/res/color/bus_autopilot_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/color/bus_autopilot_text_color_selector.xml rename to OCH/charter/driver/src/main/res/color/bus_autopilot_text_color_selector.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_slide_block.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_base_slide_block.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_base_slide_block.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_dot_line.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_dot_line.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_dot_line.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_ic_autopilot.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_ic_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_ic_autopilot.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_light_green_nor.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_light_green_nor.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_green_nor.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_light_red_nor.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_light_red_nor.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_light_red_nor.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_line_panel_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_line_panel_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_line_task_arrow.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_line_task_arrow.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_line_task_arrow.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_no_line_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_no_line_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_no_line_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_och_dot_line.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_och_dot_line.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_och_dot_line.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_operation_status_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_operation_status_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_bg.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_selected_btn.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_selected_btn.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_selected_btn.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_switch_line_close.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_switch_line_close.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_line_close.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_switch_map_long.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_switch_map_long.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_long.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_switch_map_medium.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_switch_map_medium.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_switch_map_medium.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_unselect_btn.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_unselect_btn.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_unselect_btn.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/end_maker_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/end_maker_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/end_maker_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_ai_collect.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_ai_collect.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_collect.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_ai_normal.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_normal.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_select.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_ai_select.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_ai_select.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_bad_case.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_bad_case.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_bad_case.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_bad_case.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_no_bus_line.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_no_bus_line.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_no_bus_line.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_point_blue_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_point_blue_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_blue_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_point_green_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_point_green_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_green_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_point_grey_bus.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_point_grey_bus.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_point_grey_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_station_start_end.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/icon_station_start_end.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/icon_station_start_end.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/no_order_data.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/no_order_data.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/no_order_data.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/no_order_data.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/pingxingjiashi.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/pingxingjiashi.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/pingxingjiashi.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/press_start_status.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/press_start_status.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/press_start_status.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/press_start_status.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/start_failure.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/start_failure.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/start_failure.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/start_failure.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/start_maker_icon.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/start_maker_icon.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/start_maker_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable-xhdpi/start_success.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/start_success.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable-xhdpi/start_success.png rename to OCH/charter/driver/src/main/res/drawable-xhdpi/start_success.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bg_bus_traffic_light_background.xml b/OCH/charter/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bg_bus_traffic_light_background.xml rename to OCH/charter/driver/src/main/res/drawable/bg_bus_traffic_light_background.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_2_status_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_2_status_bg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_status_bg_check.png b/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_status_bg_check.png rename to OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_check.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_status_bg_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_autopilot_status_bg_nor.png rename to OCH/charter/driver/src/main/res/drawable/bus_autopilot_status_bg_nor.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml rename to OCH/charter/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_base_icon_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_base_icon_in_autopilot.png rename to OCH/charter/driver/src/main/res/drawable/bus_base_icon_in_autopilot.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_base_icon_not_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_base_icon_not_in_autopilot.png rename to OCH/charter/driver/src/main/res/drawable/bus_base_icon_not_in_autopilot.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_base_notice_box_bg.9.png b/OCH/charter/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_base_notice_box_bg.9.png rename to OCH/charter/driver/src/main/res/drawable/bus_base_notice_box_bg.9.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_base_slide_block.png b/OCH/charter/driver/src/main/res/drawable/bus_base_slide_block.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_base_slide_block.png rename to OCH/charter/driver/src/main/res/drawable/bus_base_slide_block.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_checkbox_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_checkbox_selector.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_checkbox_selector.xml rename to OCH/charter/driver/src/main/res/drawable/bus_checkbox_selector.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_disable_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_disable_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_disable_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable/bus_disable_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_dot_line.png b/OCH/charter/driver/src/main/res/drawable/bus_dot_line.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_dot_line.png rename to OCH/charter/driver/src/main/res/drawable/bus_dot_line.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_ic_autopilot.png b/OCH/charter/driver/src/main/res/drawable/bus_ic_autopilot.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_ic_autopilot.png rename to OCH/charter/driver/src/main/res/drawable/bus_ic_autopilot.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_icon_arrived_station.png b/OCH/charter/driver/src/main/res/drawable/bus_icon_arrived_station.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_icon_arrived_station.png rename to OCH/charter/driver/src/main/res/drawable/bus_icon_arrived_station.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_icon_arriving_station.png b/OCH/charter/driver/src/main/res/drawable/bus_icon_arriving_station.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_icon_arriving_station.png rename to OCH/charter/driver/src/main/res/drawable/bus_icon_arriving_station.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_icon_not_arrive_station.png b/OCH/charter/driver/src/main/res/drawable/bus_icon_not_arrive_station.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_icon_not_arrive_station.png rename to OCH/charter/driver/src/main/res/drawable/bus_icon_not_arrive_station.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_light_green_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_light_green_nor.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_light_green_nor.png rename to OCH/charter/driver/src/main/res/drawable/bus_light_green_nor.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_light_red_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_light_red_nor.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_light_red_nor.png rename to OCH/charter/driver/src/main/res/drawable/bus_light_red_nor.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_lightyellow_nor.png b/OCH/charter/driver/src/main/res/drawable/bus_lightyellow_nor.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_lightyellow_nor.png rename to OCH/charter/driver/src/main/res/drawable/bus_lightyellow_nor.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_line_dividing_line1_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_line_dividing_line1_selector.xml rename to OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line1_selector.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_line_dividing_line2_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_line_dividing_line2_selector.xml rename to OCH/charter/driver/src/main/res/drawable/bus_line_dividing_line2_selector.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_line_panel_bg.png b/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_line_panel_bg.png rename to OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_line_panel_bg_1.png b/OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg_1.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_line_panel_bg_1.png rename to OCH/charter/driver/src/main/res/drawable/bus_line_panel_bg_1.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_loading_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_loading_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_loading_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable/bus_loading_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_och_dot_line.png b/OCH/charter/driver/src/main/res/drawable/bus_och_dot_line.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_och_dot_line.png rename to OCH/charter/driver/src/main/res/drawable/bus_och_dot_line.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg_selector.xml b/OCH/charter/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg_selector.xml rename to OCH/charter/driver/src/main/res/drawable/bus_operation_status_bg_selector.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_panel_anchor_bkg.xml b/OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_panel_anchor_bkg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_panel_anchor_bkg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_panel_bkg.xml b/OCH/charter/driver/src/main/res/drawable/bus_panel_bkg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_panel_bkg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_panel_bkg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_right_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_right_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable/bus_right_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_selected_btn.png b/OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_selected_btn.png rename to OCH/charter/driver/src/main/res/drawable/bus_selected_btn.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_setting_btn_bg.png b/OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_setting_btn_bg.png rename to OCH/charter/driver/src/main/res/drawable/bus_setting_btn_bg.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml rename to OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_normal.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml rename to OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_bg_selected.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml b/OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml rename to OCH/charter/driver/src/main/res/drawable/bus_shape_select_line_item_time_bg_selected.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_station_green_dash_line.xml b/OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_station_green_dash_line.xml rename to OCH/charter/driver/src/main/res/drawable/bus_station_green_dash_line.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_station_v_green_dash.xml b/OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_station_v_green_dash.xml rename to OCH/charter/driver/src/main/res/drawable/bus_station_v_green_dash.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_switch_line_btn.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_switch_line_btn.xml rename to OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_switch_line_btn_commit.xml rename to OCH/charter/driver/src/main/res/drawable/bus_switch_line_btn_commit.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_switch_line_close.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_switch_line_close.png rename to OCH/charter/driver/src/main/res/drawable/bus_switch_line_close.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_switch_map_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_switch_map_bg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_switch_map_bg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_switch_map_long.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_switch_map_long.png rename to OCH/charter/driver/src/main/res/drawable/bus_switch_map_long.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_switch_map_medium.png b/OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_switch_map_medium.png rename to OCH/charter/driver/src/main/res/drawable/bus_switch_map_medium.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_task_time_bg.xml b/OCH/charter/driver/src/main/res/drawable/bus_task_time_bg.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_task_time_bg.xml rename to OCH/charter/driver/src/main/res/drawable/bus_task_time_bg.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_unselect_btn.png b/OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_unselect_btn.png rename to OCH/charter/driver/src/main/res/drawable/bus_unselect_btn.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_wrong_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_wrong_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable/bus_wrong_autopilot_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml b/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml rename to OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_nor.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml b/OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml rename to OCH/charter/driver/src/main/res/drawable/bus_yi_biao_pan_bg_speeding.xml diff --git a/OCH/mogo-och-charter/src/main/res/drawable/end_maker_icon.png b/OCH/charter/driver/src/main/res/drawable/end_maker_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/end_maker_icon.png rename to OCH/charter/driver/src/main/res/drawable/end_maker_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_arrow_blue_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_arrow_blue_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_arrow_blue_bus.png rename to OCH/charter/driver/src/main/res/drawable/icon_arrow_blue_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_arrow_green_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_arrow_green_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_arrow_green_bus.png rename to OCH/charter/driver/src/main/res/drawable/icon_arrow_green_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_arrow_grey_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_arrow_grey_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_arrow_grey_bus.png rename to OCH/charter/driver/src/main/res/drawable/icon_arrow_grey_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_bad_case_normal.png b/OCH/charter/driver/src/main/res/drawable/icon_bad_case_normal.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_bad_case_normal.png rename to OCH/charter/driver/src/main/res/drawable/icon_bad_case_normal.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_no_bus_line.png b/OCH/charter/driver/src/main/res/drawable/icon_no_bus_line.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_no_bus_line.png rename to OCH/charter/driver/src/main/res/drawable/icon_no_bus_line.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_point_blue_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_point_blue_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_point_blue_bus.png rename to OCH/charter/driver/src/main/res/drawable/icon_point_blue_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_point_green_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_point_green_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_point_green_bus.png rename to OCH/charter/driver/src/main/res/drawable/icon_point_green_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_point_grey_bus.png b/OCH/charter/driver/src/main/res/drawable/icon_point_grey_bus.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_point_grey_bus.png rename to OCH/charter/driver/src/main/res/drawable/icon_point_grey_bus.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_station_start_end.png b/OCH/charter/driver/src/main/res/drawable/icon_station_start_end.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/icon_station_start_end.png rename to OCH/charter/driver/src/main/res/drawable/icon_station_start_end.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/no_order_data.png b/OCH/charter/driver/src/main/res/drawable/no_order_data.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/no_order_data.png rename to OCH/charter/driver/src/main/res/drawable/no_order_data.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/press_start_status.png b/OCH/charter/driver/src/main/res/drawable/press_start_status.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/press_start_status.png rename to OCH/charter/driver/src/main/res/drawable/press_start_status.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/start_failure.png b/OCH/charter/driver/src/main/res/drawable/start_failure.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/start_failure.png rename to OCH/charter/driver/src/main/res/drawable/start_failure.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/start_maker_icon.png b/OCH/charter/driver/src/main/res/drawable/start_maker_icon.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/start_maker_icon.png rename to OCH/charter/driver/src/main/res/drawable/start_maker_icon.png diff --git a/OCH/mogo-och-charter/src/main/res/drawable/start_success.png b/OCH/charter/driver/src/main/res/drawable/start_success.png similarity index 100% rename from OCH/mogo-och-charter/src/main/res/drawable/start_success.png rename to OCH/charter/driver/src/main/res/drawable/start_success.png diff --git a/OCH/mogo-och-charter/src/main/res/layout/bus_test_bar_view.xml b/OCH/charter/driver/src/main/res/layout/bus_test_bar_view.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/layout/bus_test_bar_view.xml rename to OCH/charter/driver/src/main/res/layout/bus_test_bar_view.xml diff --git a/OCH/mogo-och-charter/src/main/res/layout/bus_traffic_light_view.xml b/OCH/charter/driver/src/main/res/layout/bus_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/layout/bus_traffic_light_view.xml rename to OCH/charter/driver/src/main/res/layout/bus_traffic_light_view.xml diff --git a/OCH/mogo-och-charter/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/layout/charter_base_fragment.xml rename to OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml diff --git a/OCH/mogo-och-charter/src/main/res/raw/bus_away_passengers.json b/OCH/charter/driver/src/main/res/raw/bus_away_passengers.json similarity index 100% rename from OCH/mogo-och-charter/src/main/res/raw/bus_away_passengers.json rename to OCH/charter/driver/src/main/res/raw/bus_away_passengers.json diff --git a/OCH/mogo-och-charter-passenger/src/main/res/raw/bus_di.mp3 b/OCH/charter/driver/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/raw/bus_di.mp3 rename to OCH/charter/driver/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-charter/src/main/res/raw/bus_order_1.json b/OCH/charter/driver/src/main/res/raw/bus_order_1.json similarity index 100% rename from OCH/mogo-och-charter/src/main/res/raw/bus_order_1.json rename to OCH/charter/driver/src/main/res/raw/bus_order_1.json diff --git a/OCH/mogo-och-charter/src/main/res/raw/bus_station_list1.json b/OCH/charter/driver/src/main/res/raw/bus_station_list1.json similarity index 100% rename from OCH/mogo-och-charter/src/main/res/raw/bus_station_list1.json rename to OCH/charter/driver/src/main/res/raw/bus_station_list1.json diff --git a/OCH/mogo-och-charter/src/main/res/raw/bus_station_list2.json b/OCH/charter/driver/src/main/res/raw/bus_station_list2.json similarity index 100% rename from OCH/mogo-och-charter/src/main/res/raw/bus_station_list2.json rename to OCH/charter/driver/src/main/res/raw/bus_station_list2.json diff --git a/OCH/mogo-och-charter/src/main/res/raw/end_marker.nt3d b/OCH/charter/driver/src/main/res/raw/end_marker.nt3d similarity index 100% rename from OCH/mogo-och-charter/src/main/res/raw/end_marker.nt3d rename to OCH/charter/driver/src/main/res/raw/end_marker.nt3d diff --git a/OCH/mogo-och-charter/src/main/res/raw/star_marker.nt3d b/OCH/charter/driver/src/main/res/raw/star_marker.nt3d similarity index 100% rename from OCH/mogo-och-charter/src/main/res/raw/star_marker.nt3d rename to OCH/charter/driver/src/main/res/raw/star_marker.nt3d diff --git a/OCH/mogo-och-charter/src/main/res/values/attrs.xml b/OCH/charter/driver/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/values/attrs.xml rename to OCH/charter/driver/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-charter/src/main/res/values/colors.xml b/OCH/charter/driver/src/main/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/values/colors.xml rename to OCH/charter/driver/src/main/res/values/colors.xml diff --git a/OCH/mogo-och-charter/src/main/res/values/dimens.xml b/OCH/charter/driver/src/main/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/values/dimens.xml rename to OCH/charter/driver/src/main/res/values/dimens.xml diff --git a/OCH/mogo-och-charter/src/main/res/values/strings.xml b/OCH/charter/driver/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/values/strings.xml rename to OCH/charter/driver/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-charter/src/main/res/values/style.xml b/OCH/charter/driver/src/main/res/values/style.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/values/style.xml rename to OCH/charter/driver/src/main/res/values/style.xml diff --git a/OCH/mogo-och-charter/src/main/res/xml/bus_switch_line_list_item_scene.xml b/OCH/charter/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml similarity index 100% rename from OCH/mogo-och-charter/src/main/res/xml/bus_switch_line_list_item_scene.xml rename to OCH/charter/driver/src/main/res/xml/bus_switch_line_list_item_scene.xml diff --git a/OCH/mogo-och-charter/src/test/java/com/magic/mogo/och/charter/ExampleUnitTest.kt b/OCH/charter/driver/src/test/java/com/magic/mogo/och/charter/ExampleUnitTest.kt similarity index 100% rename from OCH/mogo-och-charter/src/test/java/com/magic/mogo/och/charter/ExampleUnitTest.kt rename to OCH/charter/driver/src/test/java/com/magic/mogo/och/charter/ExampleUnitTest.kt diff --git a/OCH/mogo-och-charter/.gitignore b/OCH/charter/passenger/.gitignore similarity index 100% rename from OCH/mogo-och-charter/.gitignore rename to OCH/charter/passenger/.gitignore diff --git a/OCH/mogo-och-charter-passenger/README.md b/OCH/charter/passenger/README.md similarity index 100% rename from OCH/mogo-och-charter-passenger/README.md rename to OCH/charter/passenger/README.md diff --git a/OCH/mogo-och-charter-passenger/build.gradle b/OCH/charter/passenger/build.gradle similarity index 100% rename from OCH/mogo-och-charter-passenger/build.gradle rename to OCH/charter/passenger/build.gradle diff --git a/OCH/mogo-och-charter/consumer-rules.pro b/OCH/charter/passenger/consumer-rules.pro similarity index 100% rename from OCH/mogo-och-charter/consumer-rules.pro rename to OCH/charter/passenger/consumer-rules.pro diff --git a/OCH/mogo-och-charter-passenger/gradle.properties b/OCH/charter/passenger/gradle.properties similarity index 100% rename from OCH/mogo-och-charter-passenger/gradle.properties rename to OCH/charter/passenger/gradle.properties diff --git a/OCH/mogo-och-charter/proguard-rules.pro b/OCH/charter/passenger/proguard-rules.pro similarity index 100% rename from OCH/mogo-och-charter/proguard-rules.pro rename to OCH/charter/passenger/proguard-rules.pro diff --git a/OCH/mogo-och-charter-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java b/OCH/charter/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java rename to OCH/charter/passenger/src/androidTest/java/com/mogo/och/bus/passenger/ExampleInstrumentedTest.java diff --git a/OCH/mogo-och-charter-passenger/src/main/AndroidManifest.xml b/OCH/charter/passenger/src/main/AndroidManifest.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/AndroidManifest.xml rename to OCH/charter/passenger/src/main/AndroidManifest.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/m1_style.data b/OCH/charter/passenger/src/main/assets/m1_style.data similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/assets/m1_style.data rename to OCH/charter/passenger/src/main/assets/m1_style.data diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/m1_style_extra.data b/OCH/charter/passenger/src/main/assets/m1_style_extra.data similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/assets/m1_style_extra.data rename to OCH/charter/passenger/src/main/assets/m1_style_extra.data diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/DebugView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/OrderInfoPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/OrderInfoPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/OrderInfoPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/OrderInfoPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1ContainFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1SoftFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1SoftFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1SoftFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1SoftFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1VideoFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1VideoFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1VideoFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1VideoFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/OrderInfoFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/OrderInfoFragment.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/OrderInfoFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/OrderInfoFragment.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomBar.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomBar.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomBar.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomBar.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomCheckView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomCheckView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomCheckView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomCheckView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomClickView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomClickView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomClickView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomClickView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/CloseDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/CloseDoorView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/CloseDoorView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/CloseDoorView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/OpenDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/OpenDoorView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/OpenDoorView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/OpenDoorView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/StopSiteView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/StopSiteView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/StopSiteView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/StopSiteView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/MakerWithSiteName.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/ToastCharterView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/ToastCharterView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/ToastCharterView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/ToastCharterView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt diff --git a/OCH/mogo-och-charter-passenger/src/main/res/anim/alpha_hide_show.xml b/OCH/charter/passenger/src/main/res/anim/alpha_hide_show.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/anim/alpha_hide_show.xml rename to OCH/charter/passenger/src/main/res/anim/alpha_hide_show.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_aircondition_enable.xml b/OCH/charter/passenger/src/main/res/color/bus_p_aircondition_enable.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_aircondition_enable.xml rename to OCH/charter/passenger/src/main/res/color/bus_p_aircondition_enable.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/charter/passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml rename to OCH/charter/passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml b/OCH/charter/passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml rename to OCH/charter/passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_loading.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_loading.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_loading.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_loading.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_endorder_head.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_endorder_head.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_endorder_head.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_endorder_head.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_closedoor_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_line_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_nor_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_nor_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_nor_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_nor_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_press_src.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_press_src.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_opendoor_normal_press_src.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_softsettiing_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_stopsite_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_driver_agree.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_driver_refuse.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_1.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_2.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_guidace_4.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_info_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_info_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_info_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_info_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_nor.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_nor.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_nor.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_image_welcome_nor.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_closedoor_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_go.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_right_arrow_novice_guidance.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_trajectory_line.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_trajectory_line.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_trajectory_line.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_trajectory_line.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_video.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_video.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_function_bg.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_function_bg.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_function_bg.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_function_bg.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_early_end.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_early_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_early_end.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_early_end.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end_car.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end_car.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end_car.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end_car.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_noorder.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_noorder.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_noorder.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_noorder.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/map_staton_icon.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/map_staton_icon.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/map_staton_icon.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/map_staton_icon.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_big.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_big.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_big.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_small.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_small.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_small.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png rename to OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.webp similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.webp rename to OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.webp diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml rename to OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml rename to OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml rename to OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml rename to OCH/charter/passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_go_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_go_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_go_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_go_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_opendoor_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_opendoor_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_opendoor_normal.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_opendoor_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_opendoor_press.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_opendoor_press.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_opendoor_press.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_opendoor_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_opendoor_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_opendoor_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_bottom_opendoor_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_bottom_opendoor_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_end_order.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_end_order.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_shape_line_switch_left.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_order_info.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_order_info.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_toast_shape.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_toast_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_toast_shape.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_toast_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit_ani.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_welcome_explore.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_welcome_explore.xml rename to OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml rename to OCH/charter/passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml rename to OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_checked_shape.xml b/OCH/charter/passenger/src/main/res/drawable/m1_order_line_checked_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_checked_shape.xml rename to OCH/charter/passenger/src/main/res/drawable/m1_order_line_checked_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_shape.xml b/OCH/charter/passenger/src/main/res/drawable/m1_order_line_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_shape.xml rename to OCH/charter/passenger/src/main/res/drawable/m1_order_line_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml b/OCH/charter/passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml rename to OCH/charter/passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/charter/passenger/src/main/res/drawable/taxi_video_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml rename to OCH/charter/passenger/src/main/res/drawable/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/font/din.ttf b/OCH/charter/passenger/src/main/res/font/din.ttf similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/font/din.ttf rename to OCH/charter/passenger/src/main/res/font/din.ttf diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/charter_p_view_toast.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_view_toast.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/charter_p_view_toast.xml rename to OCH/charter/passenger/src/main/res/layout/charter_p_view_toast.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_bar.xml rename to OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml b/OCH/charter/passenger/src/main/res/layout/m1_bottom_go.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml rename to OCH/charter/passenger/src/main/res/layout/m1_bottom_go.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_orderinfo.xml b/OCH/charter/passenger/src/main/res/layout/m1_bottom_orderinfo.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_orderinfo.xml rename to OCH/charter/passenger/src/main/res/layout/m1_bottom_orderinfo.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_stop_site.xml b/OCH/charter/passenger/src/main/res/layout/m1_bottom_stop_site.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_stop_site.xml rename to OCH/charter/passenger/src/main/res/layout/m1_bottom_stop_site.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_contain_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_contain_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_devices_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_devices_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_1_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_1_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_1_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_1_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_2_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_2_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_2_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_2_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_3_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_3_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_3_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_3_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_4_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_4_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_4_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_4_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml b/OCH/charter/passenger/src/main/res/layout/m1_order_end.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml rename to OCH/charter/passenger/src/main/res/layout/m1_order_end.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_order_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_order_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_line_item.xml b/OCH/charter/passenger/src/main/res/layout/m1_order_line_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_line_item.xml rename to OCH/charter/passenger/src/main/res/layout/m1_order_line_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_loading.xml b/OCH/charter/passenger/src/main/res/layout/m1_order_loading.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_loading.xml rename to OCH/charter/passenger/src/main/res/layout/m1_order_loading.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_net_fail.xml b/OCH/charter/passenger/src/main/res/layout/m1_order_net_fail.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_net_fail.xml rename to OCH/charter/passenger/src/main/res/layout/m1_order_net_fail.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_noorder.xml b/OCH/charter/passenger/src/main/res/layout/m1_order_noorder.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_noorder.xml rename to OCH/charter/passenger/src/main/res/layout/m1_order_noorder.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_site_item.xml b/OCH/charter/passenger/src/main/res/layout/m1_order_site_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_site_item.xml rename to OCH/charter/passenger/src/main/res/layout/m1_order_site_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_temperature_item.xml b/OCH/charter/passenger/src/main/res/layout/m1_soft_temperature_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_temperature_item.xml rename to OCH/charter/passenger/src/main/res/layout/m1_soft_temperature_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_blue_tooth.xml b/OCH/charter/passenger/src/main/res/layout/m1_statusview_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_blue_tooth.xml rename to OCH/charter/passenger/src/main/res/layout/m1_statusview_blue_tooth.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml b/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml rename to OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_item.xml b/OCH/charter/passenger/src/main/res/layout/m1_video_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_item.xml rename to OCH/charter/passenger/src/main/res/layout/m1_video_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_view.xml b/OCH/charter/passenger/src/main/res/layout/m1_video_view.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_view.xml rename to OCH/charter/passenger/src/main/res/layout/m1_video_view.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/orderinfo_fragment.xml b/OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/orderinfo_fragment.xml rename to OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/view_maker_sitename.xml b/OCH/charter/passenger/src/main/res/layout/view_maker_sitename.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/layout/view_maker_sitename.xml rename to OCH/charter/passenger/src/main/res/layout/view_maker_sitename.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/raw/aiqinghao.nt3d b/OCH/charter/passenger/src/main/res/raw/aiqinghao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/raw/aiqinghao.nt3d rename to OCH/charter/passenger/src/main/res/raw/aiqinghao.nt3d diff --git a/OCH/mogo-och-charter/src/main/res/raw/bus_di.mp3 b/OCH/charter/passenger/src/main/res/raw/bus_di.mp3 similarity index 100% rename from OCH/mogo-och-charter/src/main/res/raw/bus_di.mp3 rename to OCH/charter/passenger/src/main/res/raw/bus_di.mp3 diff --git a/OCH/mogo-och-charter-passenger/src/main/res/raw/jiatinghao.nt3d b/OCH/charter/passenger/src/main/res/raw/jiatinghao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/raw/jiatinghao.nt3d rename to OCH/charter/passenger/src/main/res/raw/jiatinghao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/main/res/raw/m1.nt3d b/OCH/charter/passenger/src/main/res/raw/m1.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/raw/m1.nt3d rename to OCH/charter/passenger/src/main/res/raw/m1.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/main/res/raw/m1_voice_di.mp3 b/OCH/charter/passenger/src/main/res/raw/m1_voice_di.mp3 similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/raw/m1_voice_di.mp3 rename to OCH/charter/passenger/src/main/res/raw/m1_voice_di.mp3 diff --git a/OCH/mogo-och-charter-passenger/src/main/res/raw/pengyouhao.nt3d b/OCH/charter/passenger/src/main/res/raw/pengyouhao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/raw/pengyouhao.nt3d rename to OCH/charter/passenger/src/main/res/raw/pengyouhao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/attrs.xml b/OCH/charter/passenger/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/values/attrs.xml rename to OCH/charter/passenger/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/color.xml b/OCH/charter/passenger/src/main/res/values/color.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/values/color.xml rename to OCH/charter/passenger/src/main/res/values/color.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml b/OCH/charter/passenger/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml rename to OCH/charter/passenger/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/styles.xml b/OCH/charter/passenger/src/main/res/values/styles.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/main/res/values/styles.xml rename to OCH/charter/passenger/src/main/res/values/styles.xml diff --git a/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt b/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt rename to OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ExampleUnitTest.kt diff --git a/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt b/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt rename to OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/Model.kt diff --git a/OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt b/OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt rename to OCH/charter/passenger/src/test/java/com/mogo/och/bus/passenger/ModelX.kt diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index a5732d4de4..3490b1fcb9 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -23,9 +23,9 @@ project.dependencies { } else if (isCurrentPassenger("bus")) { implementation project.project(':OCH:mogo-och-bus-passenger') } else if (isCurrentDriver("charter")) { - implementation project.project(':OCH:mogo-och-charter') + implementation project.project(':OCH:charter:driver') } else if (isCurrentPassenger("charter")) { - implementation project.project(':OCH:mogo-och-charter-passenger') + implementation project.project(':OCH:charter:passenger') } else if (isCurrentDriver("shuttle")) { implementation project(':OCH:mogo-och-shuttle') } else if (isCurrentPassenger("shuttle")) { @@ -46,8 +46,8 @@ project.dependencies { noopImplementation(project(':OCH:mogo-och-noop')) implementation project.project(':OCH:mogo-och-bus') implementation project.project(':OCH:mogo-och-bus-passenger') - implementation project.project(':OCH:mogo-och-charter') - implementation project.project(':OCH:mogo-och-charter-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:sweeper:sweeper-cloud') diff --git a/settings.gradle b/settings.gradle index 3d83bef07e..04fe6b6227 100644 --- a/settings.gradle +++ b/settings.gradle @@ -73,8 +73,8 @@ include ':OCH:mogo-och-data' include ':OCH:sweeper:sweeper' include ':OCH:sweeper:sweeper-cloud' -include ':OCH:mogo-och-charter' -include ':OCH:mogo-och-charter-passenger' +include ':OCH:charter:driver' +include ':OCH:charter:passenger' include ':OCH:mogo-och-shuttle' include ':OCH:mogo-och-shuttle-passenger'