From 219ffb65b377106dfbdb10c65d2e699b8dd561c9 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 24 Apr 2023 20:41:37 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-charter-passenger/build.gradle | 8 ----- .../src/{m1 => main}/assets/m1_style.data | Bin .../{m1 => main}/assets/m1_style_extra.data | Bin .../src/main/assets/map_style.data | Bin 68668 -> 0 bytes .../src/main/assets/map_style_extra.data | Bin 15198 -> 0 bytes .../och/bus/passenger/MogoOCHBusPassenger.kt | 0 .../mogo/och/bus/passenger/bean/LoopInfo.kt | 0 .../bean/TaxiPassengerVideoPlay.java | 0 .../och/bus/passenger/bean/Temperature.kt | 0 .../bean/request/ArriveDestRequest.kt | 0 .../request/BusPassengerQueryLineRequest.java | 0 .../passenger/bean/request/EndOrderRequest.kt | 0 .../bean/response/BusinessStatusResponse.kt | 0 .../bean/response/BusinessTimeResponse.kt | 0 .../bean/response/LineInfoListResponse.kt | 0 .../bean/response/LineInfoResponse.kt | 0 .../passenger/bean/response/LocusResponse.kt | 0 .../response/M1DriverLoginStatusResponse.kt | 0 .../bean/response/OrderInfoResponse.kt | 0 .../bean/response/SiteInfoResponse.kt | 0 .../IBusPassengerADASStatusCallback.java | 0 ...IBusPassengerControllerStatusCallback.java | 0 .../callback/IDistanceTimeCallback.kt | 0 .../callback/IOrderChangeCallback.kt | 0 .../passenger/model/CharterPassengerModel.kt | 1 - .../bus/passenger/model/OrderStatusEnum.kt | 0 .../net/BusPassengerModelLoopManager.kt | 0 .../net/BusPassengerServiceManager.kt | 0 .../bus/passenger/net/PassengerServiceApi.kt | 0 ...BusBasePassengerFunctionDevicePresenter.kt | 0 .../BusPassengerCarUseAndNoOrderPresenter.kt | 0 .../BusPassengerFunctionDevicePresenter.kt | 0 ...PassengerFunctionEarlyEndOrderPresenter.kt | 0 .../BusPassengerFunctionOrderPresenter.kt | 0 .../BusPassengerFunctionPresenter.kt | 0 .../BusPassengerFunctionSoftPresenter.kt | 0 .../BusPassengerFunctionVideoPresenter.kt | 0 .../presenter/BusPassengerPresenter.kt | 3 -- .../passenger/provider/StatusViewManager.java | 0 .../passenger/ui/M1CarUserNoOrderFragment.kt | 2 +- .../och/bus/passenger/ui/M1ContainFragment.kt | 2 +- .../och/bus/passenger/ui/M1DeviceFragment.kt | 2 +- .../passenger/ui/M1EarlyEndOrderFragment.kt | 2 +- .../och/bus/passenger/ui/M1OrderFragment.kt | 3 +- .../och/bus/passenger/ui/M1SoftFragment.kt | 29 ++++++++++++------ .../och/bus/passenger/ui/M1VideoFragment.kt | 15 +++++++-- .../mogo/och/bus/passenger/ui/MainFragment.kt | 2 +- .../ui/adapter/OrderLineItemAdapter.kt | 0 .../ui/adapter/OrderSiteItemAdapter.kt | 0 .../ui/adapter/RecyclerItemVideoHolder.java | 0 .../ui/adapter/RecyclerVideoAdapter.java | 0 .../ui/adapter/TemperatureAdapter.java | 0 .../layoutmanage/CarouselLayoutManager.java | 0 .../CarouselZoomPostLayoutListener.java | 0 .../ui/layoutmanage/CenterScrollListener.java | 0 .../ui/layoutmanage/ItemTransformation.java | 0 .../ui/layoutmanage/PagerCenterSnapHelper.kt | 0 .../passenger/ui/view/EarlyEndOrderView.kt | 0 .../och/bus/passenger/ui/view/EndOrderView.kt | 0 .../och/bus/passenger/ui/view/LineSiteView.kt | 14 +++++++-- .../passenger/ui/view/door/CloseDoorView.kt | 0 .../passenger/ui/view/door/OpenDoorView.kt | 0 .../och/bus/passenger/utils/FullVideoUtils.kt | 0 .../bus/passenger/utils/VoiceFocusManager.kt | 0 .../och/bus/passenger/utils/ZoomDrawable.kt | 0 .../bus/passenger/view/BottomDecoration.java | 4 --- .../bus/passenger/view/ConsultVideoPlayer.kt | 0 .../och/bus/passenger/view/DrawBitmapView.kt | 0 .../bus/passenger/view/DrawableCheckBox.java | 0 .../passenger/view/HorizontalDecoration.java | 0 .../passenger/view/PickerLayoutManager.java | 0 .../view/RecyclerViewCornerRadius.java | 0 .../view/drawable/MineGradientDrawable.kt | 0 .../view/statusbar/M1BlueToothView.kt | 2 +- .../passenger/view/statusbar/StatusBarView.kt | 2 +- .../{m1 => main}/res/anim/alpha_hide_show.xml | 0 .../res/color/bus_p_aircondition_enable.xml | 0 ...irconditon_pattern_text_color_selector.xml | 0 .../drawable-nodpi/bg_taxi_p_video_index.png | Bin .../bg_taxi_p_video_thumb_big.png | Bin .../bg_taxi_p_video_thumb_small.png | Bin .../bug_p_overmap_car_model.png | Bin .../res/drawable-nodpi/bus_p_car_speed.png | Bin .../bus_p_function_aircondition_nor.png | Bin ...function_aircondition_pattern_selected.png | Bin .../bus_p_function_aircondition_select.png | Bin .../bus_p_function_aircondition_selected.png | Bin ..._function_aircondition_switch_selected.png | Bin .../bus_p_function_atmosphere_nor.png | Bin .../bus_p_function_atmosphere_select.png | Bin ...p_function_device_closedoor_normal_src.png | Bin ..._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 .../bus_p_function_device_normal.png | Bin ..._p_function_device_opendoor_normal_src.png | Bin ...s_p_function_device_opendoor_press_src.png | Bin .../bus_p_function_device_press.png | Bin ..._p_function_device_stopside_normal_src.png | Bin ...s_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 .../bus_p_function_light_nor.png | Bin .../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 ...us_p_function_light_switch_bg_selected.png | Bin .../bus_p_function_order_normal.png | Bin .../bus_p_function_order_press.png | Bin .../bus_p_function_soft_normal.png | Bin .../bus_p_function_soft_press.png | Bin .../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 .../bus_p_function_voice_max.png | Bin .../bus_p_function_voice_middle_select.png | Bin .../bus_p_function_voice_middle_selected.png | Bin .../bus_p_function_voice_min.png | Bin .../res/drawable-nodpi/bus_p_loading.png | Bin .../bus_p_m1_blue_tooth_close.png | Bin .../bus_p_m1_blue_tooth_open.png | Bin .../bus_p_m1_status_bar_logo.png | Bin .../drawable-nodpi/bus_p_overmap_reset.png | Bin .../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 .../drawable-nodpi/bus_pm1_warm_wind_high.png | Bin .../drawable-nodpi/bus_pm1_warm_wind_lod.png | Bin .../bus_pm1_warm_wind_middle.png | Bin .../res/drawable-nodpi/m1_function_bg.png | Bin .../m1_line_cancle_submit_bg.png | Bin .../m1_order_closedoor_normal.png | Bin .../m1_order_closedoor_press.png | Bin .../res/drawable-nodpi/m1_order_early_end.png | Bin .../res/drawable-nodpi/m1_order_end.png | Bin .../res/drawable-nodpi/m1_order_end_car.png | Bin .../res/drawable-nodpi/m1_order_noorder.png | Bin .../m1_order_opendoor_normal.png | Bin .../m1_order_opendoor_press.png | Bin .../drawable-nodpi/m1_order_site_check.png | Bin .../m1_order_site_check_enable.png | Bin .../drawable-nodpi/m1_order_site_checked.png | Bin .../m1_order_switch_line_enable.png | Bin .../m1_order_switch_line_unenable.png | Bin .../m1_site_cancle_submit_bg.png | Bin .../res/drawable-nodpi/m1_site_submit_bg.png | Bin .../m1_small_map_view_dir_end.png | Bin .../drawable-nodpi/notice_video_pause_big.png | Bin .../notice_video_pause_small.png | Bin .../drawable-nodpi/notice_video_start_big.png | Bin .../notice_video_start_small.png | Bin .../res/drawable-nodpi/taxi_p_change_full.png | Bin .../drawable-nodpi/taxi_p_mogo_video_play.png | Bin .../drawable-nodpi/taxi_p_video_bg_bottom.png | Bin .../drawable-nodpi/taxi_p_video_bg_top.png | Bin .../drawable-nodpi/taxi_p_video_holder.png | Bin .../taxi_power_size_seekbar_style.xml | 0 .../drawable-v29/taxi_video_seekbar_style.xml | 0 .../res/drawable/bg_taxi_p_video_bg.xml | 0 .../res/drawable/bg_taxi_p_video_bg_shape.xml | 0 .../res/drawable/bg_taxi_p_video_bg_top.xml | 0 .../res/drawable/bus_p_distance_info_bg.xml | 0 .../bus_p_function_aircondition_common_bg.xml | 0 ...s_p_function_aircondition_common_bg_01.xml | 0 ...us_p_function_aircondition_left_select.xml | 0 ..._p_function_aircondition_left_selected.xml | 0 ...function_aircondition_pattern_selecotr.xml | 0 ...p_function_aircondition_pattern_select.xml | 0 ..._p_function_aircondition_switch_select.xml | 0 ..._function_aircondition_switch_selector.xml | 0 ...bus_p_function_airconditon_bg_selector.xml | 0 ...s_p_function_airconditon_left_selector.xml | 0 ...nction_airconditon_text_color_selector.xml | 0 ...s_p_function_bottom_device_bg_selector.xml | 0 ...unction_bottom_information_bg_selector.xml | 0 ...us_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 ...unction_device_closedoor_press_selecor.xml | 0 .../bus_p_function_device_go_normal.xml | 0 .../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 ...function_device_opendoor_press_selecor.xml | 0 .../bus_p_function_device_stopside_normal.xml | 0 .../bus_p_function_device_stopside_press.xml | 0 ...function_device_stopside_press_selecor.xml | 0 .../bus_p_function_distance_split_bg.xml | 0 .../bus_p_function_left_bg_select.xml | 0 .../bus_p_function_light_left_select.xml | 0 .../bus_p_function_light_left_selected.xml | 0 .../bus_p_function_light_left_selector.xml | 0 .../bus_p_function_light_switch_bg_select.xml | 0 ...us_p_function_light_switch_bg_selector.xml | 0 .../bus_p_function_setting_soft_b_shape.xml | 0 .../bus_p_function_switch_left_select.xml | 0 .../bus_p_function_switch_left_selected.xml | 0 .../bus_p_function_switch_left_selector.xml | 0 ...us_p_function_video_player_change_full.xml | 0 ..._p_function_video_player_change_normal.xml | 0 .../bus_p_function_video_player_pause_big.xml | 0 ...us_p_function_video_player_pause_small.xml | 0 .../bus_p_function_video_player_start_big.xml | 0 ...us_p_function_video_player_start_small.xml | 0 .../bus_p_function_video_player_thumb_big.xml | 0 ...us_p_function_video_player_thumb_samll.xml | 0 .../bus_p_function_voice_left_select.xml | 0 .../bus_p_function_voice_left_selected.xml | 0 .../bus_p_function_voice_left_selector.xml | 0 ...us_p_function_voice_right_process_humb.xml | 0 .../res/drawable/bus_p_overmap_reset_size.xml | 0 .../m1_order_end_closedoor_selecotr.xml | 0 .../m1_order_end_opendoor_selecotr.xml | 0 .../drawable/m1_order_line_checked_shape.xml | 0 .../res/drawable/m1_order_line_shape.xml | 0 .../taxi_power_size_seekbar_style.xml | 0 .../res/drawable/taxi_video_seekbar_style.xml | 0 .../res/layout/m1_contain_fragment.xml | 0 .../res/layout/m1_devices_fragment.xml | 0 .../res/layout/m1_main_fragment.xml | 0 .../res/layout/m1_order_early_end.xml | 0 .../{m1 => main}/res/layout/m1_order_end.xml | 0 .../res/layout/m1_order_fragment.xml | 0 .../res/layout/m1_order_line_item.xml | 0 .../res/layout/m1_order_lineside.xml | 0 .../res/layout/m1_order_noorder.xml | 0 .../res/layout/m1_order_site_item.xml | 0 .../res/layout/m1_soft_fragment.xml | 0 .../res/layout/m1_soft_temperature_item.xml | 0 .../res/layout/m1_statusview_blue_tooth.xml | 0 .../res/layout/m1_statusview_datetime.xml | 0 .../res/layout/m1_video_fragment.xml | 0 .../{m1 => main}/res/layout/m1_video_item.xml | 0 .../{m1 => main}/res/layout/m1_video_view.xml | 0 .../src/{m1 => main}/res/raw/aiqinghao.nt3d | Bin .../src/{m1 => main}/res/raw/jiatinghao.nt3d | Bin .../src/{m1 => main}/res/raw/m1.nt3d | Bin .../src/{m1 => main}/res/raw/m1_voice_di.mp3 | Bin .../src/{m1 => main}/res/raw/pengyouhao.nt3d | Bin .../src/{m1 => main}/res/values/attrs.xml | 0 .../src/{m1 => main}/res/values/color.xml | 0 .../src/{m1 => main}/res/values/strings.xml | 0 .../src/{m1 => main}/res/values/styles.xml | 0 app/script/vehicleFlavors/ochM1.gradle | 5 +-- 252 files changed, 52 insertions(+), 44 deletions(-) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/assets/m1_style.data (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/assets/m1_style_extra.data (100%) delete mode 100644 OCH/mogo-och-charter-passenger/src/main/assets/map_style.data delete mode 100644 OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/Temperature.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt (99%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt (99%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt (96%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt (96%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt (94%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt (97%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt (94%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/MainFragment.kt (99%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/BottomDecoration.java (88%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt (93%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt (98%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/anim/alpha_hide_show.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/color/bus_p_aircondition_enable.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bg_taxi_p_video_index.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bug_p_overmap_car_model.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_car_speed.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_nor.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_atmosphere_nor.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_atmosphere_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_go_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_go_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_information_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_information_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_left_bg_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_check_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_check_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_middle_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_nor.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_select_left.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_select_right.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_order_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_order_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_soft_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_soft_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_humb.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_left_select_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_max.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_middle_select.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_middle_selected.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_function_voice_min.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_loading.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_m1_status_bar_logo.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_overmap_reset.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_p_player_change_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_warm_wind_high.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_warm_wind_lod.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/bus_pm1_warm_wind_middle.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_function_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_line_cancle_submit_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_closedoor_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_closedoor_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_early_end.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_end.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_end_car.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_noorder.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_opendoor_normal.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_opendoor_press.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_site_check.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_site_check_enable.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_site_checked.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_switch_line_enable.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_order_switch_line_unenable.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_site_cancle_submit_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_site_submit_bg.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/m1_small_map_view_dir_end.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_pause_big.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_pause_small.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_start_big.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/notice_video_start_small.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_change_full.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_mogo_video_play.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_video_bg_bottom.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_video_bg_top.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-nodpi/taxi_p_video_holder.png (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-v29/taxi_power_size_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable-v29/taxi_video_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bg_taxi_p_video_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bg_taxi_p_video_bg_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bg_taxi_p_video_bg_top.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_distance_info_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_common_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_common_bg_01.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_pattern_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_switch_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_aircondition_switch_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_airconditon_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_airconditon_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_airconditon_text_color_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_device_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_information_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_order_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_bottom_soft_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_closedoor_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_closedoor_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_closedoor_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_go_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_go_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_go_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_opendoor_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_opendoor_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_opendoor_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_stopside_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_stopside_press.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_device_stopside_press_selecor.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_distance_split_bg.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_left_bg_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_switch_bg_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_light_switch_bg_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_setting_soft_b_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_switch_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_switch_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_switch_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_change_full.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_change_normal.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_pause_big.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_pause_small.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_start_big.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_start_small.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_thumb_big.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_video_player_thumb_samll.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_left_select.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_left_selected.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_left_selector.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_function_voice_right_process_humb.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/bus_p_overmap_reset_size.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_end_closedoor_selecotr.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_end_opendoor_selecotr.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_line_checked_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/m1_order_line_shape.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/taxi_power_size_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/drawable/taxi_video_seekbar_style.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_contain_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_devices_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_main_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_early_end.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_end.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_line_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_lineside.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_noorder.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_order_site_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_soft_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_soft_temperature_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_statusview_blue_tooth.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_statusview_datetime.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_video_fragment.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_video_item.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/layout/m1_video_view.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/aiqinghao.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/jiatinghao.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/m1.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/m1_voice_di.mp3 (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/raw/pengyouhao.nt3d (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/attrs.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/color.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/strings.xml (100%) rename OCH/mogo-och-charter-passenger/src/{m1 => main}/res/values/styles.xml (100%) diff --git a/OCH/mogo-och-charter-passenger/build.gradle b/OCH/mogo-och-charter-passenger/build.gradle index 5df151bed5..c0e8c71d13 100644 --- a/OCH/mogo-och-charter-passenger/build.gradle +++ b/OCH/mogo-och-charter-passenger/build.gradle @@ -45,14 +45,6 @@ android { } } - flavorDimensions "vehicle" - productFlavors { - // 车型：金旅m1 包车业务 - m1 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } - } } dependencies { diff --git a/OCH/mogo-och-charter-passenger/src/m1/assets/m1_style.data b/OCH/mogo-och-charter-passenger/src/main/assets/m1_style.data similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/assets/m1_style.data rename to OCH/mogo-och-charter-passenger/src/main/assets/m1_style.data diff --git a/OCH/mogo-och-charter-passenger/src/m1/assets/m1_style_extra.data b/OCH/mogo-och-charter-passenger/src/main/assets/m1_style_extra.data similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/assets/m1_style_extra.data rename to OCH/mogo-och-charter-passenger/src/main/assets/m1_style_extra.data diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/map_style.data b/OCH/mogo-och-charter-passenger/src/main/assets/map_style.data deleted file mode 100644 index ab077f984974ac9aca03d62b22520bb815b24fdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68668 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 XzkmOJSB~o6|NQMc?)k8PrT+g16}B4e diff --git a/OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data b/OCH/mogo-och-charter-passenger/src/main/assets/map_style_extra.data deleted file mode 100644 index 01f7f2116ecf898b4b694db6f591728d6361cd46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15198 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 Y?wU5;`4y_WAS+sT`&I=>`_^Vt1It@_mjD0& diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/LoopInfo.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/Temperature.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceTimeCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt similarity index 99% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 412c5e52ee..8cb85c1c03 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -3,7 +3,6 @@ package com.mogo.och.bus.passenger.model import android.annotation.SuppressLint import android.content.Context import android.net.ConnectivityManager -import android.os.Build import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerModelLoopManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionEarlyEndOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionSoftPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionVideoPresenter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 42d71ccc95..0489cbaa8d 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -3,7 +3,6 @@ package com.mogo.och.bus.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng import com.mogo.commons.voice.AIAssist -import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager @@ -14,7 +13,6 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse -import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback import com.mogo.och.bus.passenger.callback.IOrderChangeCallback import com.mogo.och.bus.passenger.callback.IDistanceTimeCallback import com.mogo.och.bus.passenger.model.CharterPassengerModel @@ -34,7 +32,6 @@ import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.DPCommonOperationMsg import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager -import io.reactivex.disposables.Disposable import java.util.* class BusPassengerPresenter(view: MainFragment?) : diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt index 1535546529..e01f63d718 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1CarUserNoOrderFragment.kt @@ -15,7 +15,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager -import kotlinx.android.synthetic.m1.m1_order_end.* +import kotlinx.android.synthetic.main.m1_order_end.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt similarity index 99% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt index 1284e5ac9d..1810e6ae86 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1ContainFragment.kt @@ -16,7 +16,7 @@ import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.SharedPrefs import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionPresenter -import kotlinx.android.synthetic.m1.m1_contain_fragment.* +import kotlinx.android.synthetic.main.m1_contain_fragment.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt similarity index 96% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt index 0d53a22e6e..3a914f1f50 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1DeviceFragment.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter import com.mogo.och.common.module.utils.SoundPoolHelper -import kotlinx.android.synthetic.m1.m1_devices_fragment.* +import kotlinx.android.synthetic.main.m1_devices_fragment.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt similarity index 96% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt index ff0c1d92e7..7c46d0c176 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1EarlyEndOrderFragment.kt @@ -5,7 +5,7 @@ import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionEarlyEndOrderPresenter -import kotlinx.android.synthetic.m1.m1_order_early_end.* +import kotlinx.android.synthetic.main.m1_order_early_end.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt similarity index 94% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt index 362da620f7..35e1459f48 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1OrderFragment.kt @@ -4,10 +4,9 @@ import android.os.Bundle import android.view.View import com.mogo.commons.mvp.MvpFragment import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay import com.mogo.och.bus.passenger.model.OrderStatusEnum import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionOrderPresenter -import kotlinx.android.synthetic.m1.m1_order_fragment.* +import kotlinx.android.synthetic.main.m1_order_fragment.* /** * @author: yangyakun diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt similarity index 97% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt index 60e3875e57..7697bf38f0 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt @@ -16,9 +16,6 @@ import android.widget.SeekBar import android.widget.SeekBar.OnSeekBarChangeListener import android.widget.TextView import androidx.core.content.ContextCompat -import androidx.core.view.isVisible -import androidx.recyclerview.widget.LinearSnapHelper -import androidx.recyclerview.widget.SnapHelper import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -38,7 +35,7 @@ import com.yangyakun.main.ui.loading.drawable.MineGradientDrawable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.m1.m1_soft_fragment.* +import kotlinx.android.synthetic.main.m1_soft_fragment.* import me.jessyan.autosize.utils.AutoSizeUtils import java.util.concurrent.TimeUnit @@ -229,20 +226,34 @@ class M1SoftFragment : } } val pickerLayoutManager = - PickerLayoutManager(requireContext(), PickerLayoutManager.HORIZONTAL, false) + PickerLayoutManager( + requireContext(), + PickerLayoutManager.HORIZONTAL, + false + ) pickerLayoutManager.isChangeAlpha = true pickerLayoutManager.scaleDownBy = 0.29f pickerLayoutManager.scaleDownDistance = 0.8f val data = getData() - val adapter = TemperatureAdapter(requireContext(), data, rv_aircondition_temperature) + val adapter = TemperatureAdapter( + requireContext(), + data, + rv_aircondition_temperature + ) val snapHelper = PagerCenterSnapHelper() snapHelper.attachToRecyclerView(rv_aircondition_temperature) rv_aircondition_temperature.layoutManager = pickerLayoutManager rv_aircondition_temperature.adapter = adapter - HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt(HorizontalDecoration.distancekey,0) + HorizontalDecoration.distance = SharedPrefsMgr.getInstance(requireContext()).getInt( + HorizontalDecoration.distancekey,0) val space = AutoSizeUtils.dp2px(context, 15f) - rv_aircondition_temperature.addItemDecoration(HorizontalDecoration(space,data.size-1)) + rv_aircondition_temperature.addItemDecoration( + HorizontalDecoration( + space, + data.size - 1 + ) + ) pickerLayoutManager.setOnScrollStopListener { view -> if (view is TextView) { @@ -272,7 +283,7 @@ class M1SoftFragment : } } - private fun setCheckAir(adapter:TemperatureAdapter,tag:Temperature){ + private fun setCheckAir(adapter: TemperatureAdapter, tag:Temperature){ adapter.setCheckIndex(tag.index) currentTemperature = tag if (rv_aircondition_temperature.tag == touchTag) { diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt similarity index 94% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt index bf832a2e49..8def79dab3 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/M1VideoFragment.kt @@ -13,7 +13,7 @@ import com.mogo.och.bus.passenger.ui.layoutmanage.CarouselZoomPostLayoutListener import com.mogo.och.bus.passenger.ui.layoutmanage.CenterScrollListener import com.mogo.och.bus.passenger.view.ConsultVideoPlayer import com.shuyu.gsyvideoplayer.video.base.GSYVideoView -import kotlinx.android.synthetic.m1.m1_video_fragment.* +import kotlinx.android.synthetic.main.m1_video_fragment.* import kotlin.math.floor /** @@ -35,7 +35,11 @@ class M1VideoFragment : override fun initViews() { initConsultData() - val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true) + val carouselLayoutManager = + CarouselLayoutManager( + CarouselLayoutManager.HORIZONTAL, + true + ) carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener()) carouselLayoutManager.maxVisibleItems = 1 rvVideoPlaylist.addOnScrollListener(object : CenterScrollListener() { @@ -81,7 +85,12 @@ class M1VideoFragment : } } } - val recyclerVideoAdapter = RecyclerVideoAdapter(requireContext(), arrayListOf, rvVideoPlaylist) + val recyclerVideoAdapter = + RecyclerVideoAdapter( + requireContext(), + arrayListOf, + rvVideoPlaylist + ) recyclerVideoAdapter.setOnThumbImageClilckListener { val (_: kotlin.Int, player) = getPlayer(carouselLayoutManager) if (player is ConsultVideoPlayer) { diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt similarity index 99% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 2323b2e724..8b753876ad 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -27,7 +27,7 @@ import com.mogo.och.common.module.voice.VoiceManager import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter import com.mogo.och.bus.passenger.utils.VoiceFocusManager import com.mogo.och.common.module.biz.constant.LoginStatusManager -import kotlinx.android.synthetic.m1.m1_main_fragment.* +import kotlinx.android.synthetic.main.m1_main_fragment.* import java.lang.ref.WeakReference /** diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderSiteItemAdapter.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerItemVideoHolder.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/RecyclerVideoAdapter.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/TemperatureAdapter.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselLayoutManager.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CarouselZoomPostLayoutListener.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/CenterScrollListener.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/ItemTransformation.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanage/PagerCenterSnapHelper.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EarlyEndOrderView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/EndOrderView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index b8b5a1e113..3ebe752a6b 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -36,7 +36,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg import io.reactivex.disposables.Disposable -import kotlinx.android.synthetic.m1.m1_order_lineside.view.* +import kotlinx.android.synthetic.main.m1_order_lineside.view.* import me.jessyan.autosize.utils.AutoSizeUtils class LineSiteView @JvmOverloads constructor( @@ -99,12 +99,20 @@ class LineSiteView @JvmOverloads constructor( super.onAttachedToWindow() rlv_line_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) - rlv_line_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context, 60f))) + rlv_line_list.addItemDecoration( + BottomDecoration( + AutoSizeUtils.dp2px(context, 60f) + ) + ) rlv_line_list.adapter = lineAdapter rv_site_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) - rv_site_list.addItemDecoration(BottomDecoration(AutoSizeUtils.dp2px(context, 60f))) + rv_site_list.addItemDecoration( + BottomDecoration( + AutoSizeUtils.dp2px(context, 60f) + ) + ) rv_site_list.adapter = siteAdapter val hasSetLineAndSite = CharterPassengerModel.hasSetLineAndSite() diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/CloseDoorView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/door/OpenDoorView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java similarity index 88% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java index 78ec3608db..55c4d28cd1 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/BottomDecoration.java +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/BottomDecoration.java @@ -6,10 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; -import com.mogo.och.bus.passenger.ui.adapter.TemperatureAdapter; - public class BottomDecoration extends RecyclerView.ItemDecoration { /** * 第一个视图和最后一个视图偏移的距离 diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawBitmapView.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/DrawableCheckBox.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/HorizontalDecoration.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/PickerLayoutManager.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java b/OCH/mogo-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/m1/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/RecyclerViewCornerRadius.java diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/drawable/MineGradientDrawable.kt diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt similarity index 93% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt index 7a7ce0013f..e193fa8785 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/M1BlueToothView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.m1.m1_statusview_blue_tooth.view.* +import kotlinx.android.synthetic.main.m1_statusview_blue_tooth.view.* /** * 魔戒蓝牙控件 diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt similarity index 98% rename from OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt rename to OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt index 9c9abbefc2..22a782b541 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt @@ -20,7 +20,7 @@ import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.m1.m1_statusview_datetime.view.* +import kotlinx.android.synthetic.main.m1_statusview_datetime.view.* import me.jessyan.autosize.utils.AutoSizeUtils import kotlin.math.roundToInt diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/anim/alpha_hide_show.xml b/OCH/mogo-och-charter-passenger/src/main/res/anim/alpha_hide_show.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/anim/alpha_hide_show.xml rename to OCH/mogo-och-charter-passenger/src/main/res/anim/alpha_hide_show.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_aircondition_enable.xml b/OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_aircondition_enable.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_aircondition_enable.xml rename to OCH/mogo-och-charter-passenger/src/main/res/color/bus_p_aircondition_enable.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/mogo-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/m1/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml rename to OCH/mogo-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/m1/res/drawable-nodpi/bg_taxi_p_video_index.png b/OCH/mogo-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/m1/res/drawable-nodpi/bg_taxi_p_video_index.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png b/OCH/mogo-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/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png b/OCH/mogo-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/m1/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bug_p_overmap_car_model.png b/OCH/mogo-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/m1/res/drawable-nodpi/bug_p_overmap_car_model.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_aircondition_nor.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_aircondition_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_aircondition_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_atmosphere_nor.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_atmosphere_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_go_normal_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_go_press_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_normal.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_press.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_information_normal.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_information_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_information_press.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_information_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_left_bg_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_select.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_check_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_check_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_middle_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_nor.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_nor.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_left.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_select_left.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_select_right.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_select_right.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_order_normal.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_order_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_order_press.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_order_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_normal.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_soft_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_soft_press.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_soft_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_humb.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_humb.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_left_select_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png rename to OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_max.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_max.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_middle_select.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_middle_selected.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_function_voice_min.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_function_voice_min.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_loading.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_loading.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_loading.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_loading.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_m1_status_bar_logo.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_overmap_reset.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_p_player_change_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_pm1_warm_wind_high.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_pm1_warm_wind_lod.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png b/OCH/mogo-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/m1/res/drawable-nodpi/bus_pm1_warm_wind_middle.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_function_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_function_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_function_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_function_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_line_cancle_submit_bg.png b/OCH/mogo-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/m1/res/drawable-nodpi/m1_line_cancle_submit_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_closedoor_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_closedoor_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_early_end.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_early_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_early_end.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_early_end.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end_car.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end_car.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_end_car.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_end_car.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_noorder.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_noorder.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_noorder.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_noorder.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_normal.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_opendoor_press.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_check_enable.png b/OCH/mogo-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/m1/res/drawable-nodpi/m1_order_site_check_enable.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_checked.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_site_checked.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_switch_line_enable.png b/OCH/mogo-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/m1/res/drawable-nodpi/m1_order_switch_line_enable.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_order_switch_line_unenable.png b/OCH/mogo-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/m1/res/drawable-nodpi/m1_order_switch_line_unenable.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_site_cancle_submit_bg.png b/OCH/mogo-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/m1/res/drawable-nodpi/m1_site_cancle_submit_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_site_submit_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_site_submit_bg.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png b/OCH/mogo-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/m1/res/drawable-nodpi/m1_small_map_view_dir_end.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_big.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_pause_small.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_big.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_big.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_big.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_small.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/notice_video_start_small.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/notice_video_start_small.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_change_full.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png b/OCH/mogo-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/m1/res/drawable-nodpi/taxi_p_mogo_video_play.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png b/OCH/mogo-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/m1/res/drawable-nodpi/taxi_p_video_bg_bottom.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_bg_top.png b/OCH/mogo-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/m1/res/drawable-nodpi/taxi_p_video_bg_top.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.png similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-nodpi/taxi_p_video_holder.png rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.png diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_power_size_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_power_size_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_power_size_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable-v29/taxi_video_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/mogo-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/m1/res/drawable/bg_taxi_p_video_bg_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/mogo-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/m1/res/drawable/bg_taxi_p_video_bg_top.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_distance_info_bg.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_distance_info_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_common_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_common_bg_01.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_left_selected.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_pattern_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_switch_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_aircondition_switch_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_airconditon_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_left_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_airconditon_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_airconditon_text_color_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_bottom_device_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_bottom_information_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_order_bg_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_bottom_order_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_bottom_soft_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_normal.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_closedoor_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_closedoor_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_closedoor_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_normal.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_go_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_go_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_go_press_selecor.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_go_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_normal.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_opendoor_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_opendoor_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_opendoor_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_normal.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_stopside_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_stopside_press.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_device_stopside_press_selecor.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_distance_split_bg.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_left_bg_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_left_bg_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_light_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selected.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_light_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_left_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_light_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_light_switch_bg_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_light_switch_bg_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_setting_soft_b_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_switch_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selected.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_switch_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_switch_left_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_switch_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_full.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_change_full.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_change_normal.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_big.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_pause_big.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_pause_small.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_pause_small.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_big.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_start_big.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_start_small.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_start_small.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_big.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_thumb_big.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_video_player_thumb_samll.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_select.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_voice_left_select.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selected.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_voice_left_selected.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_left_selector.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_voice_left_selector.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_function_voice_right_process_humb.xml b/OCH/mogo-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/m1/res/drawable/bus_p_function_voice_right_process_humb.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/bus_p_overmap_reset_size.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_closedoor_selecotr.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_end_opendoor_selecotr.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_checked_shape.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_checked_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_checked_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_checked_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_shape.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_shape.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/m1_order_line_shape.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_line_shape.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_power_size_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/drawable/taxi_video_seekbar_style.xml rename to OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_contain_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_contain_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_contain_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_devices_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_main_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_early_end.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_early_end.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_early_end.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_end.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_line_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_line_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_line_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_line_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_lineside.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_lineside.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_lineside.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_noorder.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_noorder.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_noorder.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_site_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_site_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_order_site_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_site_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_temperature_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_temperature_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_soft_temperature_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_soft_temperature_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_blue_tooth.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_blue_tooth.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_blue_tooth.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_blue_tooth.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_statusview_datetime.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_fragment.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_fragment.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_fragment.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_item.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_item.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_item.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_item.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_view.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_view.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/layout/m1_video_view.xml rename to OCH/mogo-och-charter-passenger/src/main/res/layout/m1_video_view.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/aiqinghao.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/aiqinghao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/aiqinghao.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/aiqinghao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/jiatinghao.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/jiatinghao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/jiatinghao.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/jiatinghao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/m1.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/m1.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1_voice_di.mp3 b/OCH/mogo-och-charter-passenger/src/main/res/raw/m1_voice_di.mp3 similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/m1_voice_di.mp3 rename to OCH/mogo-och-charter-passenger/src/main/res/raw/m1_voice_di.mp3 diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/raw/pengyouhao.nt3d b/OCH/mogo-och-charter-passenger/src/main/res/raw/pengyouhao.nt3d similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/raw/pengyouhao.nt3d rename to OCH/mogo-och-charter-passenger/src/main/res/raw/pengyouhao.nt3d diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/attrs.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/attrs.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/attrs.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/attrs.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/color.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/color.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/color.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/strings.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml diff --git a/OCH/mogo-och-charter-passenger/src/m1/res/values/styles.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/styles.xml similarity index 100% rename from OCH/mogo-och-charter-passenger/src/m1/res/values/styles.xml rename to OCH/mogo-och-charter-passenger/src/main/res/values/styles.xml diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle index 77bdc5e030..27dd69aeee 100644 --- a/app/script/vehicleFlavors/ochM1.gradle +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -22,9 +22,6 @@ project.android.productFlavors { if(isDriver()){ matchingFallbacks = ['driverm1'] } - if(isPassenger()){ - matchingFallbacks = ['m1'] - } - + } } \ No newline at end of file