From 02c032f8fb2b3ec81445f72b3bc015505fdeb627 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 21 Sep 2023 15:09:05 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20[charter=5Fp]=20[=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCH/charter/passenger/build.gradle            |   2 +
 .../passenger/model/CharterPassengerModel.kt  |   4 +-
 .../presenter/BusPassengerPresenter.kt        |   6 +-
 .../passenger/receive/DriverMessage.kt        |   2 +-
 .../och/charter/passenger/ui/MainFragment.kt  |  29 ++--
 .../charter/passenger/ui/bottom/BottomBar.kt  |  11 +-
 .../passenger/ui/bottom/BottomCheckView.kt    |  17 +--
 .../passenger/ui/bottom/BottomClickView.kt    |  19 +--
 .../ui/bottom/BottomOrderInfoView.kt          |  15 +-
 .../ui/bottom/impl/GoViewWithArrive.kt        |   7 +-
 .../passenger/ui/debugview/DebugView.kt       |  10 +-
 .../M1CarUserNoOrderFragment.kt               |   7 +-
 .../dialogfragment/NoviceGuidanceFragment.kt  |  43 ++++--
 .../passenger/ui/itinerary/ItineraryView.kt   |  12 +-
 .../ui/itinerary/ItineraryViewModel.kt        |   4 +-
 .../ui/lockview/LockAndUnlockView.kt          |  14 +-
 .../passenger/ui/lockview/UnlockView.kt       |   6 +-
 .../passenger/ui/orderinfo/OrderInfoView.kt   |  18 +--
 .../ui/overmapview/MakerWithSiteName.kt       |   4 +-
 .../passenger/ui/selectline/SelectLineView.kt |  33 +++--
 .../adapter/OrderLineItemAdapter.kt           |   8 +-
 .../adapter/OrderSiteItemAdapter.kt           |  12 +-
 .../layoutmanage/PickerLayoutManager.java     |   2 +-
 .../ui/softcontrol/SoftControlView.kt         | 115 ++++++++--------
 .../adapter/TemperatureAdapter.java           |   7 +-
 .../ui/softcontrol/view/DrawBitmapView.kt     |   8 +-
 .../passenger/ui/statusbar/M1BlueToothView.kt |   8 +-
 .../passenger/ui/statusbar/StatusBarView.kt   |  12 +-
 .../passenger/ui/video/ConsultVideoPlayer.kt  |  24 ++--
 .../charter/passenger/ui/video/VideoView.kt   |   8 +-
 .../video/adapter/RecyclerVideoAdapter.java   |   6 +-
 ...show.xml => charter_p_alpha_hide_show.xml} |   0
 .../res/color/bus_p_aircondition_enable.xml   |   5 -
 .../color/charter_p_aircondition_enable.xml   |   5 +
 ...rconditon_pattern_text_color_selector.xml} |   4 +-
 .../charter_p_select_city_name_textcolor.xml  |   4 +-
 ...g => charter_p_aircondition_wind_high.png} | Bin
 ...ng => charter_p_aircondition_wind_low.png} | Bin
 ...=> charter_p_aircondition_wind_middle.png} | Bin
 ...ose.png => charter_p_blue_tooth_close.png} | Bin
 ...open.png => charter_p_blue_tooth_open.png} | Bin
 ...png => charter_p_bottom_bar_select_bg.png} | Bin
 ..._car_speed.png => charter_p_car_speed.png} | Bin
 ...nge_full.png => charter_p_change_full.png} | Bin
 ..._bg.png => charter_p_distance_info_bg.png} | Bin
 ...=> charter_p_end_order_openclosedoor.webp} | Bin
 ...r_head.png => charter_p_endorder_head.png} | Bin
 ...> charter_p_function_aircondition_nor.png} | Bin
 ...unction_aircondition_pattern_selected.png} | Bin
 ...harter_p_function_aircondition_select.png} | Bin
 ...rter_p_function_aircondition_selected.png} | Bin
 ...function_aircondition_switch_selected.png} | Bin
 ... => charter_p_function_atmosphere_nor.png} | Bin
 ... charter_p_function_atmosphere_select.png} | Bin
 ...ion_bg.webp => charter_p_function_bg.webp} | Bin
 ..._function_device_closedoor_normal_src.png} | Bin
 ...p_function_device_closedoor_press_src.png} | Bin
 ...arter_p_function_device_go_normal_src.png} | Bin
 ...harter_p_function_device_go_press_src.png} | Bin
 ...g => charter_p_function_device_normal.png} | Bin
 ...p_function_device_opendoor_normal_src.png} | Bin
 ..._p_function_device_opendoor_press_src.png} | Bin
 ...ng => charter_p_function_device_press.png} | Bin
 ...p_function_device_stopside_normal_src.png} | Bin
 ..._p_function_device_stopside_press_src.png} | Bin
 ...charter_p_function_information_normal.png} | Bin
 ... charter_p_function_information_press.png} | Bin
 ...> charter_p_function_left_bg_selected.png} | Bin
 ...charter_p_function_light_check_select.png} | Bin
 ...arter_p_function_light_check_selected.png} | Bin
 ...rter_p_function_light_middle_selected.png} | Bin
 ...r.png => charter_p_function_light_nor.png} | Bin
 ...ng => charter_p_function_light_select.png} | Bin
 ... charter_p_function_light_select_left.png} | Bin
 ...charter_p_function_light_select_right.png} | Bin
 ... => charter_p_function_light_selected.png} | Bin
 ...r_p_function_light_switch_bg_selected.png} | Bin
 ...ng => charter_p_function_order_normal.png} | Bin
 ...png => charter_p_function_order_press.png} | Bin
 ...png => charter_p_function_soft_normal.png} | Bin
 ....png => charter_p_function_soft_press.png} | Bin
 ....png => charter_p_function_voice_humb.png} | Bin
 ...rter_p_function_voice_left_select_src.png} | Bin
 ...er_p_function_voice_left_selected_src.png} | Bin
 ...x.png => charter_p_function_voice_max.png} | Bin
 ...harter_p_function_voice_middle_select.png} | Bin
 ...rter_p_function_voice_middle_selected.png} | Bin
 ...n.png => charter_p_function_voice_min.png} | Bin
 ...ng => charter_p_line_cancle_submit_bg.png} | Bin
 ...us_p_loading.png => charter_p_loading.png} | Bin
 ...icon.png => charter_p_map_staton_icon.png} | Bin
 ...play.png => charter_p_mogo_video_play.png} | Bin
 ...rger_p_normal.png => charter_p_normal.png} | Bin
 ...g => charter_p_notice_video_pause_big.png} | Bin
 ...=> charter_p_notice_video_pause_small.png} | Bin
 ...g => charter_p_notice_video_start_big.png} | Bin
 ...=> charter_p_notice_video_start_small.png} | Bin
 ..._end.png => charter_p_order_early_end.png} | Bin
 ..._order_end.png => charter_p_order_end.png} | Bin
 ...nd_car.png => charter_p_order_end_car.png} | Bin
 ..._fail.png => charter_p_order_net_fail.png} | Bin
 ...oorder.png => charter_p_order_noorder.png} | Bin
 ...ng => charter_p_order_opendoor_normal.png} | Bin
 ...png => charter_p_order_opendoor_press.png} | Bin
 ...eck.png => charter_p_order_site_check.png} | Bin
 ... => charter_p_order_site_check_enable.png} | Bin
 ...d.png => charter_p_order_site_checked.png} | Bin
 ...=> charter_p_order_switch_line_enable.png} | Bin
 ... charter_p_order_switch_line_unenable.png} | Bin
 ...el.png => charter_p_overmap_car_model.png} | Bin
 ..._reset.png => charter_p_overmap_reset.png} | Bin
 ...png => charter_p_player_change_normal.png} | Bin
 ...ng => charter_p_site_cancle_submit_bg.png} | Bin
 ...it_bg.png => charter_p_site_submit_bg.png} | Bin
 ...g => charter_p_small_map_view_dir_end.png} | Bin
 ...logo.png => charter_p_status_bar_logo.png} | Bin
 ...ttom.png => charter_p_video_bg_bottom.png} | Bin
 ...older.webp => charter_p_video_holder.webp} | Bin
 ...eo_index.png => charter_p_video_index.png} | Bin
 ..._big.png => charter_p_video_thumb_big.png} | Bin
 ...ll.png => charter_p_video_thumb_small.png} | Bin
 ..._high.png => charter_p_warm_wind_high.png} | Bin
 ...nd_lod.png => charter_p_warm_wind_lod.png} | Bin
 ...dle.png => charter_p_warm_wind_middle.png} | Bin
 .../drawable-nodpi/taxi_p_video_bg_top.png    | Bin 6954 -> 0 bytes
 ...function_aircondition_pattern_selecotr.xml |   6 -
 ..._function_aircondition_switch_selector.xml |   6 -
 ...bus_p_function_airconditon_bg_selector.xml |   6 -
 ...s_p_function_airconditon_left_selector.xml |   6 -
 ...s_p_function_bottom_device_bg_selector.xml |   8 --
 ...unction_bottom_information_bg_selector.xml |   8 --
 ...us_p_function_bottom_order_bg_selector.xml |   8 --
 ...bus_p_function_bottom_soft_bg_selector.xml |   8 --
 ...unction_device_closedoor_press_selecor.xml |   6 -
 .../bus_p_function_device_opendoor_normal.xml |   7 -
 .../bus_p_function_device_opendoor_press.xml  |   7 -
 ...function_device_opendoor_press_selecor.xml |   6 -
 .../bus_p_function_device_stopside_normal.xml |   7 -
 .../bus_p_function_device_stopside_press.xml  |   7 -
 ...function_device_stopside_press_selecor.xml |   6 -
 .../bus_p_function_light_left_selector.xml    |   6 -
 ...us_p_function_light_switch_bg_selector.xml |   6 -
 .../bus_p_function_voice_left_selector.xml    |   6 -
 ...xml => charter_p_baseline_link_off_24.xml} |   0
 ...g.xml => charter_p_bg_taxi_p_video_bg.xml} |   0
 ...ter_p_function_aircondition_common_bg.xml} |   2 +-
 ..._p_function_aircondition_common_bg_01.xml} |   0
 ...r_p_function_aircondition_left_select.xml} |   2 +-
 ...p_function_aircondition_left_selected.xml} |   2 +-
 ...function_aircondition_pattern_selecotr.xml |   6 +
 ..._function_aircondition_pattern_select.xml} |   0
 ...p_function_aircondition_switch_select.xml} |   0
 ..._function_aircondition_switch_selector.xml |   6 +
 ...er_p_function_airconditon_bg_selector.xml} |   6 +-
 ...r_p_function_airconditon_left_selector.xml |   6 +
 ...ction_airconditon_text_color_selector.xml} |   4 +-
 ...r_p_function_bottom_device_bg_selector.xml |   8 ++
 ...unction_bottom_information_bg_selector.xml |   8 ++
 ...er_p_function_bottom_order_bg_selector.xml |   8 ++
 ...ter_p_function_bottom_soft_bg_selector.xml |   8 ++
 ...ter_p_function_device_closedoor_normal.xml |   7 +
 ...rter_p_function_device_closedoor_press.xml |   7 +
 ...unction_device_closedoor_press_selecor.xml |   6 +
 ...> charter_p_function_device_go_normal.xml} |   2 +-
 ...=> charter_p_function_device_go_press.xml} |   2 +-
 ...ter_p_function_device_go_press_selecor.xml |   6 +
 ...rter_p_function_device_opendoor_normal.xml |   7 +
 ...rter_p_function_device_opendoor_press.xml} |   2 +-
 ...function_device_opendoor_press_selecor.xml |   6 +
 ...rter_p_function_device_stopside_normal.xml |   7 +
 ...rter_p_function_device_stopside_press.xml} |   2 +-
 ...function_device_stopside_press_selecor.xml |   6 +
 ... charter_p_function_distance_split_bg.xml} |   0
 ... => charter_p_function_left_bg_select.xml} |   0
 ... charter_p_function_light_left_select.xml} |   2 +-
 ...harter_p_function_light_left_selected.xml} |   2 +-
 ...charter_p_function_light_left_selector.xml |   6 +
 ...ter_p_function_light_switch_bg_select.xml} |   0
 ...er_p_function_light_switch_bg_selector.xml |   6 +
 ...arter_p_function_setting_soft_b_shape.xml} |   0
 ...charter_p_function_switch_left_select.xml} |   2 +-
 ...arter_p_function_switch_left_selected.xml} |   2 +-
 ...harter_p_function_switch_left_selector.xml |   6 +
 ...r_p_function_video_player_change_full.xml} |   2 +-
 ...p_function_video_player_change_normal.xml} |   2 +-
 ...ter_p_function_video_player_pause_big.xml} |   2 +-
 ...r_p_function_video_player_pause_small.xml} |   2 +-
 ...ter_p_function_video_player_start_big.xml} |   2 +-
 ...r_p_function_video_player_start_small.xml} |   2 +-
 ...ter_p_function_video_player_thumb_big.xml} |   2 +-
 ...r_p_function_video_player_thumb_samll.xml} |   2 +-
 ... charter_p_function_voice_left_select.xml} |   2 +-
 ...harter_p_function_voice_left_selected.xml} |   2 +-
 ...charter_p_function_voice_left_selector.xml |   6 +
 ...r_p_function_voice_right_process_humb.xml} |   2 +-
 .../charter_p_open_lock_000.png}              | Bin
 .../charter_p_open_lock_000_0.png}            | Bin
 .../charter_p_open_lock_001.png}              | Bin
 .../charter_p_open_lock_002.png}              | Bin
 .../charter_p_open_lock_003.png}              | Bin
 .../charter_p_open_lock_004.png}              | Bin
 .../charter_p_open_lock_005.png}              | Bin
 .../charter_p_open_lock_006.png}              | Bin
 .../charter_p_open_lock_007.png}              | Bin
 .../charter_p_open_lock_008.png}              | Bin
 .../charter_p_open_lock_009.png}              | Bin
 .../charter_p_open_lock_010.png}              | Bin
 .../charter_p_open_lock_011.png}              | Bin
 .../charter_p_open_lock_012.png}              | Bin
 .../charter_p_open_lock_013.png}              | Bin
 .../charter_p_open_lock_014.png}              | Bin
 .../charter_p_open_lock_015.png}              | Bin
 .../charter_p_open_lock_016.png}              | Bin
 .../charter_p_open_lock_017.png}              | Bin
 .../charter_p_open_lock_018.png}              | Bin
 .../charter_p_open_lock_019.png}              | Bin
 .../charter_p_open_lock_020.png}              | Bin
 .../charter_p_open_lock_021.png}              | Bin
 .../charter_p_open_lock_022.png}              | Bin
 .../charter_p_open_lock_023.png}              | Bin
 ...harter_p_order_end_closedoor_selecotr.xml} |   0
 ...charter_p_order_end_opendoor_selecotr.xml} |   6 +-
 ...=> charter_p_order_line_checked_shape.xml} |   2 +-
 ...ape.xml => charter_p_order_line_shape.xml} |   6 +-
 ...e.xml => charter_p_overmap_reset_size.xml} |   2 +-
 ...=> charter_p_power_size_seekbar_style.xml} |   6 +-
 .../charter_p_selct_site_bottom_corner.xml    |   2 +-
 ...arter_p_selct_site_name_shape_selected.xml |   2 +-
 ...harter_p_shape_cancle_line_site_change.xml |   2 +-
 .../drawable/charter_p_shape_end_order.xml    |   2 +-
 .../charter_p_shape_end_order_left.xml        |   2 +-
 .../drawable/charter_p_shape_order_info.xml   |   2 +-
 ...harter_p_shape_submit_line_site_change.xml |   2 +-
 ...shape.xml => charter_p_video_bg_shape.xml} |   0
 ..._bg_top.xml => charter_p_video_bg_top.xml} |   0
 ....xml => charter_p_video_seekbar_style.xml} |   0
 .../charter_p_wait_driver_submit01.webp       | Bin
 .../charter_p_wait_driver_submit02.webp       | Bin
 .../charter_p_wait_driver_submit03.webp       | Bin
 .../charter_p_wait_driver_submit04.webp       | Bin
 .../charter_p_wait_driver_submit05.webp       | Bin
 .../charter_p_wait_driver_submit06.webp       | Bin
 .../charter_p_wait_driver_submit07.webp       | Bin
 .../charter_p_wait_driver_submit08.webp       | Bin
 .../charter_p_wait_driver_submit09.webp       | Bin
 .../charter_p_wait_driver_submit10.webp       | Bin
 .../charter_p_wait_driver_submit11.webp       | Bin
 .../charter_p_wait_driver_submit12.webp       | Bin
 .../charter_p_wait_driver_submit13.webp       | Bin
 .../charter_p_wait_driver_submit14.webp       | Bin
 .../charter_p_wait_driver_submit15.webp       | Bin
 .../charter_p_wait_driver_submit16.webp       | Bin
 .../charter_p_wait_driver_submit17.webp       | Bin
 .../charter_p_wait_driver_submit18.webp       | Bin
 .../charter_p_wait_driver_submit19.webp       | Bin
 .../charter_p_wait_driver_submit20.webp       | Bin
 .../charter_p_wait_driver_submit21.webp       | Bin
 .../charter_p_wait_driver_submit22.webp       | Bin
 .../charter_p_wait_driver_submit23.webp       | Bin
 .../charter_p_wait_driver_submit24.webp       | Bin
 .../charter_p_wait_driver_submit25.webp       | Bin
 .../charter_p_wait_driver_submit26.webp       | Bin
 .../charter_p_wait_driver_submit27.webp       | Bin
 .../charter_p_wait_driver_submit28.webp       | Bin
 .../charter_p_wait_driver_submit29.webp       | Bin
 .../charter_p_wait_driver_submit30.webp       | Bin
 .../drawable/charter_p_welcome_explore.xml    |   2 +-
 .../m1_order_end_opendoor_selecotr.xml        |   6 -
 .../res/font/{din.ttf => charter_p_din.ttf}   | Bin
 ...ottom_bar.xml => charter_p_bottom_bar.xml} |  56 ++++----
 ..._bottom_go.xml => charter_p_bottom_go.xml} |   0
 ...nfo.xml => charter_p_bottom_orderinfo.xml} |   8 +-
 ...ite.xml => charter_p_bottom_stop_site.xml} |   2 +-
 ...ent.xml => charter_p_contain_fragment.xml} |   0
 .../{m1_p_debug.xml => charter_p_debug.xml}   |   0
 ...ent.xml => charter_p_devices_fragment.xml} |  12 +-
 ....xml => charter_p_devices_lock_unlock.xml} |   4 +-
 ...nlock.xml => charter_p_devices_unlock.xml} |   4 +-
 ..._info.xml => charter_p_itinerary_info.xml} |  32 ++---
 ...agment.xml => charter_p_main_fragment.xml} |   8 +-
 ...=> charter_p_novice_guidance_fragment.xml} |  10 +-
 ..._p_novice_guidance_welcome_1_fragment.xml} |   0
 ..._p_novice_guidance_welcome_2_fragment.xml} |   0
 ..._p_novice_guidance_welcome_3_fragment.xml} |   0
 ..._p_novice_guidance_welcome_4_fragment.xml} |   0
 ...er_p_novice_guidance_welcome_fragment.xml} |  18 +--
 ..._order_end.xml => charter_p_order_end.xml} |  12 +-
 ...gment.xml => charter_p_order_fragment.xml} |  16 +--
 ...item.xml => charter_p_order_line_item.xml} |   2 +-
 ...oading.xml => charter_p_order_loading.xml} |   4 +-
 ..._fail.xml => charter_p_order_net_fail.xml} |   8 +-
 ...oorder.xml => charter_p_order_noorder.xml} |   4 +-
 ...item.xml => charter_p_order_site_item.xml} |   4 +-
 ...t.xml => charter_p_orderinfo_fragment.xml} |  10 +-
 ...agment.xml => charter_p_soft_fragment.xml} | 130 +++++++++---------
 ...ml => charter_p_soft_temperature_item.xml} |   2 +-
 ...ml => charter_p_statusview_blue_tooth.xml} |   2 +-
 ....xml => charter_p_statusview_datetime.xml} |  14 +-
 ...gment.xml => charter_p_video_fragment.xml} |   2 +-
 ...ideo_item.xml => charter_p_video_item.xml} |   2 +-
 ...ideo_view.xml => charter_p_video_view.xml} |  12 +-
 ....xml => charter_p_view_maker_sitename.xml} |   0
 .../passenger/src/main/res/values/arrays.xml  |  50 +++----
 .../passenger/src/main/res/values/attrs.xml   |  16 +--
 .../passenger/src/main/res/values/color.xml   | 102 +++++++-------
 .../passenger/src/main/res/values/strings.xml |  72 +++++-----
 .../passenger/src/main/res/values/styles.xml  |   6 +-
 app/script/flavorfilter/flavors.json          |   4 +
 308 files changed, 751 insertions(+), 712 deletions(-)
 rename OCH/charter/passenger/src/main/res/anim/{alpha_hide_show.xml => charter_p_alpha_hide_show.xml} (100%)
 delete mode 100644 OCH/charter/passenger/src/main/res/color/bus_p_aircondition_enable.xml
 create mode 100644 OCH/charter/passenger/src/main/res/color/charter_p_aircondition_enable.xml
 rename OCH/charter/passenger/src/main/res/color/{bus_p_function_airconditon_pattern_text_color_selector.xml => charter_p_function_airconditon_pattern_text_color_selector.xml} (59%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_pm1_aircondition_wind_high.png => charter_p_aircondition_wind_high.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_pm1_aircondition_wind_low.png => charter_p_aircondition_wind_low.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_pm1_aircondition_wind_middle.png => charter_p_aircondition_wind_middle.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_m1_blue_tooth_close.png => charter_p_blue_tooth_close.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_m1_blue_tooth_open.png => charter_p_blue_tooth_open.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{charter_bottom_bar_select_bg.png => charter_p_bottom_bar_select_bg.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_car_speed.png => charter_p_car_speed.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{taxi_p_change_full.png => charter_p_change_full.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_distance_info_bg.png => charter_p_distance_info_bg.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{charter_end_order_openclosedoor.webp => charter_p_end_order_openclosedoor.webp} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{charter_endorder_head.png => charter_p_endorder_head.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_aircondition_nor.png => charter_p_function_aircondition_nor.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_aircondition_pattern_selected.png => charter_p_function_aircondition_pattern_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_aircondition_select.png => charter_p_function_aircondition_select.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_aircondition_selected.png => charter_p_function_aircondition_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_aircondition_switch_selected.png => charter_p_function_aircondition_switch_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_atmosphere_nor.png => charter_p_function_atmosphere_nor.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_atmosphere_select.png => charter_p_function_atmosphere_select.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_function_bg.webp => charter_p_function_bg.webp} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_closedoor_normal_src.png => charter_p_function_device_closedoor_normal_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_closedoor_press_src.png => charter_p_function_device_closedoor_press_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_go_normal_src.png => charter_p_function_device_go_normal_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_go_press_src.png => charter_p_function_device_go_press_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_normal.png => charter_p_function_device_normal.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_opendoor_normal_src.png => charter_p_function_device_opendoor_normal_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_opendoor_press_src.png => charter_p_function_device_opendoor_press_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_press.png => charter_p_function_device_press.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_stopside_normal_src.png => charter_p_function_device_stopside_normal_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_device_stopside_press_src.png => charter_p_function_device_stopside_press_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_information_normal.png => charter_p_function_information_normal.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_information_press.png => charter_p_function_information_press.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_left_bg_selected.png => charter_p_function_left_bg_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_check_select.png => charter_p_function_light_check_select.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_check_selected.png => charter_p_function_light_check_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_middle_selected.png => charter_p_function_light_middle_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_nor.png => charter_p_function_light_nor.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_select.png => charter_p_function_light_select.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_select_left.png => charter_p_function_light_select_left.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_select_right.png => charter_p_function_light_select_right.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_selected.png => charter_p_function_light_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_light_switch_bg_selected.png => charter_p_function_light_switch_bg_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_order_normal.png => charter_p_function_order_normal.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_order_press.png => charter_p_function_order_press.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_soft_normal.png => charter_p_function_soft_normal.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_soft_press.png => charter_p_function_soft_press.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_voice_humb.png => charter_p_function_voice_humb.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_voice_left_select_src.png => charter_p_function_voice_left_select_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_voice_left_selected_src.png => charter_p_function_voice_left_selected_src.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_voice_max.png => charter_p_function_voice_max.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_voice_middle_select.png => charter_p_function_voice_middle_select.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_voice_middle_selected.png => charter_p_function_voice_middle_selected.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_function_voice_min.png => charter_p_function_voice_min.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_line_cancle_submit_bg.png => charter_p_line_cancle_submit_bg.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_loading.png => charter_p_loading.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{map_staton_icon.png => charter_p_map_staton_icon.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{taxi_p_mogo_video_play.png => charter_p_mogo_video_play.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{charger_p_normal.png => charter_p_normal.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{notice_video_pause_big.png => charter_p_notice_video_pause_big.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{notice_video_pause_small.png => charter_p_notice_video_pause_small.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{notice_video_start_big.png => charter_p_notice_video_start_big.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{notice_video_start_small.png => charter_p_notice_video_start_small.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_early_end.png => charter_p_order_early_end.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_end.png => charter_p_order_end.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_end_car.png => charter_p_order_end_car.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_net_fail.png => charter_p_order_net_fail.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_noorder.png => charter_p_order_noorder.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_opendoor_normal.png => charter_p_order_opendoor_normal.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_opendoor_press.png => charter_p_order_opendoor_press.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_site_check.png => charter_p_order_site_check.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_site_check_enable.png => charter_p_order_site_check_enable.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_site_checked.png => charter_p_order_site_checked.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_switch_line_enable.png => charter_p_order_switch_line_enable.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_order_switch_line_unenable.png => charter_p_order_switch_line_unenable.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bug_p_overmap_car_model.png => charter_p_overmap_car_model.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_overmap_reset.png => charter_p_overmap_reset.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_player_change_normal.png => charter_p_player_change_normal.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_site_cancle_submit_bg.png => charter_p_site_cancle_submit_bg.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_site_submit_bg.png => charter_p_site_submit_bg.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{m1_small_map_view_dir_end.png => charter_p_small_map_view_dir_end.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_p_m1_status_bar_logo.png => charter_p_status_bar_logo.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{taxi_p_video_bg_bottom.png => charter_p_video_bg_bottom.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{taxi_p_video_holder.webp => charter_p_video_holder.webp} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bg_taxi_p_video_index.png => charter_p_video_index.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bg_taxi_p_video_thumb_big.png => charter_p_video_thumb_big.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bg_taxi_p_video_thumb_small.png => charter_p_video_thumb_small.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_pm1_warm_wind_high.png => charter_p_warm_wind_high.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_pm1_warm_wind_lod.png => charter_p_warm_wind_lod.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable-nodpi/{bus_pm1_warm_wind_middle.png => charter_p_warm_wind_middle.png} (100%)
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml
 rename OCH/charter/passenger/src/main/res/drawable/{baseline_link_off_24.xml => charter_p_baseline_link_off_24.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bg_taxi_p_video_bg.xml => charter_p_bg_taxi_p_video_bg.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_aircondition_common_bg.xml => charter_p_function_aircondition_common_bg.xml} (77%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_aircondition_common_bg_01.xml => charter_p_function_aircondition_common_bg_01.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_aircondition_left_select.xml => charter_p_function_aircondition_left_select.xml} (73%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_aircondition_left_selected.xml => charter_p_function_aircondition_left_selected.xml} (78%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_pattern_selecotr.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_aircondition_pattern_select.xml => charter_p_function_aircondition_pattern_select.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_aircondition_switch_select.xml => charter_p_function_aircondition_switch_select.xml} (100%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_switch_selector.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_switch_left_selector.xml => charter_p_function_airconditon_bg_selector.xml} (52%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_left_selector.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_airconditon_text_color_selector.xml => charter_p_function_airconditon_text_color_selector.xml} (59%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_device_bg_selector.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_information_bg_selector.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_order_bg_selector.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_soft_bg_selector.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_normal.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press_selecor.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_device_go_normal.xml => charter_p_function_device_go_normal.xml} (67%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_device_go_press.xml => charter_p_function_device_go_press.xml} (68%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_press_selecor.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_normal.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_device_closedoor_normal.xml => charter_p_function_device_opendoor_press.xml} (66%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_press_selecor.xml
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_normal.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_device_closedoor_press.xml => charter_p_function_device_stopside_press.xml} (66%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_press_selecor.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_distance_split_bg.xml => charter_p_function_distance_split_bg.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_left_bg_select.xml => charter_p_function_left_bg_select.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_light_left_select.xml => charter_p_function_light_left_select.xml} (75%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_light_left_selected.xml => charter_p_function_light_left_selected.xml} (79%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_selector.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_light_switch_bg_select.xml => charter_p_function_light_switch_bg_select.xml} (100%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_switch_bg_selector.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_setting_soft_b_shape.xml => charter_p_function_setting_soft_b_shape.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_switch_left_select.xml => charter_p_function_switch_left_select.xml} (73%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_switch_left_selected.xml => charter_p_function_switch_left_selected.xml} (78%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selector.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_change_full.xml => charter_p_function_video_player_change_full.xml} (78%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_change_normal.xml => charter_p_function_video_player_change_normal.xml} (75%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_pause_big.xml => charter_p_function_video_player_pause_big.xml} (75%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_pause_small.xml => charter_p_function_video_player_pause_small.xml} (74%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_start_big.xml => charter_p_function_video_player_start_big.xml} (75%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_start_small.xml => charter_p_function_video_player_start_small.xml} (74%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_thumb_big.xml => charter_p_function_video_player_thumb_big.xml} (77%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_video_player_thumb_samll.xml => charter_p_function_video_player_thumb_samll.xml} (76%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_voice_left_select.xml => charter_p_function_voice_left_select.xml} (73%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_voice_left_selected.xml => charter_p_function_voice_left_selected.xml} (77%)
 create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_selector.xml
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_voice_right_process_humb.xml => charter_p_function_voice_right_process_humb.xml} (72%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_000.png => drawable/charter_p_open_lock_000.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_000_0.png => drawable/charter_p_open_lock_000_0.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_001.png => drawable/charter_p_open_lock_001.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_002.png => drawable/charter_p_open_lock_002.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_003.png => drawable/charter_p_open_lock_003.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_004.png => drawable/charter_p_open_lock_004.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_005.png => drawable/charter_p_open_lock_005.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_006.png => drawable/charter_p_open_lock_006.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_007.png => drawable/charter_p_open_lock_007.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_008.png => drawable/charter_p_open_lock_008.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_009.png => drawable/charter_p_open_lock_009.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_010.png => drawable/charter_p_open_lock_010.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_011.png => drawable/charter_p_open_lock_011.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_012.png => drawable/charter_p_open_lock_012.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_013.png => drawable/charter_p_open_lock_013.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_014.png => drawable/charter_p_open_lock_014.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_015.png => drawable/charter_p_open_lock_015.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_016.png => drawable/charter_p_open_lock_016.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_017.png => drawable/charter_p_open_lock_017.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_018.png => drawable/charter_p_open_lock_018.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_019.png => drawable/charter_p_open_lock_019.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_020.png => drawable/charter_p_open_lock_020.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_021.png => drawable/charter_p_open_lock_021.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_022.png => drawable/charter_p_open_lock_022.png} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi/open_lock_023.png => drawable/charter_p_open_lock_023.png} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{m1_order_end_closedoor_selecotr.xml => charter_p_order_end_closedoor_selecotr.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_function_device_go_press_selecor.xml => charter_p_order_end_opendoor_selecotr.xml} (51%)
 rename OCH/charter/passenger/src/main/res/drawable/{m1_order_line_checked_shape.xml => charter_p_order_line_checked_shape.xml} (72%)
 rename OCH/charter/passenger/src/main/res/drawable/{m1_order_line_shape.xml => charter_p_order_line_shape.xml} (59%)
 rename OCH/charter/passenger/src/main/res/drawable/{bus_p_overmap_reset_size.xml => charter_p_overmap_reset_size.xml} (77%)
 rename OCH/charter/passenger/src/main/res/drawable/{taxi_power_size_seekbar_style.xml => charter_p_power_size_seekbar_style.xml} (72%)
 rename OCH/charter/passenger/src/main/res/drawable/{bg_taxi_p_video_bg_shape.xml => charter_p_video_bg_shape.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{bg_taxi_p_video_bg_top.xml => charter_p_video_bg_top.xml} (100%)
 rename OCH/charter/passenger/src/main/res/drawable/{taxi_video_seekbar_style.xml => charter_p_video_seekbar_style.xml} (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit01.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit02.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit03.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit04.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit05.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit06.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit07.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit08.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit09.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit10.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit11.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit12.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit13.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit14.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit15.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit16.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit17.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit18.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit19.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit20.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit21.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit22.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit23.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit24.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit25.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit26.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit27.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit28.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit29.webp (100%)
 rename OCH/charter/passenger/src/main/res/{drawable-nodpi => drawable}/charter_p_wait_driver_submit30.webp (100%)
 delete mode 100644 OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml
 rename OCH/charter/passenger/src/main/res/font/{din.ttf => charter_p_din.ttf} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_bottom_bar.xml => charter_p_bottom_bar.xml} (75%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_bottom_go.xml => charter_p_bottom_go.xml} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_bottom_orderinfo.xml => charter_p_bottom_orderinfo.xml} (90%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_bottom_stop_site.xml => charter_p_bottom_stop_site.xml} (96%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_contain_fragment.xml => charter_p_contain_fragment.xml} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_p_debug.xml => charter_p_debug.xml} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_devices_fragment.xml => charter_p_devices_fragment.xml} (95%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_devices_lock_unlock.xml => charter_p_devices_lock_unlock.xml} (94%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_devices_unlock.xml => charter_p_devices_unlock.xml} (96%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_itinerary_info.xml => charter_p_itinerary_info.xml} (86%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_main_fragment.xml => charter_p_main_fragment.xml} (96%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_novice_guidance_fragment.xml => charter_p_novice_guidance_fragment.xml} (78%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_novice_guidance_welcome_1_fragment.xml => charter_p_novice_guidance_welcome_1_fragment.xml} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_novice_guidance_welcome_2_fragment.xml => charter_p_novice_guidance_welcome_2_fragment.xml} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_novice_guidance_welcome_3_fragment.xml => charter_p_novice_guidance_welcome_3_fragment.xml} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_novice_guidance_welcome_4_fragment.xml => charter_p_novice_guidance_welcome_4_fragment.xml} (100%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_novice_guidance_welcome_fragment.xml => charter_p_novice_guidance_welcome_fragment.xml} (93%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_order_end.xml => charter_p_order_end.xml} (88%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_order_fragment.xml => charter_p_order_fragment.xml} (96%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_order_line_item.xml => charter_p_order_line_item.xml} (89%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_order_loading.xml => charter_p_order_loading.xml} (93%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_order_net_fail.xml => charter_p_order_net_fail.xml} (90%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_order_noorder.xml => charter_p_order_noorder.xml} (89%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_order_site_item.xml => charter_p_order_site_item.xml} (87%)
 rename OCH/charter/passenger/src/main/res/layout/{orderinfo_fragment.xml => charter_p_orderinfo_fragment.xml} (96%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_soft_fragment.xml => charter_p_soft_fragment.xml} (78%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_soft_temperature_item.xml => charter_p_soft_temperature_item.xml} (88%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_statusview_blue_tooth.xml => charter_p_statusview_blue_tooth.xml} (89%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_statusview_datetime.xml => charter_p_statusview_datetime.xml} (91%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_video_fragment.xml => charter_p_video_fragment.xml} (93%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_video_item.xml => charter_p_video_item.xml} (88%)
 rename OCH/charter/passenger/src/main/res/layout/{m1_video_view.xml => charter_p_video_view.xml} (92%)
 rename OCH/charter/passenger/src/main/res/layout/{view_maker_sitename.xml => charter_p_view_maker_sitename.xml} (100%)

diff --git a/OCH/charter/passenger/build.gradle b/OCH/charter/passenger/build.gradle
index 63f4398e85..aca041d1ff 100644
--- a/OCH/charter/passenger/build.gradle
+++ b/OCH/charter/passenger/build.gradle
@@ -24,6 +24,8 @@ android {
         }
     }
 
+    resourcePrefix "charter_p"
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
index 1b1ef5458d..27377ea3fd 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -568,7 +568,7 @@ object CharterPassengerModel {
                                                 OCHSocketMessageManager.pushAppOperationalMsgBox(
                                                     DateTimeUtil.getCurrentTimeStamp(),
                                                     AbsMogoApplication.getApp()
-                                                        .getString(R.string.m1_end_order_5min), 2
+                                                        .getString(R.string.charter_p_end_order_5min), 2
                                                 )
                                                 VoiceManager.surplus5min(VoiceFocusManager.getVoiceCmdCallBack())
                                                 d(M_BUS_P + TAG, "倒计时5分钟${it.orderNo}")
@@ -1000,7 +1000,7 @@ object CharterPassengerModel {
                 if (order.arriveStatus == OrderInfoResponse.ARRIVING) {
                     if (isSuccess("${siteId}$ending100Key")) {
                         val string =
-                            mContext.getString(R.string.arrived_station_left_100, order.siteName)
+                            mContext.getString(R.string.charter_p_arrived_station_left_100, order.siteName)
                         VoiceNotice.showNotice(string)
                         broadcastList["${siteId}$ending100Key"] = true
                     }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
index 1f57c29627..05c43d3f2e 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
@@ -194,7 +194,7 @@ class BusPassengerPresenter(view: MainFragment?) :
 
                 StopSideStatusManager.Status.START -> {
                     VoiceNotice.showNotice(
-                        context.getString(R.string.m1_stop_site_zh),
+                        context.getString(R.string.charter_p_stop_site_zh),
                         AIAssist.LEVEL0
                     )
                 }
@@ -206,7 +206,7 @@ class BusPassengerPresenter(view: MainFragment?) :
                 StopSideStatusManager.Status.EndingSuccess -> {
                     ToastCharterUtils.showToastShort("靠边停车成功")
                     VoiceNotice.showNotice(
-                        context.getString(R.string.m1_stop_site_success),
+                        context.getString(R.string.charter_p_stop_site_success),
                         AIAssist.LEVEL0
                     )
                 }
@@ -261,7 +261,7 @@ class BusPassengerPresenter(view: MainFragment?) :
     fun drawStationInfo(sites: List<SiteInfoResponse.SiteInfo>) {
         val stationsList: MutableList<SiteMarkerBean> = mutableListOf()
         val stationsNameList: MutableList<SiteMarkerBean> = mutableListOf()
-        val stationIcon = BitmapFactory.decodeResource(context.resources, R.drawable.map_staton_icon)
+        val stationIcon = BitmapFactory.decodeResource(context.resources, R.drawable.charter_p_map_staton_icon)
         var checkMarkView:SiteMarkerBean?=null
         sites.forEach {
             stationsList.add(
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
index d2cce6cfe2..5c36418f3b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
@@ -50,7 +50,7 @@ object DriverMessage: IReceivedMsgListener {
                         if(msg.isPlay){
                             VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1)
                             if(msg.msg.contains("核销成功")){
-                                val string = AbsMogoApplication.getApp().getString(R.string.m1_welcome_tts)
+                                val string = AbsMogoApplication.getApp().getString(R.string.charter_p_welcome_tts)
                                 VoiceNotice.showNotice(string, AIAssist.LEVEL1,4_000)
                             }
                         }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
index 4fd5699571..54f428aee7 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
@@ -32,7 +32,18 @@ import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment
 import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
-import kotlinx.android.synthetic.main.m1_main_fragment.*
+import kotlinx.android.synthetic.main.charter_p_main_fragment.aciv_enter_video
+import kotlinx.android.synthetic.main.charter_p_main_fragment.aciv_map_2_default
+import kotlinx.android.synthetic.main.charter_p_main_fragment.bb_boorombar
+import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_orderinfo
+import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_selectline
+import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_softcontrol
+import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_video
+import kotlinx.android.synthetic.main.charter_p_main_fragment.mapBizView
+import kotlinx.android.synthetic.main.charter_p_main_fragment.omvOverMap
+import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxBubble
+import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxButton
+import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxList
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -50,7 +61,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
     private val endStation =
         BitmapFactory.decodeResource(
             AbsMogoApplication.getApp().resources,
-            R.drawable.m1_small_map_view_dir_end
+            R.drawable.charter_p_small_map_view_dir_end
         )
     private val lineTrajectory =
         BitmapFactory.decodeResource(
@@ -74,7 +85,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
                 statusBarView = statusView
             }
         }
-        return R.layout.m1_main_fragment
+        return R.layout.charter_p_main_fragment
     }
 
     override fun getTagName(): String {
@@ -120,7 +131,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
                             }
                         } else {
                             mPresenter?.querLogin()
-                            ToastCharterUtils.showToastShort(requireContext().getString(R.string.m1_please_login_driver))
+                            ToastCharterUtils.showToastShort(requireContext().getString(R.string.charter_p_please_login_driver))
                             return true
                         }
                         showBizView(orderinfo = true)
@@ -130,7 +141,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
                     BottomBar.SelectView.VIDEO -> showBizView(showVideo = true)
                     else -> {
                         showBizView()
-                        statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
+                        statusBarView?.setBackgroudColor(R.color.charter_p_80ffffff)
                     }
                 }
                 return false
@@ -174,25 +185,25 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
     ) {
         if (orderinfo) {
             biz_orderinfo.visibility = View.VISIBLE
-            statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
+            statusBarView?.setBackgroudColor(R.color.charter_p_80ffffff)
         } else {
             biz_orderinfo.visibility = View.GONE
         }
         if (softControl) {
             biz_softcontrol.visibility = View.VISIBLE
-            statusBarView?.setBackgroudColor(R.color.bus_p_m1_40ffffff)
+            statusBarView?.setBackgroudColor(R.color.charter_p_40ffffff)
         } else {
             biz_softcontrol.visibility = View.GONE
         }
         if (selectLine) {
             biz_selectline.visibility = View.VISIBLE
-            statusBarView?.setBackgroudColor(R.color.bus_p_m1_80ffffff)
+            statusBarView?.setBackgroudColor(R.color.charter_p_80ffffff)
         } else {
             biz_selectline.visibility = View.GONE
         }
         if (showVideo) {
             biz_video.visibility = View.VISIBLE
-            statusBarView?.setBackgroudColor(R.color.bus_p_m1_40ffffff)
+            statusBarView?.setBackgroudColor(R.color.charter_p_40ffffff)
         } else {
             biz_video.visibility = View.GONE
         }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt
index 55fab27613..5d3fb74f75 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt
@@ -6,7 +6,14 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.charter.passenger.R
-import kotlinx.android.synthetic.main.m1_bottom_bar.view.*
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.aciv_center_image
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_close_door
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_line
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_open_door
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_setting
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.actv_stop_site
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.cl_order_time
+import kotlinx.android.synthetic.main.charter_p_bottom_bar.view.cl_order_time_press
 
 class BottomBar @JvmOverloads constructor(
     context: Context,
@@ -15,7 +22,7 @@ class BottomBar @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr)  {
     init {
         isClickable = true
-        LayoutInflater.from(context).inflate(R.layout.m1_bottom_bar, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_bar, this, true)
         setBackgroundResource(R.drawable.charter_p_bottom_bar_bg)
     }
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt
index b8bfe7cb68..4ec8610351 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt
@@ -6,7 +6,8 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.och.charter.passenger.R
-import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.*
+import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.aciv_center_image
+import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.actv_title
 
 open class BottomCheckView @JvmOverloads constructor(
     context: Context,
@@ -27,13 +28,13 @@ open class BottomCheckView @JvmOverloads constructor(
     private var isCheck = false
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_bottom_stop_site, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_stop_site, this, true)
         try {
-            val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BottomSelectView)
-            backageViewId = typedArray.getResourceId(R.styleable.BottomSelectView_backageViewId, -1)
-            bottomTitle = typedArray.getString(R.styleable.BottomSelectView_bottomTitle) ?: ""
-            selectedDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_selectedDrawable, -1)
-            normalDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_normalDrawable, -1)
+            val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CharterPBottomSelectView)
+            backageViewId = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPBackageViewId, -1)
+            bottomTitle = typedArray.getString(R.styleable.CharterPBottomSelectView_charterPBottomTitle) ?: ""
+            selectedDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPselectedDrawable, -1)
+            normalDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPnormalDrawable, -1)
             typedArray.recycle()
             initView(context)
         } catch (e: Exception) {
@@ -64,7 +65,7 @@ open class BottomCheckView @JvmOverloads constructor(
         } else {
             backageView?.visibility = View.GONE
             aciv_center_image.setImageResource(normalDrawable)
-            actv_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
+            actv_title.setTextColor(context.getColor(R.color.charter_p_090f28))
         }
     }
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt
index aa092889cb..afc8eb33a3 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt
@@ -10,7 +10,8 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.charter.passenger.R
-import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.*
+import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.aciv_center_image
+import kotlinx.android.synthetic.main.charter_p_bottom_stop_site.view.actv_title
 
 open class BottomClickView @JvmOverloads constructor(
     context: Context,
@@ -31,13 +32,13 @@ open class BottomClickView @JvmOverloads constructor(
     var applyClickListener: ApplyClickLintener?=null
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_bottom_stop_site, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_stop_site, this, true)
         try {
-            val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BottomSelectView)
-            backageViewId = typedArray.getResourceId(R.styleable.BottomSelectView_backageViewId, -1)
-            bottomTitle = typedArray.getString(R.styleable.BottomSelectView_bottomTitle) ?: ""
-            selectedDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_selectedDrawable, -1)
-            normalDrawable = typedArray.getResourceId(R.styleable.BottomSelectView_normalDrawable, -1)
+            val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CharterPBottomSelectView)
+            backageViewId = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPBackageViewId, -1)
+            bottomTitle = typedArray.getString(R.styleable.CharterPBottomSelectView_charterPBottomTitle) ?: ""
+            selectedDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPselectedDrawable, -1)
+            normalDrawable = typedArray.getResourceId(R.styleable.CharterPBottomSelectView_charterPnormalDrawable, -1)
             typedArray.recycle()
             initView(context)
         } catch (e: Exception) {
@@ -67,7 +68,7 @@ open class BottomClickView @JvmOverloads constructor(
                         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "ACTION_UP")
                         if (selectedDrawable > 0) {
                             aciv_center_image.setImageResource(normalDrawable)
-                            actv_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
+                            actv_title.setTextColor(context.getColor(R.color.charter_p_090f28))
                             backageView?.visibility = View.GONE
                         }
                     }
@@ -75,7 +76,7 @@ open class BottomClickView @JvmOverloads constructor(
                         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "ACTION_CANCEL")
                         if (selectedDrawable > 0) {
                             aciv_center_image.setImageResource(normalDrawable)
-                            actv_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
+                            actv_title.setTextColor(context.getColor(R.color.charter_p_090f28))
                             backageView?.visibility = View.GONE
                         }
                     }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
index c48dedc79a..f7c19c6dab 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt
@@ -14,7 +14,10 @@ import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener
 import com.mogo.och.charter.passenger.model.OrderStatusEnum
 import com.mogo.och.common.module.utils.DateTimeUtil
-import kotlinx.android.synthetic.main.m1_bottom_orderinfo.view.*
+import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.actv_order_end_time
+import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.actv_order_end_time_title
+import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.actv_order_null
+import kotlinx.android.synthetic.main.charter_p_bottom_orderinfo.view.clg_order_info
 import java.util.UUID
 
 /**
@@ -31,7 +34,7 @@ open class BottomOrderInfoView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_bottom_orderinfo, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_orderinfo, this, true)
         try {
             initView(context)
         } catch (e: Exception) {
@@ -46,9 +49,9 @@ open class BottomOrderInfoView @JvmOverloads constructor(
             actv_order_null.setTextColor(context.getColor(android.R.color.white))
             actv_order_end_time_title.setTextColor(context.getColor(android.R.color.white))
         }else{
-            actv_order_end_time.setTextColor(context.getColor(R.color.bus_p_m1_0050E1))
-            actv_order_null.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
-            actv_order_end_time_title.setTextColor(context.getColor(R.color.bus_p_m1_090f28))
+            actv_order_end_time.setTextColor(context.getColor(R.color.charter_p_0050E1))
+            actv_order_null.setTextColor(context.getColor(R.color.charter_p_090f28))
+            actv_order_end_time_title.setTextColor(context.getColor(R.color.charter_p_090f28))
         }
     }
 
@@ -77,7 +80,7 @@ open class BottomOrderInfoView @JvmOverloads constructor(
             OrderStatusEnum.NoOrderUnuse ->{
                 actv_order_null.visibility = VISIBLE
                 clg_order_info.visibility = GONE
-                actv_order_end_time.text = AbsMogoApplication.getApp().getString(R.string.m1_bottom_reach_time)
+                actv_order_end_time.text = AbsMogoApplication.getApp().getString(R.string.charter_p_bottom_reach_time)
             }
             OrderStatusEnum.OrderNoLine,
             OrderStatusEnum.OrdersWithLine -> {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
index 2fc39f56df..510b450142 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt
@@ -24,7 +24,6 @@ import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStat
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.utils.SoundPoolHelper
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.m1_bottom_bar.view.*
 
 class GoViewWithArrive @JvmOverloads constructor(
     context: Context,
@@ -41,7 +40,7 @@ class GoViewWithArrive @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_bottom_go, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_bottom_go, this, true)
         setBackgroundResource(R.drawable.charter_p_bottom_center_normal)
         setOnTouchListener(object :OnTouchListener{
             @SuppressLint("ClickableViewAccessibility")
@@ -77,7 +76,7 @@ class GoViewWithArrive @JvmOverloads constructor(
     private fun startGo(){
 
         if (LightAirconditionDoorStatusManager.doorStatus.isOpen) {
-            val string = AbsMogoApplication.getApp().getString(R.string.m1_close_door_and_startauto)
+            val string = AbsMogoApplication.getApp().getString(R.string.charter_p_close_door_and_startauto)
             ToastCharterUtils.showToastShort(string)
             return
         }
@@ -122,7 +121,7 @@ class GoViewWithArrive @JvmOverloads constructor(
         RxUtils.disposeSubscribe(startAutoTimeOut)
         startAutoTimeOut = RxUtils.createSubscribe(20_000) {
             if (CallerAutoPilotStatusListenerManager.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
-                val string = AbsMogoApplication.getApp().getString(R.string.m1_start_auto_fail)
+                val string = AbsMogoApplication.getApp().getString(R.string.charter_p_start_auto_fail)
                 ToastCharterUtils.showToastLong(string)
             }
             CharterPassengerModel.setAutoStatusCallback(TAG, null)
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
index 067a3804bb..275268f28b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt
@@ -17,10 +17,10 @@ import com.mogo.och.charter.passenger.ui.MainFragment
 import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment
-import kotlinx.android.synthetic.main.m1_p_debug.view.debug_arrive_dest
-import kotlinx.android.synthetic.main.m1_p_debug.view.debug_change_modle
-import kotlinx.android.synthetic.main.m1_p_debug.view.debug_show_endview
-import kotlinx.android.synthetic.main.m1_p_debug.view.debug_show_noviceGuidance
+import kotlinx.android.synthetic.main.charter_p_debug.view.debug_arrive_dest
+import kotlinx.android.synthetic.main.charter_p_debug.view.debug_change_modle
+import kotlinx.android.synthetic.main.charter_p_debug.view.debug_show_endview
+import kotlinx.android.synthetic.main.charter_p_debug.view.debug_show_noviceGuidance
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -37,7 +37,7 @@ class DebugView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_p_debug, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_debug, this, true)
         visibility = GONE
     }
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
index 5cafa0b340..f3a7fcfc8b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt
@@ -19,7 +19,8 @@ import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager
 import com.mogo.och.common.module.voice.VoiceManager
-import kotlinx.android.synthetic.main.m1_order_end.*
+import kotlinx.android.synthetic.main.charter_p_order_end.iv_end_order_closedoor
+import kotlinx.android.synthetic.main.charter_p_order_end.iv_end_order_opendoor
 
 /**
  * @author: yangyakun
@@ -31,14 +32,14 @@ class M1CarUserNoOrderFragment :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.DialogFullScreen) //dialog全屏
+        setStyle(STYLE_NO_TITLE, R.style.CharterPDialogFullScreen) //dialog全屏
     }
 
     private fun initFragment() {
 
     }
 
-    override fun getLayoutId(): Int = R.layout.m1_order_end
+    override fun getLayoutId(): Int = R.layout.charter_p_order_end
 
     override fun getTagName(): String = TAG
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
index a7dfbfed3f..661c1abedb 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
@@ -19,14 +19,29 @@ import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter
 import com.mogo.och.charter.passenger.presenter.CharterPassengerNoviceGuidancePresenter
-import com.mogo.och.charter.passenger.ui.MainFragment
 import com.mogo.och.common.module.voice.VoiceNotice
-import kotlinx.android.synthetic.main.m1_novice_guidance_fragment.*
-import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_1_fragment.*
-import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_2_fragment.*
-import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_3_fragment.*
-import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_4_fragment.*
-import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_fragment.*
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_01
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_02
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_03
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_04
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_1_fragment.v_next_page_select_line
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_1_fragment.v_welcome_close_01
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_2_fragment.v_next_page_go_auto
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_2_fragment.v_pre_page_go_auto
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_2_fragment.v_welcome_close_02
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_3_fragment.v_next_page_stop_site
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_3_fragment.v_pre_page_stop_site
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_3_fragment.v_welcome_close_03
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_4_fragment.v_next_page_notice
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_4_fragment.v_pre_page_notice
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_4_fragment.v_welcome_close_04
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_click_go_explore
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_order_time
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_start_guildance
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.actv_userinfo
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.group_complete_guidance
+import kotlinx.android.synthetic.main.charter_p_novice_guidance_welcome_fragment.v_clikc_go_explore_bg
 
 /**
  * 新手引导
@@ -59,10 +74,10 @@ class NoviceGuidanceFragment :
         savedInstanceState?.let {
             //tab = it.getString(SELECTTAB, tab)
         }
-        setStyle(STYLE_NO_TITLE, R.style.DialogFullScreen) //dialog全屏
+        setStyle(STYLE_NO_TITLE, R.style.CharterPDialogFullScreen) //dialog全屏
     }
 
-    override fun getLayoutId(): Int = R.layout.m1_novice_guidance_fragment
+    override fun getLayoutId(): Int = R.layout.charter_p_novice_guidance_fragment
 
     override fun getTagName(): String = TAG
 
@@ -76,7 +91,7 @@ class NoviceGuidanceFragment :
                 setTargetVisable(welcome01 = true)
                 if (m1_novice_guidance_tts) {
                     val m1NoviceGuidanceTts =
-                        AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_tts)
+                        AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_tts)
                     VoiceNotice.showNotice(m1NoviceGuidanceTts, AIAssist.LEVEL1)
                     m1_novice_guidance_tts = false
                 }
@@ -88,7 +103,7 @@ class NoviceGuidanceFragment :
             setTargetVisable(welcome02 = true)
             if (m1_novice_guidance_door_tts) {
                 val m1NoviceGuidanceDoorTts =
-                    AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_door_tts)
+                    AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_door_tts)
                 VoiceNotice.showNotice(m1NoviceGuidanceDoorTts, AIAssist.LEVEL1)
                 m1_novice_guidance_door_tts = false
             }
@@ -101,7 +116,7 @@ class NoviceGuidanceFragment :
             setTargetVisable(welcome03 = true)
             if (m1_novice_guidance_stop_site_tts) {
                 val m1NoviceGuidanceStopSiteTts =
-                    AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_stop_site_tts)
+                    AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_stop_site_tts)
                 VoiceNotice.showNotice(m1NoviceGuidanceStopSiteTts, AIAssist.LEVEL1)
                 m1_novice_guidance_stop_site_tts = false
             }
@@ -114,7 +129,7 @@ class NoviceGuidanceFragment :
             setTargetVisable(welcome04 = true)
             if (m1_novice_guidance_notice_tts) {
                 val m1NoviceGuidanceStopSiteTts =
-                    AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_notice_tts)
+                    AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_notice_tts)
                 VoiceNotice.showNotice(m1NoviceGuidanceStopSiteTts, AIAssist.LEVEL1)
                 m1_novice_guidance_notice_tts = false
             }
@@ -128,7 +143,7 @@ class NoviceGuidanceFragment :
             saveOrderInfo()
             if (m1_novice_guidance_complier_tts) {
                 val m1NoviceGuidanceStopSiteTts =
-                    AbsMogoApplication.getApp().getString(R.string.m1_novice_guidance_complier_tts)
+                    AbsMogoApplication.getApp().getString(R.string.charter_p_novice_guidance_complier_tts)
                 VoiceNotice.showNotice(m1NoviceGuidanceStopSiteTts, AIAssist.LEVEL1)
                 m1_novice_guidance_complier_tts = false
             }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt
index e362613f11..9d7290ae5c 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt
@@ -7,11 +7,11 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.och.charter.passenger.R
-import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance
-import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_arrive_time
-import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_surplus_time
-import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_unit
-import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_speed
+import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance
+import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance_arrive_time
+import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance_surplus_time
+import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_distance_unit
+import kotlinx.android.synthetic.main.charter_p_itinerary_info.view.tv_speed
 
 /**
  * 速度、剩余时间、剩余距离和到达时间
@@ -29,7 +29,7 @@ class ItineraryView : ConstraintLayout, ItineraryViewModel.ItineraryViewCallback
     constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.m1_itinerary_info, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_itinerary_info, this, true)
     }
 
     override fun onAttachedToWindow() {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
index d55e708e3b..edb92d3f4c 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt
@@ -52,7 +52,7 @@ class ItineraryViewModel : ViewModel(), IMoGoChassisLocationGCJ02Listener, IDist
     }
 
     override fun setDistancecAndTime(meters: Long, timeInSecond: Long) {
-        val unitKm = AbsMogoApplication.getApp().getString(R.string.m1_distance_unit_km)
+        val unitKm = AbsMogoApplication.getApp().getString(R.string.charter_p_distance_unit_km)
         if (meters < 0 && timeInSecond < 0) {
             setDistanceAndTime("--", unitKm, "--", "--")
             return
@@ -61,7 +61,7 @@ class ItineraryViewModel : ViewModel(), IMoGoChassisLocationGCJ02Listener, IDist
         var disUnit = "KM"
         if (meters > 0) {
             if (meters / 1000 < 1) {
-                disUnit = AbsMogoApplication.getApp().getString(R.string.m1_distance_unit_m)
+                disUnit = AbsMogoApplication.getApp().getString(R.string.charter_p_distance_unit_m)
                 dis = Math.round(meters.toFloat()).toString()
             } else {
                 disUnit = unitKm
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
index 7a429a9365..bf4eae809c 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
@@ -12,9 +12,9 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.common.module.utils.FrameAnimatorContainer
-import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock
-import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock_bg
-import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_unlock_ani
+import kotlinx.android.synthetic.main.charter_p_devices_lock_unlock.view.aciv_screen_lock
+import kotlinx.android.synthetic.main.charter_p_devices_lock_unlock.view.aciv_screen_lock_bg
+import kotlinx.android.synthetic.main.charter_p_devices_lock_unlock.view.aciv_screen_unlock_ani
 
 class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
 
@@ -36,7 +36,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
     private var handler: Handler?=null
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.m1_devices_lock_unlock, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_devices_lock_unlock, this, true)
         handler =  object : Handler(Looper.myLooper()!!) {
             override fun handleMessage(msg: Message) {
                 super.handleMessage(msg)
@@ -55,7 +55,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
         super.onAttachedToWindow()
         LockManager.setAutoStatusCallback(TAG, this)
         aciv_screen_unlock_ani?.let {
-            animations = FrameAnimatorContainer(R.array.openlock, 24, it,initFirstFrame = false)
+            animations = FrameAnimatorContainer(R.array.charter_p_openlock, 24, it,initFirstFrame = false)
             animations!!.setOnAnimStopListener(object :
                 FrameAnimatorContainer.OnAnimationStoppedListener {
                 override fun AnimationStopped() {
@@ -143,7 +143,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
                         aciv_screen_lock.setImageResource(R.drawable.charter_p_unlock)
                     }
                 }
-                aciv_screen_lock_bg?.setImageResource(R.drawable.charger_p_normal)
+                aciv_screen_lock_bg?.setImageResource(R.drawable.charter_p_normal)
             }
             View.VISIBLE -> {
                 when (lockStatus) {
@@ -159,7 +159,7 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
                     }
                     LockManager.LockStatus.UNLOCK -> {
                         aciv_screen_lock.setImageResource(R.drawable.charter_p_unlock)
-                        aciv_screen_lock_bg?.setImageResource(R.drawable.charger_p_normal)
+                        aciv_screen_lock_bg?.setImageResource(R.drawable.charter_p_normal)
                         animations?.stop()
                     }
                 }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt
index e52a0896ac..8b1b06e02e 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt
@@ -12,8 +12,8 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.charter.passenger.R
-import kotlinx.android.synthetic.main.m1_devices_unlock.view.aciv_only_unlock
-import kotlinx.android.synthetic.main.m1_devices_unlock.view.actv_lock_status
+import kotlinx.android.synthetic.main.charter_p_devices_unlock.view.aciv_only_unlock
+import kotlinx.android.synthetic.main.charter_p_devices_unlock.view.actv_lock_status
 
 class UnlockView : ConstraintLayout, LockManager.LockStatusCallback {
 
@@ -32,7 +32,7 @@ class UnlockView : ConstraintLayout, LockManager.LockStatusCallback {
     private var handler: Handler?=null
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.m1_devices_unlock, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_devices_unlock, this, true)
         handler =  object : Handler(Looper.myLooper()!!) {
             override fun handleMessage(msg: Message) {
                 super.handleMessage(msg)
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt
index a9816bf408..650b081eeb 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt
@@ -10,14 +10,14 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.callback.IClearViewCallback
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_contain_order
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order_submit
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_left_time
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_order_phone
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_order_times
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.cl_order_info
-import kotlinx.android.synthetic.main.m1_devices_fragment.view.cl_order_info_endorder_comfit
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_contain_order
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_end_order
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_end_order_submit
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_left_time
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_order_phone
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.actv_order_times
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.cl_order_info
+import kotlinx.android.synthetic.main.charter_p_devices_fragment.view.cl_order_info_endorder_comfit
 
 /**
  * 剩余时间和结束订单入口
@@ -41,7 +41,7 @@ class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback
     var viewModel:OrderInfoViewModel?=null
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.m1_devices_fragment, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_devices_fragment, this, true)
         onClick {
             setViewGone()
         }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt
index a2afbfe06f..46a7ce02d4 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt
@@ -6,7 +6,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.och.charter.passenger.R
-import kotlinx.android.synthetic.main.view_maker_sitename.view.*
+import kotlinx.android.synthetic.main.charter_p_view_maker_sitename.view.tv_site_name
 
 /**
  * 全览地图中使用的view
@@ -22,7 +22,7 @@ class MakerWithSiteName @JvmOverloads constructor(
 ) {
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.view_maker_sitename, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_view_maker_sitename, this, true)
     }
 
     fun setTextAndCheck(siteName: String,isCheck:Boolean) {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt
index 5620c12797..e86953b46b 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt
@@ -20,24 +20,23 @@ import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse
 import com.mogo.och.charter.passenger.callback.IClearViewCallback
 import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderLineItemAdapter
 import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderSiteItemAdapter
-import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.m1_order_fragment.view.aciv_driver_refuse_group
-import kotlinx.android.synthetic.main.m1_order_fragment.view.g_lines_sites_data
-import kotlinx.android.synthetic.main.m1_order_fragment.view.g_loading_group
-import kotlinx.android.synthetic.main.m1_order_fragment.view.g_side_cancle_submit_group
-import kotlinx.android.synthetic.main.m1_order_fragment.view.group_driver_agrenn_line
-import kotlinx.android.synthetic.main.m1_order_fragment.view.iv_loading_wait_driver
-import kotlinx.android.synthetic.main.m1_order_fragment.view.lsv_line_site
-import kotlinx.android.synthetic.main.m1_order_fragment.view.m1_order_loading
-import kotlinx.android.synthetic.main.m1_order_fragment.view.m1_order_neterror
-import kotlinx.android.synthetic.main.m1_order_fragment.view.m1_order_noorder
-import kotlinx.android.synthetic.main.m1_order_fragment.view.rlv_line_list
-import kotlinx.android.synthetic.main.m1_order_fragment.view.rv_site_list
-import kotlinx.android.synthetic.main.m1_order_fragment.view.tv_site_cancle
-import kotlinx.android.synthetic.main.m1_order_fragment.view.tv_site_submit
-import kotlinx.android.synthetic.main.m1_order_loading.view.iv_loading_wait_ent
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.aciv_driver_refuse_group
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.g_lines_sites_data
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.g_loading_group
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.g_side_cancle_submit_group
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.group_driver_agrenn_line
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.iv_loading_wait_driver
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.lsv_line_site
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.m1_order_loading
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.m1_order_neterror
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.m1_order_noorder
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.rlv_line_list
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.rv_site_list
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.tv_site_cancle
+import kotlinx.android.synthetic.main.charter_p_order_fragment.view.tv_site_submit
+import kotlinx.android.synthetic.main.charter_p_order_loading.view.iv_loading_wait_ent
 import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.EventBus
 
@@ -89,7 +88,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
 
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.m1_order_fragment, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_order_fragment, this, true)
 
         onClick {
             setViewGone()
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
index b5304ca398..419337ce18 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt
@@ -49,18 +49,18 @@ class OrderLineItemAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH {
         val view: View
         val inflater = LayoutInflater.from(context)
-        view = inflater.inflate(R.layout.m1_order_line_item, parent, false)
+        view = inflater.inflate(R.layout.charter_p_order_line_item, parent, false)
         return TextVH(view)
     }
 
     override fun onBindViewHolder(holder: TextVH, position: Int) {
         val lineInfo = dataList[holder.bindingAdapterPosition]
         if(lineInfo.isCheck){
-            holder.lineNameTextView.setBackgroundResource(R.drawable.m1_order_line_checked_shape)
-            holder.lineNameTextView.setTextColor(context.getColor(R.color.bus_p_m1_1466FB))
+            holder.lineNameTextView.setBackgroundResource(R.drawable.charter_p_order_line_checked_shape)
+            holder.lineNameTextView.setTextColor(context.getColor(R.color.charter_p_1466FB))
         }else{
             holder.lineNameTextView.setBackgroundResource(android.R.color.transparent)
-            holder.lineNameTextView.setTextColor(context.getColor(R.color.bus_p_m1_292c39))
+            holder.lineNameTextView.setTextColor(context.getColor(R.color.charter_p_292c39))
         }
         holder.lineNameTextView.text = lineInfo.name
         holder.lineNameTextView.setOnClickListener {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
index 23d37f4c80..a727400f4a 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt
@@ -41,7 +41,7 @@ class OrderSiteItemAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH {
         val view: View
         val inflater = LayoutInflater.from(context)
-        view = inflater.inflate(R.layout.m1_order_site_item, parent, false)
+        view = inflater.inflate(R.layout.charter_p_order_site_item, parent, false)
         return TextVH(view)
     }
 
@@ -49,22 +49,22 @@ class OrderSiteItemAdapter(
         val siteInfo = dataList[holder.bindingAdapterPosition]
         if (holder.bindingAdapterPosition > enableIndex) {
             if (siteInfo.isCheck) {
-                holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_checked)
+                holder.iv_site_checked.setImageResource(R.drawable.charter_p_order_site_checked)
             } else {
-                holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check)
+                holder.iv_site_checked.setImageResource(R.drawable.charter_p_order_site_check)
             }
             holder.tv_site_site_name.setTextColor(
                 ContextCompat.getColor(
                     context,
-                    R.color.bus_p_m1_222222
+                    R.color.charter_p_222222
                 )
             )
         } else {
-            holder.iv_site_checked.setImageResource(R.drawable.m1_order_site_check_enable)
+            holder.iv_site_checked.setImageResource(R.drawable.charter_p_order_site_check_enable)
             holder.tv_site_site_name.setTextColor(
                 ContextCompat.getColor(
                     context,
-                    R.color.bus_p_m1_332C2D31
+                    R.color.charter_p_332C2D31
                 )
             )
         }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
index 86b446bce6..c338420966 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java
@@ -106,7 +106,7 @@ public class PickerLayoutManager extends LinearLayoutManager {
             for (int i = 0; i < getChildCount(); i++) {
                 View child = getChildAt(i);
                 if (child instanceof TextView) {
-                    ((TextView) child).setTextColor(ContextCompat.getColor(child.getContext(), R.color.bus_p_m1_47576e));
+                    ((TextView) child).setTextColor(ContextCompat.getColor(child.getContext(), R.color.charter_p_47576e));
                 }
             }
         }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt
index 46acd5e9fe..a71c8e0e37 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt
@@ -29,9 +29,6 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.bean.Temperature
 import com.mogo.och.charter.passenger.callback.IClearViewCallback
-import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager
-import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter
-import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration
 import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.PagerCenterSnapHelper
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.utils.RxUtils
@@ -40,35 +37,35 @@ import com.mogo.och.common.module.wigets.MineGradientDrawable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.dbv_wind
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.g_aircondition_setting
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.g_light_setting
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.g_voice_setting
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_bottom_light_setting
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_end_voice
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_loading
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_temperature_select
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_top_light_setting
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.iv_voice
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_automatic
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_heating
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_refrigeration
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_pattern_ventilate
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_wind_speed_high
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_wind_speed_low
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rb_wind_speed_middle
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rg_select_function
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rg_setting_pattern
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rg_setting_windspeed
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.rv_aircondition_temperature
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.sb_voice_bar
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_aircondition_switch
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_current_voice_value
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_light_atmosphere
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_light_top_01
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_light_top_02
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_setting_aircondition
-import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_temperature_title
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.dbv_wind
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.g_aircondition_setting
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.g_light_setting
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.g_voice_setting
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_bottom_light_setting
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_end_voice
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_loading
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_temperature_select
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_top_light_setting
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.iv_voice
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_automatic
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_heating
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_refrigeration
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_pattern_ventilate
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_wind_speed_high
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_wind_speed_low
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rb_wind_speed_middle
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rg_select_function
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rg_setting_pattern
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rg_setting_windspeed
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.rv_aircondition_temperature
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.sb_voice_bar
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_aircondition_switch
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_current_voice_value
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_light_atmosphere
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_light_top_01
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_light_top_02
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_setting_aircondition
+import kotlinx.android.synthetic.main.charter_p_soft_fragment.view.tv_temperature_title
 import me.jessyan.autosize.utils.AutoSizeUtils
 import java.util.concurrent.TimeUnit
 
@@ -116,7 +113,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
 
 
     private fun initView() {
-        LayoutInflater.from(context).inflate(R.layout.m1_soft_fragment, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_soft_fragment, this, true)
         onClick {
             setViewGone()
         }
@@ -205,7 +202,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             rb_wind_speed_low.setTextColor(
                 ContextCompat.getColorStateList(
                     context,
-                    R.color.bus_p_function_airconditon_pattern_text_color_selector
+                    R.color.charter_p_function_airconditon_pattern_text_color_selector
                 )
             )
         } else {
@@ -214,7 +211,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
             rb_wind_speed_low.setTextColor(
                 ContextCompat.getColor(
                     context,
-                    R.color.bus_p_m1_6647576e
+                    R.color.charter_p_6647576e
                 )
             )
         }
@@ -386,11 +383,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     override fun setLightTop1View(leftLight: Boolean, isFirst: Boolean) {
         tv_light_top_01?.let {
             if (leftLight) {
-                tv_light_top_01.text = context.getString(R.string.bus_p_m1_close_light1)
+                tv_light_top_01.text = context.getString(R.string.charter_p_close_light1)
                 tv_light_top_01.isChecked = true
                 if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯1")
             } else {
-                tv_light_top_01.text = context.getString(R.string.bus_p_m1_open_light1)
+                tv_light_top_01.text = context.getString(R.string.charter_p_open_light1)
                 tv_light_top_01.isChecked = false
                 if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯1")
             }
@@ -400,11 +397,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     override fun setLightTop2View(rightLight: Boolean, isFirst: Boolean) {
         tv_light_top_02?.let {
             if (rightLight) {
-                tv_light_top_02.text = context.getString(R.string.bus_p_m1_close_light2)
+                tv_light_top_02.text = context.getString(R.string.charter_p__close_light2)
                 tv_light_top_02.isChecked = true
                 if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯2")
             } else {
-                tv_light_top_02.text = context.getString(R.string.bus_p_m1_open_light2)
+                tv_light_top_02.text = context.getString(R.string.charter_p_open_light2)
                 tv_light_top_02.isChecked = false
                 if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯2")
             }
@@ -414,14 +411,14 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     override fun setLightAtmosphereView(atmosphereLight: Boolean, isFirst: Boolean) {
         tv_light_atmosphere?.let {
             if (atmosphereLight) {
-                tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_close_atmosphere)
+                tv_light_atmosphere.text = context.getString(R.string.charter_p_close_atmosphere)
                 tv_light_atmosphere.isChecked = true
-                iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_select)
+                iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_select)
                 if (!isFirst) ToastCharterUtils.showToastShort("打开氛围灯")
             } else {
-                tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_open_atmosphere)
+                tv_light_atmosphere.text = context.getString(R.string.charter_p_open_atmosphere)
                 tv_light_atmosphere.isChecked = false
-                iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_nor)
+                iv_bottom_light_setting.setImageResource(R.drawable.charter_p_function_atmosphere_nor)
                 if (!isFirst) ToastCharterUtils.showToastShort("关闭氛围灯")
             }
         }
@@ -433,15 +430,15 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     override fun setLightView(leftLight: Boolean, rightLight: Boolean) {
         iv_top_light_setting?.let {
             if (leftLight && rightLight) {
-                iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_middle_selected)// 都打开
+                iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_middle_selected)// 都打开
             } else if (!leftLight && !rightLight) {
-                iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_nor)// 都关闭
+                iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_nor)// 都关闭
             } else {
                 if (leftLight) {
-                    iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_select_left)// 左面开
+                    iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_select_left)// 左面开
                 }
                 if (rightLight) {
-                    iv_top_light_setting.setImageResource(R.drawable.bus_p_function_light_select_right)// 左面开
+                    iv_top_light_setting.setImageResource(R.drawable.charter_p_function_light_select_right)// 左面开
                 }
             }
         }
@@ -456,9 +453,9 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
     @SuppressLint("NewApi")
     private fun setVoiceInfo() {
         val dp2px = AutoSizeUtils.dp2px(context, 26f)//进度条高度
-        val color2CBFFC = ContextCompat.getColor(context, R.color.bus_p_m1_2cbffc)
-        val color1060FF = ContextCompat.getColor(context, R.color.bus_p_m1_1060ff)
-        val color96A5C2 = ContextCompat.getColor(context, R.color.bus_p_m1_96a5c2)
+        val color2CBFFC = ContextCompat.getColor(context, R.color.charter_p_2cbffc)
+        val color1060FF = ContextCompat.getColor(context, R.color.charter_p_1060ff)
+        val color96A5C2 = ContextCompat.getColor(context, R.color.charter_p_96a5c2)
         val temp03 = MineGradientDrawable(color2CBFFC, color1060FF, dp2px)
         val scaleDrawable3 = ClipDrawable(temp03, Gravity.START, ClipDrawable.HORIZONTAL)
         val temp01 = MineGradientDrawable(color96A5C2, color96A5C2, dp2px)
@@ -486,11 +483,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                     }
                 }
                 if (progress == 0) {
-                    iv_voice.setImageResource(R.drawable.bus_p_function_voice_middle_select)
-                    iv_end_voice.setImageResource(R.drawable.bus_p_function_voice_min)
+                    iv_voice.setImageResource(R.drawable.charter_p_function_voice_middle_select)
+                    iv_end_voice.setImageResource(R.drawable.charter_p_function_voice_min)
                 } else {
-                    iv_voice.setImageResource(R.drawable.bus_p_function_voice_middle_selected)
-                    iv_end_voice.setImageResource(R.drawable.bus_p_function_voice_max)
+                    iv_voice.setImageResource(R.drawable.charter_p_function_voice_middle_selected)
+                    iv_end_voice.setImageResource(R.drawable.charter_p_function_voice_max)
                 }
 
             }
@@ -760,15 +757,15 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 heaterAirEnable(true)
                 when (windSpeed) {//1: 1档，2: 2档，3:3档
                     1 -> {
-                        setWind(rb_wind_speed_low, R.drawable.bus_pm1_aircondition_wind_low)
+                        setWind(rb_wind_speed_low, R.drawable.charter_p_aircondition_wind_low)
                     }
 
                     2 -> {
-                        setWind(rb_wind_speed_middle, R.drawable.bus_pm1_aircondition_wind_middle)
+                        setWind(rb_wind_speed_middle, R.drawable.charter_p_aircondition_wind_middle)
                     }
 
                     3 -> {
-                        setWind(rb_wind_speed_high, R.drawable.bus_pm1_aircondition_wind_high)
+                        setWind(rb_wind_speed_high, R.drawable.charter_p_aircondition_wind_high)
                     }
 
                     else -> {}
@@ -779,11 +776,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba
                 heaterAirEnable(false)
                 when (windSpeed) {//1: 1档，2: 2档
                     1 -> {
-                        setWind(rb_wind_speed_middle, R.drawable.bus_pm1_warm_wind_middle)
+                        setWind(rb_wind_speed_middle, R.drawable.charter_p_warm_wind_middle)
                     }
 
                     2 -> {
-                        setWind(rb_wind_speed_high, R.drawable.bus_pm1_warm_wind_high)
+                        setWind(rb_wind_speed_high, R.drawable.charter_p_warm_wind_high)
                     }
 
                     else -> {}
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
index 05bfb80f09..7a323cc9e8 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java
@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.och.charter.passenger.R;
 import com.mogo.och.charter.passenger.bean.Temperature;
-import com.mogo.och.charter.passenger.bean.Temperature;
 
 import java.util.List;
 
@@ -38,7 +37,7 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
     public TextVH onCreateViewHolder(ViewGroup parent, int viewType) {
         View view;
         LayoutInflater inflater = LayoutInflater.from(context);
-        view = inflater.inflate(R.layout.m1_soft_temperature_item, parent, false);
+        view = inflater.inflate(R.layout.charter_p_soft_temperature_item, parent, false);
         return new TextVH(view);
     }
 
@@ -50,10 +49,10 @@ public class TemperatureAdapter extends RecyclerView.Adapter<TemperatureAdapter.
             if(position==checkIndex){
                 holder.pickerTxt.setTextColor(Color.WHITE);
             }else {
-                holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_47576e));
+                holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.charter_p_47576e));
             }
         }else {
-            holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.bus_p_m1_6647576e));
+            holder.pickerTxt.setTextColor(ContextCompat.getColor(context,R.color.charter_p_6647576e));
         }
         holder.pickerTxt.setTag(temperature);
         holder.pickerTxt.setOnClickListener(v -> {
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt
index 11aa2f0fe2..3298bafb87 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt
@@ -17,7 +17,7 @@ class DrawBitmapView @JvmOverloads constructor(
 ) : View(context, attrs, defStyleAttr) {
     private lateinit var mBitmap: Bitmap
     private lateinit var mBitPaint: Paint
-    private var drawBitmapViewResource = R.drawable.bus_pm1_aircondition_wind_high
+    private var drawBitmapViewResource = R.drawable.charter_p_aircondition_wind_high
     private var mBitWidth = 0
     private var showHeight = 0
         set(value) {
@@ -26,10 +26,10 @@ class DrawBitmapView @JvmOverloads constructor(
         }
 
     init {
-        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.MainWindStatus)
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CharterPMainWindStatus)
         drawBitmapViewResource = typedArray.getResourceId(
-            R.styleable.MainWindStatus_main_wind_drawable,
-            R.drawable.bus_pm1_aircondition_wind_high
+            R.styleable.CharterPMainWindStatus_charter_p_main_wind_drawable,
+            R.drawable.charter_p_aircondition_wind_high
         )
         typedArray.recycle()
         initBitmap()
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt
index cc8df22d64..067baee01d 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/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.charter.passenger.R
-import kotlinx.android.synthetic.main.m1_statusview_blue_tooth.view.*
+import kotlinx.android.synthetic.main.charter_p_statusview_blue_tooth.view.mofangView
 
 /**
  * 魔戒蓝牙控件
@@ -20,14 +20,14 @@ class M1BlueToothView @JvmOverloads constructor(
 ) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_statusview_blue_tooth, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_statusview_blue_tooth, this, true)
     }
 
     override fun mofangStatus(status: Boolean) {
         if (status) {
-            mofangView.setImageResource(R.drawable.bus_p_m1_blue_tooth_close)
+            mofangView.setImageResource(R.drawable.charter_p_blue_tooth_close)
         } else {
-            mofangView.setImageResource(R.drawable.bus_p_m1_blue_tooth_open)
+            mofangView.setImageResource(R.drawable.charter_p_blue_tooth_open)
         }
     }
 
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
index 5f71592fbe..888bdb0c7a 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt
@@ -11,7 +11,6 @@ import androidx.annotation.ColorRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import chassis.ChassisStatesOuterClass
-import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener
@@ -31,7 +30,12 @@ import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.ui.debugview.DebugEvent
 import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
 import com.mogo.och.common.module.manager.loopmanager.LoopInfo
-import kotlinx.android.synthetic.main.m1_statusview_datetime.view.*
+import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.aciv_connect_driver_status
+import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.actv_auto_status
+import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.bizz_view
+import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.iv_biz_icon
+import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.progress
+import kotlinx.android.synthetic.main.charter_p_statusview_datetime.view.tv_power_cos
 import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.EventBus
 import kotlin.math.roundToInt
@@ -64,8 +68,8 @@ class StatusBarView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_statusview_datetime, this, true)
-        setBackgroundColor(ContextCompat.getColor(context,R.color.bus_p_m1_80ffffff))
+        LayoutInflater.from(context).inflate(R.layout.charter_p_statusview_datetime, this, true)
+        setBackgroundColor(ContextCompat.getColor(context,R.color.charter_p_80ffffff))
         isClickable = true
         isFocusable = true
     }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
index a6d86d0e1d..27f2b0b76f 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
@@ -57,7 +57,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     constructor(context: Context?, fullFlag: Boolean?) : super(context, fullFlag)
 
     override fun init(context: Context) {
-        mEnlargeImageRes = R.drawable.bus_p_function_video_player_change_full
+        mEnlargeImageRes = R.drawable.charter_p_function_video_player_change_full
         super.init(context)
         start = findViewById(R.id.start)
         coverImage = findViewById(R.id.thumbImage)
@@ -77,7 +77,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         aivStartPlay.scaleX = 0.8f
         aivStartPlay.scaleY = 0.8f
 
-        mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_samll)
+        mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.charter_p_function_video_player_thumb_samll)
     }
 
     private fun addDrageAnchor(){
@@ -104,7 +104,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             titleTextView.layoutParams = layoutParams1
             aivStartPlay.scaleX = 1f
             aivStartPlay.scaleY = 1f
-            mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.bus_p_function_video_player_thumb_big)
+            mProgressBar.thumb = ActivityCompat.getDrawable(context, R.drawable.charter_p_function_video_player_thumb_big)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 mProgressBar.maxHeight = 6
                 mProgressBar.minHeight = 6
@@ -114,24 +114,24 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     }
 
     override fun getLayoutId(): Int {
-        return R.layout.m1_video_view
+        return R.layout.charter_p_video_view
     }
 
     override fun updateStartImage() {
         when (mCurrentState) {
             GSYVideoView.CURRENT_STATE_PLAYING ->{
                 if(isIfCurrentIsFullscreen){
-                    start.setImageResource(R.drawable.bus_p_function_video_player_pause_big)
+                    start.setImageResource(R.drawable.charter_p_function_video_player_pause_big)
                 }else {
-                    start.setImageResource(R.drawable.bus_p_function_video_player_pause_small)
+                    start.setImageResource(R.drawable.charter_p_function_video_player_pause_small)
                 }
                 aivStartPlay.visibility = View.GONE
             }
             else -> {
                 if(isIfCurrentIsFullscreen){
-                    start.setImageResource(R.drawable.bus_p_function_video_player_start_big)
+                    start.setImageResource(R.drawable.charter_p_function_video_player_start_big)
                 }else {
-                    start.setImageResource(R.drawable.bus_p_function_video_player_start_small)
+                    start.setImageResource(R.drawable.charter_p_function_video_player_start_small)
                 }
                 aivStartPlay.visibility = View.VISIBLE
             }
@@ -245,7 +245,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     }
 
     override fun onCompletion() {
-        start.setImageResource(R.drawable.bus_p_function_video_player_start_small)
+        start.setImageResource(R.drawable.charter_p_function_video_player_start_small)
     }
 
     override fun onSurfaceUpdated(surface: Surface) {
@@ -383,8 +383,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             cloneParams(this, gsyVideoPlayer)
             val frameLayout = FrameLayout(context)
             if (gsyVideoPlayer.fullscreenButton != null) {
-                gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.bus_p_function_video_player_change_normal)
-                gsyVideoPlayer.start.setImageResource(R.drawable.bus_p_function_video_player_pause_big)
+                gsyVideoPlayer.fullscreenButton.setImageResource(R.drawable.charter_p_function_video_player_change_normal)
+                gsyVideoPlayer.start.setImageResource(R.drawable.charter_p_function_video_player_pause_big)
                 gsyVideoPlayer.fullscreenButton.setOnClickListener { v ->
                     if (mBackFromFullScreenListener == null) {
                         clearFullscreenLayout(gsyVideoPlayer)
@@ -400,7 +400,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
             frameLayout.setBackgroundColor(Color.BLACK)
             val lp = LayoutParams(width, height)
             frameLayout.addView(gsyVideoPlayer, lp)
-            FullVideoUtils.showOverlayView(context as Activity,frameLayout,R.style.och_window_anim_alpha)
+            FullVideoUtils.showOverlayView(context as Activity,frameLayout,R.style.charter_p_window_anim_alpha)
             gsyVideoPlayer.visibility = INVISIBLE
             frameLayout.visibility = INVISIBLE
             resolveFullVideoShow(context, gsyVideoPlayer, frameLayout)
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt
index 150ca3b0b8..8bf73eda80 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt
@@ -9,14 +9,10 @@ import androidx.recyclerview.widget.RecyclerView
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.och.charter.passenger.R
-import com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay
 import com.mogo.och.charter.passenger.callback.IClearViewCallback
 import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager
-import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener
-import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CenterScrollListener
-import com.mogo.och.charter.passenger.ui.video.adapter.RecyclerVideoAdapter
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
-import kotlinx.android.synthetic.main.m1_video_fragment.view.rvVideoPlaylist
+import kotlinx.android.synthetic.main.charter_p_video_fragment.view.rvVideoPlaylist
 import kotlin.math.floor
 
 class VideoView @JvmOverloads constructor(
@@ -34,7 +30,7 @@ class VideoView @JvmOverloads constructor(
     var goneViewListener: IClearViewCallback? = null
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.m1_video_fragment, this, true)
+        LayoutInflater.from(context).inflate(R.layout.charter_p_video_fragment, this, true)
         onClick {
             goneViewListener?.goneAllView()
         }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java
index 707a8bc74e..54978cc387 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java
@@ -51,7 +51,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
     @NonNull
     @Override
     public RecyclerItemVideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(context).inflate(R.layout.m1_video_item, parent, false);
+        View v = LayoutInflater.from(context).inflate(R.layout.charter_p_video_item, parent, false);
         RecyclerItemVideoHolder recyclerItemVideoHolder = new RecyclerItemVideoHolder(context, v);
         recyclerItemVideoHolder.setIsRecyclable(false);
         return recyclerItemVideoHolder;
@@ -64,7 +64,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
         final TaxiPassengerVideoPlay taxiPassengerVideoPlay = itemDataList.get(position);
         AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.getResources());
         holder.gsyVideoOptionBuilder
-                .setEnlargeImageRes(R.drawable.taxi_p_change_full)
+                .setEnlargeImageRes(R.drawable.charter_p_change_full)
                 .setUrl(taxiPassengerVideoPlay.getUrl())
                 .setCacheWithPlay(true)
                 .setPlayTag(taxiPassengerVideoPlay.getImageUrl()+position)
@@ -73,7 +73,7 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter<RecyclerItemVideo
         holder.gsyVideoPlayer.getTitleTextView().setText(taxiPassengerVideoPlay.getTitle());
         Glide.with(context)
                 .load(taxiPassengerVideoPlay.getImageUrl())
-                .apply(new RequestOptions().placeholder(R.drawable.taxi_p_video_holder).centerCrop())
+                .apply(new RequestOptions().placeholder(R.drawable.charter_p_video_holder).centerCrop())
                 .into(holder.gsyVideoPlayer.coverImage);
         holder.gsyVideoPlayer.getThumbImageViewLayout().setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/OCH/charter/passenger/src/main/res/anim/alpha_hide_show.xml b/OCH/charter/passenger/src/main/res/anim/charter_p_alpha_hide_show.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/anim/alpha_hide_show.xml
rename to OCH/charter/passenger/src/main/res/anim/charter_p_alpha_hide_show.xml
diff --git a/OCH/charter/passenger/src/main/res/color/bus_p_aircondition_enable.xml b/OCH/charter/passenger/src/main/res/color/bus_p_aircondition_enable.xml
deleted file mode 100644
index 2222912f8e..0000000000
--- a/OCH/charter/passenger/src/main/res/color/bus_p_aircondition_enable.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/bus_p_m1_47576e" android:state_enabled="true"/>
-    <item android:color="@color/bus_p_m1_6647576e" android:state_enabled="false"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/color/charter_p_aircondition_enable.xml b/OCH/charter/passenger/src/main/res/color/charter_p_aircondition_enable.xml
new file mode 100644
index 0000000000..3cfdec4911
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/color/charter_p_aircondition_enable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/charter_p_47576e" android:state_enabled="true"/>
+    <item android:color="@color/charter_p_6647576e" android:state_enabled="false"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml b/OCH/charter/passenger/src/main/res/color/charter_p_function_airconditon_pattern_text_color_selector.xml
similarity index 59%
rename from OCH/charter/passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
rename to OCH/charter/passenger/src/main/res/color/charter_p_function_airconditon_pattern_text_color_selector.xml
index a920a7421b..77b3e60449 100644
--- a/OCH/charter/passenger/src/main/res/color/bus_p_function_airconditon_pattern_text_color_selector.xml
+++ b/OCH/charter/passenger/src/main/res/color/charter_p_function_airconditon_pattern_text_color_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@android:color/white" android:state_checked="true"/>
-    <item android:color="@color/bus_p_m1_47576e" android:state_checked="false"/>
-    <item android:color="@color/bus_p_m1_47576e" />
+    <item android:color="@color/charter_p_47576e" android:state_checked="false"/>
+    <item android:color="@color/charter_p_47576e" />
 </selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml b/OCH/charter/passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml
index 51e58f87a5..b4fbc5bca7 100644
--- a/OCH/charter/passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml
+++ b/OCH/charter/passenger/src/main/res/color/charter_p_select_city_name_textcolor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@android:color/white" android:state_checked="true" />
-    <item android:color="@color/bus_p_m1_112b57" android:state_checked="false" />
-    <item android:color="@color/bus_p_m1_112b57"/>
+    <item android:color="@color/charter_p_112b57" android:state_checked="false" />
+    <item android:color="@color/charter_p_112b57"/>
 </selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_high.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_high.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_high.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_low.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_low.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_low.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_middle.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_aircondition_wind_middle.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_aircondition_wind_middle.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_blue_tooth_close.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_close.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_blue_tooth_close.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_blue_tooth_open.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_blue_tooth_open.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_blue_tooth_open.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_bg.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_bottom_bar_select_bg.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_select_bg.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_speed.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_car_speed.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_car_speed.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_change_full.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_change_full.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_change_full.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_distance_info_bg.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_distance_info_bg.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_end_order_openclosedoor.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_end_order_openclosedoor.webp
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_end_order_openclosedoor.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_endorder_head.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_endorder_head.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_endorder_head.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_endorder_head.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_nor.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_nor.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_nor.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_pattern_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_pattern_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_pattern_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_select.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_select.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_select.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_switch_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_aircondition_switch_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_aircondition_switch_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_atmosphere_nor.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_nor.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_atmosphere_nor.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_atmosphere_select.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_atmosphere_select.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_atmosphere_select.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_function_bg.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_bg.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_function_bg.webp
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_bg.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_closedoor_normal_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_normal_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_closedoor_normal_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_closedoor_press_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_closedoor_press_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_closedoor_press_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_go_normal_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_normal_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_go_normal_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_go_press_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_go_press_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_go_press_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_normal.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_normal.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_normal.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_opendoor_normal_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_normal_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_opendoor_normal_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_opendoor_press_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_opendoor_press_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_opendoor_press_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_press.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_press.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_press.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_stopside_normal_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_normal_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_stopside_normal_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_stopside_press_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_device_stopside_press_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_device_stopside_press_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_information_normal.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_normal.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_information_normal.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_information_press.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_information_press.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_information_press.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_left_bg_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_left_bg_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_left_bg_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_select.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_select.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_check_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_check_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_middle_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_middle_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_middle_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_nor.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_nor.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_nor.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select_left.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_left.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select_left.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select_right.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_select_right.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_select_right.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_switch_bg_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_light_switch_bg_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_light_switch_bg_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_order_normal.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_normal.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_order_normal.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_order_press.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_order_press.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_order_press.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_soft_normal.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_normal.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_soft_normal.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_soft_press.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_soft_press.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_soft_press.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_humb.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_humb.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_humb.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_left_select_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_select_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_left_select_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_left_selected_src.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_left_selected_src.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_left_selected_src.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_max.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_max.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_max.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_middle_select.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_select.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_middle_select.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_middle_selected.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_middle_selected.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_middle_selected.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_min.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_function_voice_min.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_function_voice_min.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_line_cancle_submit_bg.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_line_cancle_submit_bg.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_line_cancle_submit_bg.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_loading.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_loading.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_loading.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_loading.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/map_staton_icon.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_map_staton_icon.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/map_staton_icon.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_map_staton_icon.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_mogo_video_play.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_mogo_video_play.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_mogo_video_play.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charger_p_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_normal.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charger_p_normal.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_normal.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_pause_big.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_big.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_pause_big.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_pause_small.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_pause_small.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_pause_small.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_big.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_start_big.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_big.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_start_big.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_small.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_start_small.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/notice_video_start_small.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_notice_video_start_small.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_early_end.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_early_end.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_early_end.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_early_end.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_end.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_end.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end_car.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_end_car.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_end_car.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_end_car.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_net_fail.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_net_fail.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_net_fail.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_noorder.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_noorder.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_noorder.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_noorder.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_opendoor_normal.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_normal.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_opendoor_normal.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_opendoor_press.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_opendoor_press.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_opendoor_press.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_site_check.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_site_check.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_site_check_enable.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_check_enable.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_site_check_enable.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_site_checked.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_site_checked.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_site_checked.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_switch_line_enable.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_enable.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_switch_line_enable.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_switch_line_unenable.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_order_switch_line_unenable.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_order_switch_line_unenable.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_overmap_car_model.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bug_p_overmap_car_model.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_overmap_car_model.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_overmap_reset.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_overmap_reset.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_overmap_reset.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_player_change_normal.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_player_change_normal.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_player_change_normal.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_site_cancle_submit_bg.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_cancle_submit_bg.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_site_cancle_submit_bg.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_site_submit_bg.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_site_submit_bg.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_site_submit_bg.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_small_map_view_dir_end.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/m1_small_map_view_dir_end.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_small_map_view_dir_end.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_status_bar_logo.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_p_m1_status_bar_logo.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_status_bar_logo.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_bg_bottom.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_bottom.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_bg_bottom.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.webp b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_holder.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_holder.webp
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_holder.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_index.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_index.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_index.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_thumb_big.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_big.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_thumb_big.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_thumb_small.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bg_taxi_p_video_thumb_small.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_video_thumb_small.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_warm_wind_high.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_high.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_warm_wind_high.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_warm_wind_lod.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_lod.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_warm_wind_lod.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_warm_wind_middle.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/bus_pm1_warm_wind_middle.png
rename to OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_warm_wind_middle.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/taxi_p_video_bg_top.png
deleted file mode 100644
index f9b70e68883681783a56321af528247df9b91063..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6954
zcmdT}cT`hbmk)@5Vgod&AoxT9m8J+%42Ta!6a*|_XaQ+rC}L<*5<%2Y5%3Apn+1>>
zAruip01*@dK>`Vc5~TzJlF*WnK#~dTJ)N~?eP;fdwPxmzd+*uz?sN7&`~3EApR?{`
zn@i?fH}BmH006dHoHx4+0EoK@+9s0Xg8S~1zTSd|2<)=?89;fr0#zWGd0w~hva$jk
z5ws-%B9D9kV(Th`Yp>t}05;@_05%AoBJ1z+M1Ou2cgx%Gvkfp=SIj8B{anx~*}}~9
zYM98}h}6@4{db!d((8y&U#wxs*7rMNj_z04b;2s_&9(FQi`A@r-d-&}lle$;=ONRb
zy~!6&JSKg(g|D(5ihcgD;K@emH)qeEkU8`0q2B5Jes?9_c|4ulDGGN*R-o%g+p~3a
zK;AS^1O@~Po%(LBU(Y`}mlHt48o(OKk)iSW8Fg;+SHhhU2)(R*lHJ5Y6Qj-;hTD!(
z;@n}=-B~-{aN4U(wcn7X&Y)pEoirUk-tqSI_n{4_L6BDtnHENAV1n>n+d%D9%AUIV
zl2QyPwW}S3i4bM2oC=7LiPC1Xkm=BqH-{KOTn!B(ro_I!(ab7CdYI?Q8$mG<_3iZ=
zK8&*>wj~TNyyvZPQMztN9^w#u9q6fBh(@zqQ*K$c&k~m-#zfPMP>7)@W?1N%>Zw8;
z)MV*?H;zGvEDf9UD^*ZP>^F^wQlG9)v@wlQMQo|M??PLk-J`ACZ+k|s8?T$v%ETx@
zZJY?0A8WKU+QJ0#fqLb(Ivz@Yc=51rJ;RKP<FVRPQhd5fLZTiU-{+*VGmRG~73r7W
zGS`A`Ff%fj1_r7qXL($x|EXK6PXrqEL_FhU)I=v}G}~s59mw^*HL73F>qB5DFePqh
zM%r9uDu_@;nIsfC;>r=V_Wat22BSP9IA-eG=Y2R3VsK3&k%Xu%MGUf6m4lU8VT(jf
zAo!6JAFSZd-dQse?x4m{dSGf!{B#{C?*2igEojUrINkRv+wbc_+;_*ALjSsh3L5tm
zUZ1qgR!ky}gnE~m8#aI9#47awFvW;&ysCc}>t#i*DxRV>6<>LvV#IeAt~T-tW>QUC
z2vHaUa)$QR1WVkeKthaJ^Lt7ZCE2qk$4M>vY4*(}t4u7tWpbLK>pr111@MM>Daa4N
zaLctuzO&oDUFsR6`vR8&IWTS=uSVSJi@~H@$?XD-zEqkkRL$hGLDOK?o_2BOa35w@
zpo3fw`gAwk8x;o1<}pbNEaWV0USIC@iqhl*PO#=Z6nHnXhYV`j*OZ-yA`eb*pw`gm
zctd!f37<EJ%PZPmcxv(aUl?DFbV7qKWPL6GZ&aua=I}C|K68!+powL3yS<Jn6`C-}
zn1|xS-vg0tShCExuginkDJOyMkj0wjvfS!o&p#H_DdWpi92WBBLP*$fNi#$4TwSU-
zN;lcvVB@qe@Kh0^9k=U_$cSh#(<t*(cnD_*>g}*}CnS`-6C*Va;}#*DcT!+km@Lsi
zy|agc|1{=D^5)2SX9Cks4vXI5pEg*{?iwTO6k<RuH$GP?#w>T$hr1LN^@JbEx0#=x
zOnvmFDJ!8RQ-%JT^MP0XBim<hq!W2$(KhN;^`ggv?G><HSzRq>16iFFR!+Og26@W|
z4CO|s#!C{B<p<t^ObYL#EO;Ez>#{HnUtf}`Rylu-f8K`A#Yh*xH!HDP<WVK1SY$|)
z;Xc7IYr|ZWHxbtrxlJ71L4oMM)Hx64la^qH`k4=??^m;_3oHmEG$P(f9_7ap1bFkL
zOW5m(EUq&F!(;@mYq9HA=Nf!F$$Xw}jY_3PJ$&QsL2$b#7Yb1lcmhsKs3)f@<|2&w
zI=VB2hl83W<TK3%_mde&=iEyY-YD&Tp%@*|OfDz4D6m!!8v^D6H+S!OQ;L}51pRWt
zmfy#>jIXbDtLdDnwYlBBUobqe5Z^qgZrMIUw@l;|^1N>imu*Ek+hHEWz{C&FLh6mP
zw{?5D8Pee1;e93ylPlx?era=cGxl`SKC|Z9*J|&_Q^;F$<@;FY8@*>%-ZmI>H5hJD
z@;y_i{gH{F$K{XH`GMsh)oruojFKcm6EF*$W^TP+V&ad;K;Juje_i-DM)&k*=svU-
z=tz>gjo6OU0Fi%xn|E=&IoNSCtjqC{UBl$WOV1KQ4KXX6xv7NE=>F+RzbaC}p>Z)e
z1Ul`T?V*p-|3gmw)sMg^Yb=D1e=)b30E`8VNXzrD)LKCZ&XJqCgMrS=2ECy0{K>kJ
zAw@(KemiX#g<#cCl|ycbpZT2^>+Z!i6<2#}f~M?^;k_gstyAn+-9lbWW8j1bYDhg{
zKzGYN%(Dk&TD+wfbM$|en;$%NBTk#>ui%_3R)(AgqcJ8Zo2jIbg7(p{JF7a|8`fGk
zoTP6~o}sG<wVDupdZ)%F96w&3kP|qHL^^)B!PscJV=HxvG&y^aU3T1!c{{n9H%%a$
z_;>!5(e0+y;``o6o^;HRqsn2=o{R<8w3aJTeXO6-?y?bz^-~ue&0XLji|4J<0)HR%
z(}3uY($`Tm=T1$|94=coviAdoP@AM)>rSnX*WdCHaVj`$B|y(fG33Xp)zC+WSoU(+
zDzQj=<ZZwp`>c*g)X+tsmrwZZi5KQd=vf?ugqc00c#^Q((X;(G>%1P}gyN>++^E%F
zmh*yK0Oal%mEPH6gBZHNdvkng)*Ni~A$(l7#Kj<M(+QW@x)}mmX<P4A6S%rO0d_p`
zl2qSv>qYAk#1eiew~qhqyXBKc$^G{LqQAK{RmkX%kEE8K;y;(~hH5!CHbz`R)Bf@t
zH!Wd2s&$SSi?W*fdQ+M*gPeP>*;R>SS?_H#sx@Ai{}?*De1{J@@bBUJH;$W>qT@`M
zwX>HDW?SMITh%zT_TfmiwXr#3HYd0qTv%2unMBok%Wmy5VdGD1Dc4i|N*0kV055W2
zWHjTEV@^YAJ!IxHO#OG>3#QdT6(d0AGmnzlFQH`lb8|^p!+)i_?v9lY;A4k)mk|(4
zp2xf5r1Azycc5$e+6+^x&}ZI};!6?BE?P)cY~Z$eZ;Nl(YY+OP{g2;=2_PEa6+KSO
zs+k~`a~_4(K1wiwdgZvy(?cVfPcvuKTdTYbQ^khtA}3%z87?n#qYHA)QoOFXE91y~
zhBfbIxbMNk)DC~4!IF;-yK!QK)5onRWJd&&94ePvBYh5D#PPZjn2NCn5*X(7ezPMZ
zo0cLVqd`{B#B+7G@5kdzr39J8VAG?P+B8h_igO-~3xl%=PK?wnfn={TR7>GQb>L@{
z+c)DwTOubR0UUPxHJQWCvFy*OIsDVl^AX+>nF>R-llA2Ha2+XayI7zQ$O6kx8?E#d
z`rmD@l!bet>uf(w?D1??;t$D<GF-vkOPVc_K_B^z)%d+1bR>IsdF|Id#_K=~Gt;e#
zb-=T6-W@8<aACpu)^(&u(E$jbFGgmeJlONp5rc>0e_E_n1O%+)6DgUn6U1(7_;}GF
zyc^Trr`JI9;)@Ffg-kfV+++wVigmitkoema0EkN2HkHPo3L-x2@+xaBP4}>9z?QyD
zt4?MwX2YbtJlgyEeO`5U$hlq}zRP?WpQ*B)M!D!p!FwnP!KM0n5!AWGAAi>RT^R2U
z$|$~${FLQGxJ<bi^6dcD6S9KD;}5d4BX^)>P!Y4^IQqca$3K_0wi*kIg6khrKL*yO
zUpf!vg#CessunfI9l}Eods%swXGv(bygm5dg|)Tv;5EFggi8b`f`9xt5g>HplIlPa
zl-F_HV;qN+pybB%L+5+HZKrgg-$}x#R@<GD3l<D4WJ)Z9$K(|2+()%uq(fat&4m>Q
z;HxI7#K?<UEpG=(^QUuRT4-u>ocJX8dhFNQZl{+<GmbZtNwpEPOc0;7)|Z#i@JPtA
zNUEO`L4{NX5D9apGVK)Aiv`Ht6WUN|O0PT}z29mKk40f)u3GtXnw=%YgU3KZLw8In
zO*dIRzHnLji%dSz4!bvQ_83%JCBZ25&|_mevawF((x-h%?#dl=O?pC>b^p78jo7^%
zpS%5xupgelJJOCr)yuzN4`2_S9EE*wDPz~E_a`2>*uP9rrOCs#d&vt)njNR}j=p0&
zj%debJYmCkquTC#31($!`gsA}`X>6$j@-YYTNBWpvv5B`=I;Ju!koHy8q!pnpQii5
zjQs6+LB-6QB>EhEYfPlH*T;wIy*Q0}8-$YO4O;9VW87P1(zNwA#o(W{I2#>l^{Es&
zO%LBB%TPp7ZX|ZxZ)ZlrqDuSjM3p?foL%&%pacw7Nc0>K#+Z^@fZEU_M{=@ytmW~w
zA6wfqb>$*F8YN#B;2B;bDqm|`6b6=(Z0k|sP`O~sqvJEmD^YK-;5NATwJ7Fs?>+WP
z&2(kY?&D0Ok{ML0LFappBwXn*ETw`BzLtv?DE6DrubxjwJ>_;6bAAXE%Z+2m<{ep{
zKSJ&Ly|rK|feh(2<I5CvcMPi7I6|OUlK74Fmtf@8>}!m{&MZ%-C^1Z8vO(tny|ftT
zLQ(&pbK#Ux$%Y6B=w^;y%G-l_P|c8lAu+H_?k<mL-nKM#`4R58IC*0dvkg@?m>d|u
zit+O;uQ`M$$CN(U=(vJz6-fEKA_Q2fkKY1(M<mrm^4M#g4%Y|z$ryrQ0!jb8UgORp
zRDjGEbT4mYy<Z*ANzg@#tK$l*)?iq3J00?Pay9qRgqq1E+!Tb+(o)XjRi_9dnaPhv
z5B1N_Tp82u8}hkbaP6@suhp+T|FPj&WY1eO6QnPl=C>8-_TzSyFsL+*$qdxGM-<b;
zY{Su?hPT3s!4bzqZApU>8Q^<gF7Ikjl2A32bsrpi^@pRd<jkwP2X;))(hvJwTAijV
zhhpA17k9OQ@Fv{3ZOt-%E<Q6iCP%m*JExz{;ia@k7(hYioumt%B_B&)W7}R<*e>ly
zr98eXw6sfJmDN8Hvfo*+K?M@<rI&CEf3#yP>{^N!C(t83Lt(_b@%TeI;pw+k1l4wf
z=!hl7QAyik!tQ3ovOBP?6C$*jB9V@l!hF9c-2+vRzEH5lNU<Am@E?U17TwCXNWl~t
zK3aaYMN3%N0MUk`#X4p5SX*}Z#l0$QD=k0nu4A^l3r0@9U|-nnBFrp6G+69%|E8D|
zUx<#C>Q5}mAt|41GlJyYuBwvly)6^Y3T1ipJ+QmQ)hw;5Slb@wSljGNGG=ac;O<?T
z;fDaiwja?X(Ib}Op)F?UYpEfE%$U~v+^3kZO}L{Vk^CF7hip^G%e@4gY8>jGk*nGc
zVR89(TWmRA3r&xuYP3x2?v7HmoW0%lMoZWVzMJ0I+f-UNO~j6W7R~R~{{lpB0SI%e
z$xYJ3B7?jssQ}zalR3;im-2~iy%hM`#U9`Bp8YR4W1Uuz>KQmY0j*G!IsI4Gd8qQH
zv7>;8G83omt=EaG;}zRiKwSRDuOOgxraKx(LA?;<=l_`j!fpdCdLMTsf<up)SD`!{
z0?gQQty^f9Cr3u3beX)2hPWu?1q3;<qK-tEP<AIT9nHja_18?`7^&4Zb|#JV+B#B-
z;AHKovEoAZT>2#?_b1X<{eH4sBQbPv?U&@q7+-~FmiQGRW*~$ZI>T8H@l!ej=B_l7
zDYqO2XZ_S_?fS+mFD4R|p^V0j1=&Sro@L*(<=nh-V>N`K!?j}58&g%x29?=Z_V{O#
zPeHDA0mY>n?0b45PS|GTg!JdD3Yl<lPe%aU=Ml#)ZEZA7<@Hwyp#^@wTu-8MrvQm%
z&0=%cgBP#ui4>L}B4Qa*Z@>Z4=Yj(eK85@8NpqA9y|ThBNWQu{8QKzrkT5l}aPQ}a
z?+*KKENr$69gCDMK)*3MV{~DIE~rcPOGZquumkB1ZPC9P7d}-{gF<(yT;|;MxabJx
zxreN<pM>M}%ARtu1-#Pr`fKt$7vv#;u}&rjwO(d;=i$s}f;_<a&fpvbdB9O-5B@30
z0~1t{2~>dp*~AI&?dy5)zdistYfue6`kX&qEvNG_WGD4xfnh-Rpk2;2l2LDs*Oj&x
z5{t{H1t|QIJF5k4##fe~^81C!$uoa{`x~!?p3ZkkdiFz?`F(<F-tl098vRq+Xx;f?
zvFaDjUr2qyZ}=tUqy$g;3_1B-<X+)d0*}b`9y8ER&*+wegj*|1kz}v9FWBhqR7^s_
zWQ2k{dUNcNPC2(eo0H8UyHzc!PJr{M&w;|I@3ybl)#H0Ibv!Ltl++Lf)xf?Bb+VL!
z6&O&6q3d~~*_WP^H=$0<l-E~%RJ-)bt|Zfc*d@;=Nw~3~jVWi#*1o!5$zE79n|s%P
z882}T6*>F9-<<X1X@ao)Q@4qx+GUY9$zBRt3{F+cn0c#qYs#bxmJsf2b@cx+#s1eS
zG2RTew46))hjZK83&*~HFJ)zGf4m>@qA`=1@NRv}NCo65t?%;KFs`RYn9FEB{y(V|
z_-smI;3tqyY0-PBzhHGi>hscuUz^LE)KKd3F97CmoM4Omf-0`FK8W*EdeAGnxCRga
zehSI|uGXPsUXTh|Y+%su7mv7%IL0mv$554podiq{MSl%pZA<$WU$hqJ!QWn&=+w{k
TuW?%cPi1lTl3Do~*O>nR@?lYm

diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml
deleted file mode 100644
index 242dbc5f6f..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_selecotr.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_aircondition_pattern_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_aircondition_pattern_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_aircondition_pattern_select"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml
deleted file mode 100644
index 9f2ff384bf..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_aircondition_switch_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_aircondition_switch_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_aircondition_switch_select"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml
deleted file mode 100644
index fb21cf89b7..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_bg_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_left_bg_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_left_bg_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_left_bg_select"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml
deleted file mode 100644
index 0213900747..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_left_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_aircondition_left_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_aircondition_left_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_aircondition_left_select"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml
deleted file mode 100644
index da31c45afc..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_device_bg_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_device_press" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_device_normal" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_device_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_device_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_device_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml
deleted file mode 100644
index 1cda431cc6..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_information_bg_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_information_press" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_information_normal" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_information_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_information_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_information_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml
deleted file mode 100644
index 88c82023a9..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_order_bg_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_order_press" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_order_normal" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_order_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_order_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_order_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml
deleted file mode 100644
index 3a40234a06..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_bottom_soft_bg_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_soft_press" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_soft_normal" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_soft_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_soft_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_soft_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml
deleted file mode 100644
index 13880358d5..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press_selecor.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_device_closedoor_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_device_closedoor_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_device_closedoor_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml
deleted file mode 100644
index 248060a372..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_normal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/bus_p_function_device_opendoor_normal_src" android:gravity="center"
-        android:width="@dimen/dp_136"
-        android:height="@dimen/dp_136"/>
-</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml
deleted file mode 100644
index 7a23d8f196..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/bus_p_function_device_opendoor_press_src" android:gravity="center"
-        android:width="@dimen/dp_136"
-        android:height="@dimen/dp_136"/>
-</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml
deleted file mode 100644
index 4e698a08a2..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_opendoor_press_selecor.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_device_opendoor_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_device_opendoor_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_device_opendoor_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml
deleted file mode 100644
index 76fdb20048..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_normal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/bus_p_function_device_stopside_normal_src" android:gravity="center"
-        android:width="@dimen/dp_136"
-        android:height="@dimen/dp_136"/>
-</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml
deleted file mode 100644
index d94b0dcafd..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@drawable/bus_p_function_device_stopside_press_src" android:gravity="center"
-        android:width="@dimen/dp_136"
-        android:height="@dimen/dp_136"/>
-</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml
deleted file mode 100644
index d227abd88e..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_stopside_press_selecor.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_device_stopside_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_device_stopside_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_device_stopside_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml
deleted file mode 100644
index 88955ede2c..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_light_left_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_light_left_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_light_left_select"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml
deleted file mode 100644
index af0603520e..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_light_switch_bg_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_light_switch_bg_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_light_switch_bg_select"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml
deleted file mode 100644
index 2bad5e8cd7..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_voice_left_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_voice_left_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_voice_left_select"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_baseline_link_off_24.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/baseline_link_off_24.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_baseline_link_off_24.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_bg_taxi_p_video_bg.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_bg_taxi_p_video_bg.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_common_bg.xml
similarity index 77%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_common_bg.xml
index a723ad1663..805d5a2de3 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_common_bg.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_44"/>
-    <solid android:color="@color/bus_p_m1_CCFFFFFF"/>
+    <solid android:color="@color/charter_p_CCFFFFFF"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_common_bg_01.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_common_bg_01.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_common_bg_01.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_left_select.xml
similarity index 73%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_left_select.xml
index a5891f6e9a..6b71fc1fb4 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_select.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_left_select.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_aircondition_select" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_aircondition_select" android:gravity="center"
         android:left="@dimen/dp_28"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_19"
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_left_selected.xml
similarity index 78%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_left_selected.xml
index 4e723fdddd..69ffc0aed6 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_left_selected.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_left_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_aircondition_selected"
+        android:drawable="@drawable/charter_p_function_aircondition_selected"
         android:left="@dimen/dp_28"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_19"
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_pattern_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_pattern_selecotr.xml
new file mode 100644
index 0000000000..0a292f3303
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_pattern_selecotr.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_aircondition_pattern_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_aircondition_pattern_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_aircondition_pattern_select"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_pattern_select.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_pattern_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_pattern_select.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_switch_select.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_aircondition_switch_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_switch_select.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_switch_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_switch_selector.xml
new file mode 100644
index 0000000000..8c1799df24
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_aircondition_switch_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_aircondition_switch_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_aircondition_switch_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_aircondition_switch_select"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_bg_selector.xml
similarity index 52%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_bg_selector.xml
index f05ee861f9..a8f5845755 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selector.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_bg_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_switch_left_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/bus_p_function_switch_left_select" android:state_checked="false"/>
-    <item android:drawable="@drawable/bus_p_function_switch_left_select"/>
+    <item android:drawable="@drawable/charter_p_function_left_bg_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_left_bg_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_left_bg_select"/>
 </selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_left_selector.xml
new file mode 100644
index 0000000000..805291ff35
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_left_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_aircondition_left_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_aircondition_left_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_aircondition_left_select"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_text_color_selector.xml
similarity index 59%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_text_color_selector.xml
index b76eea00b2..23df5211e3 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_airconditon_text_color_selector.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_airconditon_text_color_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@android:color/white" android:state_checked="true"/>
-    <item android:color="@color/bus_p_m1_374968" android:state_checked="false"/>
-    <item android:color="@color/bus_p_m1_374968" />
+    <item android:color="@color/charter_p_374968" android:state_checked="false"/>
+    <item android:color="@color/charter_p_374968" />
 </selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_device_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_device_bg_selector.xml
new file mode 100644
index 0000000000..2edfe4bb91
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_device_bg_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_device_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_device_normal" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_device_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_device_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_device_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_information_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_information_bg_selector.xml
new file mode 100644
index 0000000000..76173a0439
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_information_bg_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_information_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_information_normal" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_information_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_information_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_information_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_order_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_order_bg_selector.xml
new file mode 100644
index 0000000000..702c46f42d
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_order_bg_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_order_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_order_normal" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_order_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_order_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_order_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_soft_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_soft_bg_selector.xml
new file mode 100644
index 0000000000..7783766423
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_bottom_soft_bg_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_soft_press" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_soft_normal" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_soft_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_soft_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_soft_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_normal.xml
new file mode 100644
index 0000000000..604f7e0b00
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_normal.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/charter_p_function_device_closedoor_normal_src" android:gravity="center"
+        android:width="@dimen/dp_136"
+        android:height="@dimen/dp_136"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press.xml
new file mode 100644
index 0000000000..5c9ca665d7
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/charter_p_function_device_closedoor_press_src" android:gravity="center"
+        android:width="@dimen/dp_136"
+        android:height="@dimen/dp_136"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press_selecor.xml
new file mode 100644
index 0000000000..ef22ed5101
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_closedoor_press_selecor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_device_closedoor_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_device_closedoor_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_device_closedoor_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_normal.xml
similarity index 67%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_normal.xml
index e548c6bd8e..ef4734deba 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_normal.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_normal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_device_go_normal_src" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_device_go_normal_src" android:gravity="center"
         android:width="@dimen/dp_136"
         android:height="@dimen/dp_136"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_press.xml
similarity index 68%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_press.xml
index e1312f3f36..36e8f7601b 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_press.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_device_go_press_src" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_device_go_press_src" android:gravity="center"
         android:width="@dimen/dp_136"
         android:height="@dimen/dp_136"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_press_selecor.xml
new file mode 100644
index 0000000000..a03b6ebe93
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_go_press_selecor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_device_go_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_device_go_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_device_go_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_normal.xml
new file mode 100644
index 0000000000..5576aab023
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_normal.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/charter_p_function_device_opendoor_normal_src" android:gravity="center"
+        android:width="@dimen/dp_136"
+        android:height="@dimen/dp_136"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_press.xml
similarity index 66%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_press.xml
index e64ed0f2ec..de0a605b03 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_normal.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_press.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_device_closedoor_normal_src" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_device_opendoor_press_src" android:gravity="center"
         android:width="@dimen/dp_136"
         android:height="@dimen/dp_136"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_press_selecor.xml
new file mode 100644
index 0000000000..9706fff6e4
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_opendoor_press_selecor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_device_opendoor_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_device_opendoor_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_device_opendoor_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_normal.xml
new file mode 100644
index 0000000000..7228e8faf7
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_normal.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/charter_p_function_device_stopside_normal_src" android:gravity="center"
+        android:width="@dimen/dp_136"
+        android:height="@dimen/dp_136"/>
+</layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_press.xml
similarity index 66%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_press.xml
index ab2671c316..2bb2a41ae5 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_closedoor_press.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_press.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_device_closedoor_press_src" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_device_stopside_press_src" android:gravity="center"
         android:width="@dimen/dp_136"
         android:height="@dimen/dp_136"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_press_selecor.xml
new file mode 100644
index 0000000000..cd1c881833
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_device_stopside_press_selecor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_device_stopside_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_function_device_stopside_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_function_device_stopside_normal"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_distance_split_bg.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_distance_split_bg.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_distance_split_bg.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_left_bg_select.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_left_bg_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_left_bg_select.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_select.xml
similarity index 75%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_select.xml
index f6465bef43..8f906eb962 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_select.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_select.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_light_select" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_light_select" android:gravity="center"
         android:left="@dimen/dp_27"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_23"
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_selected.xml
similarity index 79%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_selected.xml
index b71ccb54d0..32a25de852 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_left_selected.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_light_selected"
+        android:drawable="@drawable/charter_p_function_light_selected"
         android:left="@dimen/dp_27"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_23"
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_selector.xml
new file mode 100644
index 0000000000..4b463e53bb
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_left_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_light_left_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_light_left_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_light_left_select"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_switch_bg_select.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_light_switch_bg_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_switch_bg_select.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_switch_bg_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_switch_bg_selector.xml
new file mode 100644
index 0000000000..d8b5243e7a
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_light_switch_bg_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_light_switch_bg_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_light_switch_bg_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_light_switch_bg_select"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_setting_soft_b_shape.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_setting_soft_b_shape.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_setting_soft_b_shape.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml
similarity index 73%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml
index d95d6d617f..6ab724d159 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_select.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_select.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_light_check_select" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_light_check_select" android:gravity="center"
         android:left="@dimen/dp_31"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_28"
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml
similarity index 78%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml
index 5a82a77718..e39743dbb2 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_switch_left_selected.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_light_check_selected"
+        android:drawable="@drawable/charter_p_function_light_check_selected"
         android:left="@dimen/dp_31"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_28"
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selector.xml
new file mode 100644
index 0000000000..2c044759ce
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_switch_left_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_switch_left_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_switch_left_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_switch_left_select"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_change_full.xml
similarity index 78%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_change_full.xml
index a5ff8d8fec..39b4974a6a 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_full.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_change_full.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/taxi_p_change_full"
+        android:drawable="@drawable/charter_p_change_full"
         android:width="@dimen/dp_44"
         android:height="@dimen/dp_43"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_change_normal.xml
similarity index 75%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_change_normal.xml
index 9d6c30d367..61d3241c3b 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_change_normal.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_change_normal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_player_change_normal"
+        android:drawable="@drawable/charter_p_player_change_normal"
         android:width="@dimen/dp_45"
         android:height="@dimen/dp_42"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_pause_big.xml
similarity index 75%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_pause_big.xml
index 492202b07a..ef26d9ceef 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_big.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_pause_big.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/notice_video_pause_big"
+        android:drawable="@drawable/charter_p_notice_video_pause_big"
         android:width="@dimen/dp_43"
         android:height="@dimen/dp_61"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_pause_small.xml
similarity index 74%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_pause_small.xml
index 9aa045579c..620d20b613 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_pause_small.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_pause_small.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/notice_video_pause_small"
+        android:drawable="@drawable/charter_p_notice_video_pause_small"
         android:width="@dimen/dp_29"
         android:height="@dimen/dp_42"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_start_big.xml
similarity index 75%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_start_big.xml
index 946fe33874..c87b104f4c 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_big.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_start_big.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/notice_video_start_big"
+        android:drawable="@drawable/charter_p_notice_video_start_big"
         android:width="@dimen/dp_44"
         android:height="@dimen/dp_51"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_start_small.xml
similarity index 74%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_start_small.xml
index 079662335f..bb52b3090e 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_start_small.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_start_small.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/notice_video_start_small"
+        android:drawable="@drawable/charter_p_notice_video_start_small"
         android:width="@dimen/dp_26"
         android:height="@dimen/dp_37"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_thumb_big.xml
similarity index 77%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_thumb_big.xml
index b6cb08fb60..8af08ac04a 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_big.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_thumb_big.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bg_taxi_p_video_thumb_big"
+        android:drawable="@drawable/charter_p_video_thumb_big"
         android:width="@dimen/dp_44"
         android:height="@dimen/dp_44"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_thumb_samll.xml
similarity index 76%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_thumb_samll.xml
index a7ad6f0091..398d5c73df 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_video_player_thumb_samll.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_video_player_thumb_samll.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bg_taxi_p_video_thumb_small"
+        android:drawable="@drawable/charter_p_video_thumb_small"
         android:width="@dimen/dp_36"
         android:height="@dimen/dp_35"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_select.xml
similarity index 73%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_select.xml
index e490d36639..9958d19339 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_select.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_select.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_voice_left_select_src" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_voice_left_select_src" android:gravity="center"
         android:left="@dimen/dp_31"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_17"
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_selected.xml
similarity index 77%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_selected.xml
index fc865ea70e..6310f21c6f 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_left_selected.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_voice_left_selected_src"
+        android:drawable="@drawable/charter_p_function_voice_left_selected_src"
         android:left="@dimen/dp_31"
         android:top="@dimen/dp_2"
         android:width="@dimen/dp_17"
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_selector.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_selector.xml
new file mode 100644
index 0000000000..57253868e5
--- /dev/null
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_left_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/charter_p_function_voice_left_selected" android:state_checked="true"/>
+    <item android:drawable="@drawable/charter_p_function_voice_left_select" android:state_checked="false"/>
+    <item android:drawable="@drawable/charter_p_function_voice_left_select"/>
+</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_right_process_humb.xml
similarity index 72%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_right_process_humb.xml
index d76e279ff4..201d4d3657 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_voice_right_process_humb.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_function_voice_right_process_humb.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_function_voice_humb" android:gravity="center"
+        android:drawable="@drawable/charter_p_function_voice_humb" android:gravity="center"
         android:top="@dimen/dp_4"
         android:width="@dimen/dp_46"
         android:height="@dimen/dp_46"/>
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_000.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_000.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_000.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_000.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_000_0.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_000_0.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_000_0.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_000_0.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_001.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_001.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_001.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_001.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_002.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_002.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_002.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_002.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_003.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_003.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_003.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_003.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_004.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_004.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_004.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_004.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_005.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_005.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_005.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_005.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_006.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_006.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_006.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_006.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_007.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_007.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_007.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_007.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_008.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_008.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_008.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_008.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_009.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_009.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_009.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_009.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_010.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_010.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_010.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_010.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_011.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_011.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_011.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_011.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_012.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_012.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_012.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_012.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_013.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_013.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_013.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_013.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_014.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_014.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_014.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_014.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_015.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_015.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_015.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_015.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_016.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_016.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_016.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_016.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_017.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_017.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_017.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_017.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_018.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_018.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_018.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_018.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_019.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_019.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_019.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_019.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_020.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_020.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_020.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_020.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_021.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_021.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_021.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_021.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_022.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_022.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_022.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_022.png
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_023.png b/OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_023.png
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/open_lock_023.png
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_open_lock_023.png
diff --git a/OCH/charter/passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_order_end_closedoor_selecotr.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_order_end_closedoor_selecotr.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_order_end_opendoor_selecotr.xml
similarity index 51%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_order_end_opendoor_selecotr.xml
index 0386101993..aee08cd072 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_function_device_go_press_selecor.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_order_end_opendoor_selecotr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bus_p_function_device_go_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bus_p_function_device_go_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bus_p_function_device_go_normal"/>
+    <item android:drawable="@drawable/charter_p_order_opendoor_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_order_opendoor_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_order_opendoor_normal"/>
 </selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/m1_order_line_checked_shape.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_order_line_checked_shape.xml
similarity index 72%
rename from OCH/charter/passenger/src/main/res/drawable/m1_order_line_checked_shape.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_order_line_checked_shape.xml
index 06e010b21c..c89113cd0c 100644
--- a/OCH/charter/passenger/src/main/res/drawable/m1_order_line_checked_shape.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_order_line_checked_shape.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/bus_p_m1_331466FB"/>
+    <solid android:color="@color/charter_p_331466FB"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/m1_order_line_shape.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_order_line_shape.xml
similarity index 59%
rename from OCH/charter/passenger/src/main/res/drawable/m1_order_line_shape.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_order_line_shape.xml
index b9db163776..042bfaf1a1 100644
--- a/OCH/charter/passenger/src/main/res/drawable/m1_order_line_shape.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_order_line_shape.xml
@@ -3,9 +3,9 @@
     android:shape="rectangle">
     <gradient
         android:angle="90"
-        android:centerColor="@color/bus_p_m1_91EFF6FF"
-        android:endColor="@color/bus_p_m1_00EFF6FF"
-        android:startColor="@color/bus_p_m1_00EFF6FF" />
+        android:centerColor="@color/charter_p_91EFF6FF"
+        android:endColor="@color/charter_p_00EFF6FF"
+        android:startColor="@color/charter_p_00EFF6FF" />
 
     <corners android:bottomRightRadius="@dimen/dp_26"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_overmap_reset_size.xml
similarity index 77%
rename from OCH/charter/passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_overmap_reset_size.xml
index 0e59d45dc0..c9eb38634b 100644
--- a/OCH/charter/passenger/src/main/res/drawable/bus_p_overmap_reset_size.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_overmap_reset_size.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-        android:drawable="@drawable/bus_p_overmap_reset"
+        android:drawable="@drawable/charter_p_overmap_reset"
         android:width="@dimen/dp_66"
         android:height="@dimen/dp_66"/>
 </layer-list >
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_power_size_seekbar_style.xml
similarity index 72%
rename from OCH/charter/passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_power_size_seekbar_style.xml
index 3f0c57be06..c0e32bc1fa 100644
--- a/OCH/charter/passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_power_size_seekbar_style.xml
@@ -4,14 +4,14 @@
     <item android:id="@android:id/background">
         <shape>
             <corners android:radius="5dp"/>
-            <solid android:color="@color/bus_p_m1_a3bdf2" />
+            <solid android:color="@color/charter_p_a3bdf2" />
         </shape>
     </item>
     <item android:id="@android:id/secondaryProgress">
         <clip>
             <shape>
                 <corners android:radius="5dp"/>
-                <solid android:color="@color/bus_p_m1_a3bdf2" />
+                <solid android:color="@color/charter_p_a3bdf2" />
             </shape>
         </clip>
     </item>
@@ -19,7 +19,7 @@
         <scale android:scaleWidth="100%">
             <shape android:shape="rectangle">
                 <corners android:radius="5dp"/>
-                <gradient android:startColor="@color/bus_p_m1_6edbdc" android:endColor="@color/bus_p_m1_56efa0" android:angle="0"/>
+                <gradient android:startColor="@color/charter_p_6edbdc" android:endColor="@color/charter_p_56efa0" android:angle="0"/>
             </shape>
         </scale>
     </item>
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
index 0ea8182fc7..0597410f26 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml
@@ -4,6 +4,6 @@
     <corners android:bottomRightRadius="@dimen/dp_26" />
     <gradient
         android:angle="-90"
-        android:endColor="@color/bus_p_m1_d7e5f5"
+        android:endColor="@color/charter_p_d7e5f5"
         android:startColor="@android:color/transparent" />
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml
index 6c01b69413..4e62bb9e8a 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_selct_site_name_shape_selected.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_8"/>
-    <gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE" android:angle="0"/>
+    <gradient android:startColor="@color/charter_p_1466FB" android:endColor="@color/charter_p_43CEFE" android:angle="0"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml
index 18e583918f..b9b818b96d 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_cancle_line_site_change.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_39"/>
-    <solid android:color="@color/bus_p_m1_9aabd2"/>
+    <solid android:color="@color/charter_p_9aabd2"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml
index 803c55d451..6d51c1957b 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_39"/>
-    <gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE" android:angle="@integer/keyCode_0"/>
+    <gradient android:startColor="@color/charter_p_1466FB" android:endColor="@color/charter_p_43CEFE" android:angle="@integer/keyCode_0"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml
index 18e583918f..b9b818b96d 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_end_order_left.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_39"/>
-    <solid android:color="@color/bus_p_m1_9aabd2"/>
+    <solid android:color="@color/charter_p_9aabd2"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml
index c786db4c18..eace4c7781 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_order_info.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_36"/>
-    <solid android:color="@color/bus_p_m1_f0e0efff"/>
+    <solid android:color="@color/charter_p_f0e0efff"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml
index 1cc7325f05..7cf1977d59 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_shape_submit_line_site_change.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_39"/>
-    <gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE"/>
+    <gradient android:startColor="@color/charter_p_1466FB" android:endColor="@color/charter_p_43CEFE"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_shape.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_shape.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_shape.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_top.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/bg_taxi_p_video_bg_top.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_video_bg_top.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_video_seekbar_style.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable/taxi_video_seekbar_style.xml
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_video_seekbar_style.xml
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit01.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit01.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit01.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit02.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit02.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit02.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit03.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit03.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit03.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit04.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit04.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit04.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit05.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit05.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit05.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit06.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit06.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit06.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit07.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit07.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit07.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit08.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit08.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit08.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit09.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit09.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit09.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit10.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit10.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit10.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit11.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit11.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit11.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit12.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit12.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit12.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit13.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit13.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit13.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit14.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit14.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit14.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit15.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit15.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit15.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit16.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit16.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit16.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit17.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit17.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit17.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit18.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit18.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit18.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit19.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit19.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit19.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit20.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit20.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit20.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit21.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit21.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit21.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit22.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit22.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit22.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit23.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit23.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit23.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit24.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit24.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit24.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit25.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit25.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit25.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit26.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit26.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit26.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit27.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit27.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit27.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit28.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit28.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit28.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit29.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit29.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit29.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp b/OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit30.webp
similarity index 100%
rename from OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_wait_driver_submit30.webp
rename to OCH/charter/passenger/src/main/res/drawable/charter_p_wait_driver_submit30.webp
diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml
index 374e3a007f..56b3e74477 100644
--- a/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml
+++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_welcome_explore.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/dp_40"/>
-    <gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE"/>
+    <gradient android:startColor="@color/charter_p_1466FB" android:endColor="@color/charter_p_43CEFE"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml b/OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml
deleted file mode 100644
index 3b80ea24a5..0000000000
--- a/OCH/charter/passenger/src/main/res/drawable/m1_order_end_opendoor_selecotr.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/m1_order_opendoor_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/m1_order_opendoor_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/m1_order_opendoor_normal"/>
-</selector>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/font/din.ttf b/OCH/charter/passenger/src/main/res/font/charter_p_din.ttf
similarity index 100%
rename from OCH/charter/passenger/src/main/res/font/din.ttf
rename to OCH/charter/passenger/src/main/res/font/charter_p_din.ttf
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml
similarity index 75%
rename from OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml
index 0de1e420ce..ebeaab801e 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml
@@ -19,7 +19,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_stop_site_press"
         android:visibility="gone"
-        android:src="@drawable/charter_bottom_bar_select_bg"
+        android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_stop_site"
         app:layout_constraintEnd_toEndOf="@+id/actv_stop_site"
         android:layout_width="@dimen/dp_359"
@@ -28,10 +28,10 @@
 
     <com.mogo.och.charter.passenger.ui.bottom.impl.StopSiteView
         android:id="@+id/actv_stop_site"
-        app:backageViewId="@+id/actv_stop_site_press"
-        app:selectedDrawable="@drawable/charter_p_bottom_stopsite_press"
-        app:normalDrawable="@drawable/charter_p_bottom_stopsite_normal"
-        app:bottomTitle="靠边停车"
+        app:charterPBackageViewId="@+id/actv_stop_site_press"
+        app:charterPselectedDrawable="@drawable/charter_p_bottom_stopsite_press"
+        app:charterPnormalDrawable="@drawable/charter_p_bottom_stopsite_normal"
+        app:charterPBottomTitle="靠边停车"
         app:layout_constraintStart_toEndOf="@+id/aciv_center_image"
         app:layout_constraintEnd_toStartOf="@+id/actv_close_door"
         app:layout_constraintTop_toTopOf="parent"
@@ -42,7 +42,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_close_door_press"
         android:visibility="gone"
-        android:src="@drawable/charter_bottom_bar_select_bg"
+        android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_close_door"
         app:layout_constraintEnd_toEndOf="@+id/actv_close_door"
         android:layout_width="@dimen/dp_359"
@@ -50,10 +50,10 @@
 
     <com.mogo.och.charter.passenger.ui.bottom.impl.CloseDoorView
         android:id="@+id/actv_close_door"
-        app:backageViewId="@+id/actv_close_door_press"
-        app:selectedDrawable="@drawable/charter_p_bottom_closedoor_press"
-        app:normalDrawable="@drawable/charter_p_bottom_closedoor_normal"
-        app:bottomTitle="关车门"
+        app:charterPBackageViewId="@+id/actv_close_door_press"
+        app:charterPselectedDrawable="@drawable/charter_p_bottom_closedoor_press"
+        app:charterPnormalDrawable="@drawable/charter_p_bottom_closedoor_normal"
+        app:charterPBottomTitle="关车门"
         app:layout_constraintStart_toEndOf="@+id/actv_stop_site"
         app:layout_constraintEnd_toStartOf="@+id/actv_open_door"
         app:layout_constraintTop_toTopOf="parent"
@@ -64,7 +64,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_open_door_press"
         android:visibility="gone"
-        android:src="@drawable/charter_bottom_bar_select_bg"
+        android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_open_door"
         app:layout_constraintEnd_toEndOf="@+id/actv_open_door"
         android:layout_width="@dimen/dp_359"
@@ -73,10 +73,10 @@
     <com.mogo.och.charter.passenger.ui.bottom.impl.OpenDoorView
         android:id="@+id/actv_open_door"
         android:gravity="center"
-        app:backageViewId="@+id/actv_open_door_press"
-        app:selectedDrawable="@drawable/charter_p_bottom_opendoor_press"
-        app:normalDrawable="@drawable/charter_p_bottom_opendoor_normal"
-        app:bottomTitle="开车门"
+        app:charterPBackageViewId="@+id/actv_open_door_press"
+        app:charterPselectedDrawable="@drawable/charter_p_bottom_opendoor_press"
+        app:charterPnormalDrawable="@drawable/charter_p_bottom_opendoor_normal"
+        app:charterPBottomTitle="开车门"
         app:layout_constraintStart_toEndOf="@+id/actv_close_door"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -87,7 +87,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/cl_order_time_press"
         android:visibility="gone"
-        android:src="@drawable/charter_bottom_bar_select_bg"
+        android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/cl_order_time"
         app:layout_constraintEnd_toEndOf="@+id/cl_order_time"
         android:layout_width="@dimen/dp_359"
@@ -106,7 +106,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_setting_press"
         android:visibility="gone"
-        android:src="@drawable/charter_bottom_bar_select_bg"
+        android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_setting"
         app:layout_constraintEnd_toEndOf="@+id/actv_setting"
         android:layout_width="@dimen/dp_359"
@@ -114,11 +114,11 @@
 
     <com.mogo.och.charter.passenger.ui.bottom.BottomCheckView
         android:id="@+id/actv_setting"
-        app:backageViewId="@+id/actv_setting_press"
-        app:selectedDrawable="@drawable/charter_p_bottom_softsettiing_press"
-        app:normalDrawable="@drawable/charter_p_bottom_softsettiing_normal"
-        app:bottomTitle="设置"
-        app:bottomClick="false"
+        app:charterPBackageViewId="@+id/actv_setting_press"
+        app:charterPselectedDrawable="@drawable/charter_p_bottom_softsettiing_press"
+        app:charterPnormalDrawable="@drawable/charter_p_bottom_softsettiing_normal"
+        app:charterPBottomTitle="设置"
+        app:charterPBottomClick="false"
         app:layout_constraintStart_toEndOf="@+id/cl_order_time"
         app:layout_constraintEnd_toStartOf="@+id/actv_line"
         app:layout_constraintTop_toTopOf="parent"
@@ -129,7 +129,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/actv_line_press"
         android:visibility="gone"
-        android:src="@drawable/charter_bottom_bar_select_bg"
+        android:src="@drawable/charter_p_bottom_bar_select_bg"
         app:layout_constraintStart_toStartOf="@+id/actv_line"
         app:layout_constraintEnd_toEndOf="@+id/actv_line"
         android:layout_width="@dimen/dp_359"
@@ -137,11 +137,11 @@
 
     <com.mogo.och.charter.passenger.ui.bottom.BottomCheckView
         android:id="@+id/actv_line"
-        app:backageViewId="@+id/actv_line_press"
-        app:selectedDrawable="@drawable/charter_p_bottom_line_press"
-        app:normalDrawable="@drawable/charter_p_bottom_line_normal"
-        app:bottomTitle="线路"
-        app:bottomClick="false"
+        app:charterPBackageViewId="@+id/actv_line_press"
+        app:charterPselectedDrawable="@drawable/charter_p_bottom_line_press"
+        app:charterPnormalDrawable="@drawable/charter_p_bottom_line_normal"
+        app:charterPBottomTitle="线路"
+        app:charterPBottomClick="false"
         app:layout_constraintStart_toEndOf="@+id/actv_setting"
         app:layout_constraintEnd_toStartOf="@+id/aciv_center_image"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_bottom_go.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_go.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/m1_bottom_go.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_bottom_go.xml
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_bottom_orderinfo.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_orderinfo.xml
similarity index 90%
rename from OCH/charter/passenger/src/main/res/layout/m1_bottom_orderinfo.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_bottom_orderinfo.xml
index c2bdf80453..e08027d567 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_bottom_orderinfo.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_orderinfo.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="订单空空~"
-        android:textColor="@color/bus_p_m1_090f28"
+        android:textColor="@color/charter_p_090f28"
         android:textSize="@dimen/dp_36"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -23,8 +23,8 @@
         android:id="@+id/actv_order_end_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/m1_bottom_reach_time"
-        android:textColor="@color/bus_p_m1_0050E1"
+        android:text="@string/charter_p_bottom_reach_time"
+        android:textColor="@color/charter_p_0050E1"
         android:textSize="@dimen/dp_60"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_7_5"
         android:text="剩余包车时长"
-        android:textColor="@color/bus_p_m1_090f28"
+        android:textColor="@color/charter_p_090f28"
         android:textSize="@dimen/dp_20"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_bottom_stop_site.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml
similarity index 96%
rename from OCH/charter/passenger/src/main/res/layout/m1_bottom_stop_site.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml
index 43f853b50c..e933597fd0 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_bottom_stop_site.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml
@@ -23,7 +23,7 @@
         android:layout_marginBottom="@dimen/dp_4_5"
         android:textSize="@dimen/dp_20"
         android:text="靠边停车"
-        android:textColor="@color/bus_p_m1_090f28"
+        android:textColor="@color/charter_p_090f28"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 </merge>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_contain_fragment.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/m1_contain_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_contain_fragment.xml
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_p_debug.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_debug.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/m1_p_debug.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_debug.xml
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_devices_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml
similarity index 95%
rename from OCH/charter/passenger/src/main/res/layout/m1_devices_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml
index 800c3fda50..b4ea1a4e3b 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_devices_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_fragment.xml
@@ -22,7 +22,7 @@
             android:layout_marginStart="@dimen/dp_33"
             android:text="----"
             android:textSize="@dimen/dp_20"
-            android:textColor="@color/bus_p_m1_203555"
+            android:textColor="@color/charter_p_203555"
             android:layout_marginTop="@dimen/dp_32"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
@@ -35,7 +35,7 @@
             android:layout_marginBottom="8dp"
             android:text="--:-----:--"
             android:textSize="@dimen/dp_36"
-            android:textColor="@color/bus_p_m1_0050E1"
+            android:textColor="@color/charter_p_0050E1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -47,7 +47,7 @@
             android:layout_marginBottom="@dimen/dp_25"
             android:text="用车时间"
             android:textSize="@dimen/dp_18"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -87,7 +87,7 @@
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginTop="@dimen/dp_22"
             android:layout_marginStart="@dimen/dp_44"
-            android:src="@drawable/charter_endorder_head"
+            android:src="@drawable/charter_p_endorder_head"
             android:layout_width="@dimen/dp_66"
             android:layout_height="@dimen/dp_68"/>
 
@@ -95,7 +95,7 @@
             android:id="@+id/actv_left_time"
             android:text="剩余时间 --:--"
             android:textSize="@dimen/dp_20"
-            android:textColor="@color/bus_p_m1_5F7096"
+            android:textColor="@color/charter_p_5F7096"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_marginTop="@dimen/dp_33"
@@ -107,7 +107,7 @@
             android:id="@+id/actv_end_order_content"
             android:text="要提前说再见了吗？蘑菇小助手很舍不得您呢！"
             android:textSize="@dimen/dp_26"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_devices_lock_unlock.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_lock_unlock.xml
similarity index 94%
rename from OCH/charter/passenger/src/main/res/layout/m1_devices_lock_unlock.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_devices_lock_unlock.xml
index 29c141d990..26c82f290a 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_devices_lock_unlock.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_lock_unlock.xml
@@ -10,7 +10,7 @@
         android:id="@+id/aciv_screen_lock_bg"
         android:layout_width="@dimen/dp_138"
         android:layout_height="@dimen/dp_138"
-        android:src="@drawable/charger_p_normal"
+        android:src="@drawable/charter_p_normal"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,7 +32,7 @@
         android:id="@+id/aciv_screen_unlock_ani"
         android:layout_width="@dimen/dp_90"
         android:layout_height="@dimen/dp_90"
-        android:src="@drawable/open_lock_000_0"
+        android:src="@drawable/charter_p_open_lock_000_0"
         app:layout_constraintTop_toTopOf="@+id/aciv_screen_lock_bg"
         app:layout_constraintBottom_toBottomOf="@+id/aciv_screen_lock_bg"
         app:layout_constraintStart_toStartOf="@+id/aciv_screen_lock_bg"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_unlock.xml
similarity index 96%
rename from OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_devices_unlock.xml
index 2ce8e3177d..1d0f8c7b27 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_devices_unlock.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_devices_unlock.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
-    android:background="@color/bus_p_m1_66000000"
+    android:background="@color/charter_p_66000000"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -35,7 +35,7 @@
             app:layout_constraintTop_toBottomOf="@+id/aciv_only_unlock"
             android:layout_marginTop="@dimen/dp_20"
             android:textSize="@dimen/dp_29"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_itinerary_info.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_itinerary_info.xml
similarity index 86%
rename from OCH/charter/passenger/src/main/res/layout/m1_itinerary_info.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_itinerary_info.xml
index f37fd34daa..403f027887 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_itinerary_info.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_itinerary_info.xml
@@ -11,7 +11,7 @@
         android:layout_marginTop="@dimen/dp_74"
         android:layout_marginStart="@dimen/dp_29"
         android:layout_width="@dimen/dp_152"
-        android:background="@drawable/bus_p_car_speed"
+        android:background="@drawable/charter_p_car_speed"
         android:orientation="vertical"
         android:layout_height="@dimen/dp_152">
 
@@ -21,12 +21,12 @@
             android:textSize="@dimen/dp_60"
             android:gravity="center"
             android:layout_marginTop="@dimen/dp_12"
-            android:textColor="@color/bus_p_m1_f5fbff"
+            android:textColor="@color/charter_p_f5fbff"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
         <TextView
             android:textSize="@dimen/dp_19"
-            android:text="@string/bus_p_m1_speed_unit"
+            android:text="@string/charter_p_speed_unit"
             android:layout_marginTop="-10dp"
             android:layout_gravity="center_horizontal"
             android:textColor="@android:color/white"
@@ -38,7 +38,7 @@
         app:layout_constraintTop_toBottomOf="@+id/ll_car_speed"
         app:layout_constraintStart_toStartOf="@+id/ll_car_speed"
         app:layout_constraintEnd_toEndOf="@+id/ll_car_speed"
-        android:background="@drawable/bus_p_distance_info_bg"
+        android:background="@drawable/charter_p_distance_info_bg"
         android:layout_width="@dimen/dp_115"
         android:layout_height="@dimen/dp_346">
 
@@ -49,10 +49,10 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/tv_distance_unit"
             app:layout_constraintVertical_chainStyle="packed"
-            android:fontFamily="@font/din"
+            android:fontFamily="@font/charter_p_din"
             android:text="--"
             android:textSize="@dimen/dp_37"
-            android:textColor="@color/bus_p_m1_203555"
+            android:textColor="@color/charter_p_203555"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -62,9 +62,9 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/v_line_01"
-            android:text="@string/m1_distance_unit_km"
+            android:text="@string/charter_p_distance_unit_km"
             android:textSize="@dimen/dp_17"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -86,9 +86,9 @@
             app:layout_constraintBottom_toTopOf="@+id/tv_distance_surplus_time_unit"
             app:layout_constraintHorizontal_chainStyle="packed"
             android:text="--"
-            android:fontFamily="@font/din"
+            android:fontFamily="@font/charter_p_din"
             android:textSize="@dimen/dp_37"
-            android:textColor="@color/bus_p_m1_203555"
+            android:textColor="@color/charter_p_203555"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -98,9 +98,9 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/v_line_02"
-            android:text="@string/m1_arrive_left_time"
+            android:text="@string/charter_p_arrive_left_time"
             android:textSize="@dimen/dp_17"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -121,9 +121,9 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
             android:text="--"
-            android:fontFamily="@font/din"
+            android:fontFamily="@font/charter_p_din"
             android:textSize="@dimen/dp_37"
-            android:textColor="@color/bus_p_m1_203555"
+            android:textColor="@color/charter_p_203555"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -133,9 +133,9 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:text="@string/m1_reach_time"
+            android:text="@string/charter_p_reach_time"
             android:textSize="@dimen/dp_17"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
similarity index 96%
rename from OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
index 61b135e866..fbbeebdf56 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
@@ -18,7 +18,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         app:bottomPadding="200"
-        app:carDrawable="@drawable/bug_p_overmap_car_model"
+        app:carDrawable="@drawable/charter_p_overmap_car_model"
         app:isClearArrived="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -26,7 +26,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:mapStyleExtraPath="m1_style_extra.data"
         app:mapStylePath="m1_style.data"
-        app:resetDrawable="@drawable/bus_p_overmap_reset_size"
+        app:resetDrawable="@drawable/charter_p_overmap_reset_size"
         app:resetDrawableMarginBottom="54dp"
         app:resetDrawableMarginRight="34dp"
         app:startPointDrawable="@null"
@@ -37,7 +37,7 @@
         android:layout_width="@dimen/dp_148"
         android:layout_height="@dimen/dp_150"
         android:layout_marginBottom="-15dp"
-        android:src="@drawable/bus_p_overmap_reset"
+        android:src="@drawable/charter_p_overmap_reset"
         app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
         app:layout_constraintEnd_toEndOf="parent" />
 
@@ -155,7 +155,7 @@
     <com.mogo.och.charter.passenger.ui.lockview.UnlockView
         android:id="@+id/uv_only_unlock"
         android:visibility="gone"
-        android:background="@color/bus_p_m1_66000000"
+        android:background="@color/charter_p_66000000"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_fragment.xml
similarity index 78%
rename from OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_fragment.xml
index d8e1afc1a4..74e4c7b5cc 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_fragment.xml
@@ -8,7 +8,7 @@
 
    <include
        android:id="@+id/include_welcome"
-       layout="@layout/m1_novice_guidance_welcome_fragment"
+       layout="@layout/charter_p_novice_guidance_welcome_fragment"
        android:visibility="gone"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
@@ -17,27 +17,27 @@
    <include
        android:id="@+id/include_welcome_01"
        android:visibility="gone"
-       layout="@layout/m1_novice_guidance_welcome_1_fragment"
+       layout="@layout/charter_p_novice_guidance_welcome_1_fragment"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
 
    <include
        android:id="@+id/include_welcome_02"
-       layout="@layout/m1_novice_guidance_welcome_2_fragment"
+       layout="@layout/charter_p_novice_guidance_welcome_2_fragment"
        android:visibility="gone"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
 
    <include
        android:id="@+id/include_welcome_03"
-       layout="@layout/m1_novice_guidance_welcome_3_fragment"
+       layout="@layout/charter_p_novice_guidance_welcome_3_fragment"
        android:visibility="gone"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
 
    <include
        android:id="@+id/include_welcome_04"
-       layout="@layout/m1_novice_guidance_welcome_4_fragment"
+       layout="@layout/charter_p_novice_guidance_welcome_4_fragment"
        android:visibility="gone"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_1_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_1_fragment.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_1_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_1_fragment.xml
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_2_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_2_fragment.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_2_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_2_fragment.xml
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_3_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_3_fragment.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_3_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_3_fragment.xml
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_4_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_4_fragment.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_4_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_4_fragment.xml
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml
similarity index 93%
rename from OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml
index f5cd6e00d2..bc88747b71 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_novice_guidance_welcome_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_novice_guidance_welcome_fragment.xml
@@ -16,7 +16,7 @@
         android:visibility="gone"
         android:textSize="@dimen/dp_52"
         android:textStyle="bold"
-        android:textColor="@color/bus_p_m1_101c35"
+        android:textColor="@color/charter_p_101c35"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -30,7 +30,7 @@
         android:text="太棒了！"
         android:textSize="@dimen/dp_63"
         android:textStyle="bold"
-        android:textColor="@color/bus_p_m1_101c35"
+        android:textColor="@color/charter_p_101c35"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -41,7 +41,7 @@
         app:layout_constraintTop_toBottomOf="@+id/actv_complete_guidance_title"
         android:text="您已完成乘车指南，更多功能欢迎探索~\n蘑菇小助手预祝您旅途愉快!"
         android:textSize="@dimen/dp_43"
-        android:textColor="@color/bus_p_m1_101c35"
+        android:textColor="@color/charter_p_101c35"
         android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -71,7 +71,7 @@
         android:layout_marginTop="@dimen/dp_74"
         android:layout_marginStart="@dimen/dp_100"
         android:text="用户信息："
-        android:textColor="@color/bus_p_m1_20418D"
+        android:textColor="@color/charter_p_20418D"
         android:textSize="@dimen/dp_30"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -81,9 +81,9 @@
         app:layout_constraintTop_toBottomOf="@+id/actv_userinfo_title"
         app:layout_constraintStart_toStartOf="@+id/actv_userinfo_title"
         android:text="*** *** ***"
-        android:fontFamily="@font/din"
+        android:fontFamily="@font/charter_p_din"
         android:layout_marginTop="@dimen/dp_15"
-        android:textColor="@color/bus_p_m1_222222"
+        android:textColor="@color/charter_p_222222"
         android:textSize="@dimen/dp_45"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -94,7 +94,7 @@
         app:layout_constraintStart_toStartOf="@+id/actv_userinfo"
         android:layout_marginTop="@dimen/dp_60"
         android:text="用车时间："
-        android:textColor="@color/bus_p_m1_20418D"
+        android:textColor="@color/charter_p_20418D"
         android:textSize="@dimen/dp_30"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -104,9 +104,9 @@
         app:layout_constraintTop_toBottomOf="@+id/actv_order_time_title"
         app:layout_constraintStart_toStartOf="@+id/actv_order_time_title"
         android:text="9:00-18:00"
-        android:fontFamily="@font/din"
+        android:fontFamily="@font/charter_p_din"
         android:layout_marginTop="@dimen/dp_15"
-        android:textColor="@color/bus_p_m1_222222"
+        android:textColor="@color/charter_p_222222"
         android:textSize="@dimen/dp_45"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_order_end.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_end.xml
similarity index 88%
rename from OCH/charter/passenger/src/main/res/layout/m1_order_end.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_order_end.xml
index 4cd2d81173..1c319535f3 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_order_end.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_end.xml
@@ -9,13 +9,13 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:background="@drawable/m1_function_bg"
+        android:background="@drawable/charter_p_function_bg"
         android:layout_marginEnd="@dimen/dp_5"
         android:layout_height="match_parent">
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="@drawable/charter_end_order_openclosedoor"
+            android:background="@drawable/charter_p_end_order_openclosedoor"
             android:clickable="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1031:500"
@@ -30,7 +30,7 @@
                 android:layout_width="@dimen/dp_108"
                 android:layout_height="@dimen/dp_108"
                 android:layout_marginBottom="@dimen/dp_100"
-                android:src="@drawable/m1_order_end_opendoor_selecotr"
+                android:src="@drawable/charter_p_order_end_opendoor_selecotr"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/iv_end_order_closedoor"
                 app:layout_constraintStart_toStartOf="parent" />
@@ -40,7 +40,7 @@
                 android:layout_width="@dimen/dp_108"
                 android:layout_height="@dimen/dp_108"
                 android:layout_marginBottom="@dimen/dp_100"
-                android:src="@drawable/m1_order_end_closedoor_selecotr"
+                android:src="@drawable/charter_p_order_end_closedoor_selecotr"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/iv_end_order_opendoor" />
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_19"
                 android:text="开车门"
-                android:textColor="@color/bus_p_m1_23293b"
+                android:textColor="@color/charter_p_23293b"
                 android:textSize="@dimen/dp_28"
                 app:layout_constraintEnd_toEndOf="@+id/iv_end_order_opendoor"
                 app:layout_constraintStart_toStartOf="@+id/iv_end_order_opendoor"
@@ -61,7 +61,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_19"
                 android:text="关车门"
-                android:textColor="@color/bus_p_m1_23293b"
+                android:textColor="@color/charter_p_23293b"
                 android:textSize="@dimen/dp_28"
                 app:layout_constraintEnd_toEndOf="@+id/iv_end_order_closedoor"
                 app:layout_constraintStart_toStartOf="@+id/iv_end_order_closedoor"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml
similarity index 96%
rename from OCH/charter/passenger/src/main/res/layout/m1_order_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml
index 6df7a84dd7..16f9377a5d 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_order_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml
@@ -36,7 +36,7 @@
                     android:layout_height="0dp"
                     android:layout_marginTop="@dimen/dp_31"
                     android:layout_marginBottom="@dimen/dp_31"
-                    android:background="@drawable/m1_order_line_shape"
+                    android:background="@drawable/charter_p_order_line_shape"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -136,7 +136,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="稍等，亲\n蘑菇小助手正在为您确认信息…"
-                android:textColor="@color/bus_p_m1_4a5375"
+                android:textColor="@color/charter_p_4a5375"
                 android:textSize="@dimen/dp_30"
                 app:layout_constraintEnd_toEndOf="@+id/iv_loading_wait_driver"
                 app:layout_constraintStart_toStartOf="@+id/iv_loading_wait_driver"
@@ -168,7 +168,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_34"
                 android:text="确认完毕！"
-                android:textColor="@color/bus_p_m1_112b57"
+                android:textColor="@color/charter_p_112b57"
                 android:textSize="@dimen/dp_34"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="@+id/aciv_driver_agree_image"
@@ -180,7 +180,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="小助手已记录您的选择。"
-                android:textColor="@color/bus_p_m1_112b57"
+                android:textColor="@color/charter_p_112b57"
                 android:textSize="@dimen/dp_29"
                 app:layout_constraintEnd_toEndOf="@+id/aciv_driver_agree_image"
                 app:layout_constraintStart_toStartOf="@+id/aciv_driver_agree_image"
@@ -213,7 +213,7 @@
                 android:layout_marginTop="@dimen/dp_35"
                 android:gravity="center"
                 android:text="啊哦，加载失败了\n联系车内领航员，或尝试再次提交。"
-                android:textColor="@color/bus_p_m1_112b57"
+                android:textColor="@color/charter_p_112b57"
                 android:textSize="@dimen/dp_34"
                 app:layout_constraintEnd_toEndOf="@+id/aciv_driver_refuse_image"
                 app:layout_constraintStart_toStartOf="@+id/aciv_driver_refuse_image"
@@ -233,17 +233,17 @@
 
         <include
             android:id="@+id/m1_order_noorder"
-            layout="@layout/m1_order_noorder"
+            layout="@layout/charter_p_order_noorder"
             android:visibility="gone" />
 
         <include
             android:id="@+id/m1_order_neterror"
-            layout="@layout/m1_order_net_fail"
+            layout="@layout/charter_p_order_net_fail"
             android:visibility="gone" />
 
         <include
             android:id="@+id/m1_order_loading"
-            layout="@layout/m1_order_loading"
+            layout="@layout/charter_p_order_loading"
             android:visibility="gone" />
 
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_order_line_item.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_line_item.xml
similarity index 89%
rename from OCH/charter/passenger/src/main/res/layout/m1_order_line_item.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_order_line_item.xml
index ea560d73ea..39004f2c36 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_order_line_item.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_line_item.xml
@@ -7,5 +7,5 @@
     android:gravity="center_vertical|left"
     android:paddingStart="46dp"
     android:text="22°"
-    android:textColor="@color/bus_p_m1_292c39"
+    android:textColor="@color/charter_p_292c39"
     android:textSize="@dimen/dp_26" />
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_order_loading.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_loading.xml
similarity index 93%
rename from OCH/charter/passenger/src/main/res/layout/m1_order_loading.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_order_loading.xml
index a2c08d102a..b5c746e7f2 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_order_loading.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_loading.xml
@@ -15,7 +15,7 @@
         android:id="@+id/iv_loading_wait_ent"
         android:layout_width="@dimen/dp_71"
         android:layout_height="@dimen/dp_73"
-        android:src="@drawable/bus_p_loading"
+        android:src="@drawable/charter_p_loading"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -29,7 +29,7 @@
         android:layout_marginTop="63dp"
         android:text="加载中 请稍等"
         android:gravity="center"
-        android:textColor="@color/bus_p_m1_4a5375"
+        android:textColor="@color/charter_p_4a5375"
         android:textSize="@dimen/dp_30"
         app:layout_constraintEnd_toEndOf="@+id/iv_loading_wait_driver"
         app:layout_constraintStart_toStartOf="@+id/iv_loading_wait_driver"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_order_net_fail.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_net_fail.xml
similarity index 90%
rename from OCH/charter/passenger/src/main/res/layout/m1_order_net_fail.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_order_net_fail.xml
index 4724f5aa1d..89efb47301 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_order_net_fail.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_net_fail.xml
@@ -14,7 +14,7 @@
     <ImageView
         android:layout_width="@dimen/dp_387"
         android:layout_height="@dimen/dp_230"
-        android:src="@drawable/m1_order_net_fail"
+        android:src="@drawable/charter_p_order_net_fail"
         android:layout_marginTop="@dimen/dp_68"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -25,12 +25,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_42"
-        android:text="@string/m1_net_error"
+        android:text="@string/charter_p_net_error"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="@dimen/dp_99"
-        android:textColor="@color/bus_p_m1_112b57"
+        android:textColor="@color/charter_p_112b57"
         android:textSize="@dimen/dp_29" />
 
     <TextView
@@ -43,7 +43,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/tv_see_next_time"
         android:layout_marginBottom="@dimen/dp_5"
-        android:textColor="@color/bus_p_m1_112b57"
+        android:textColor="@color/charter_p_112b57"
         android:textSize="@dimen/dp_34" />
 
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_order_noorder.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_noorder.xml
similarity index 89%
rename from OCH/charter/passenger/src/main/res/layout/m1_order_noorder.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_order_noorder.xml
index 3a0972d46e..e4eb7c118f 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_order_noorder.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_noorder.xml
@@ -12,14 +12,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <!--  无订单页面  -->
     <ImageView
-        android:src="@drawable/m1_order_noorder"
+        android:src="@drawable/charter_p_order_noorder"
         android:layout_width="@dimen/dp_274"
         android:layout_height="@dimen/dp_219"/>
     <TextView
         android:text="当前暂无订单"
         android:layout_marginTop="@dimen/dp_42"
         android:textSize="@dimen/dp_30"
-        android:textColor="@color/bus_p_m1_4a5375"
+        android:textColor="@color/charter_p_4a5375"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_order_site_item.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_site_item.xml
similarity index 87%
rename from OCH/charter/passenger/src/main/res/layout/m1_order_site_item.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_order_site_item.xml
index 10a51bc373..0c63895d74 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_order_site_item.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_site_item.xml
@@ -11,7 +11,7 @@
         android:layout_width="@dimen/dp_42"
         android:layout_height="@dimen/dp_42"
         android:layout_marginStart="@dimen/dp_74"
-        android:src="@drawable/m1_order_site_checked" />
+        android:src="@drawable/charter_p_order_site_checked" />
 
     <TextView
         android:id="@+id/tv_site_site_name"
@@ -19,6 +19,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_25"
         android:text="路线名称A"
-        android:textColor="@color/bus_p_m1_2C2D31"
+        android:textColor="@color/charter_p_2C2D31"
         android:textSize="@dimen/dp_26" />
 </LinearLayout>
diff --git a/OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_orderinfo_fragment.xml
similarity index 96%
rename from OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_orderinfo_fragment.xml
index 5c43eecc82..94182aa4d0 100644
--- a/OCH/charter/passenger/src/main/res/layout/orderinfo_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_orderinfo_fragment.xml
@@ -22,7 +22,7 @@
             android:layout_marginStart="@dimen/dp_33"
             android:text="18811539480"
             android:textSize="@dimen/dp_20"
-            android:textColor="@color/bus_p_m1_203555"
+            android:textColor="@color/charter_p_203555"
             android:layout_marginTop="@dimen/dp_32"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
@@ -35,7 +35,7 @@
             app:layout_constraintTop_toBottomOf="@+id/actv_order_phone"
             android:text="09:00-18:00"
             android:textSize="@dimen/dp_36"
-            android:textColor="@color/bus_p_m1_0050E1"
+            android:textColor="@color/charter_p_0050E1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -47,7 +47,7 @@
             app:layout_constraintTop_toBottomOf="@+id/actv_order_times"
             android:text="用车时间"
             android:textSize="@dimen/dp_18"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
@@ -87,7 +87,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:text="剩余时间 02:37"
             android:textSize="@dimen/dp_20"
-            android:textColor="@color/bus_p_m1_5F7096"
+            android:textColor="@color/charter_p_5F7096"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_marginTop="@dimen/dp_33"
@@ -99,7 +99,7 @@
             android:id="@+id/actv_end_order_content"
             android:text="要提前说再见了吗？蘑菇小助手很舍不得您呢！"
             android:textSize="@dimen/dp_26"
-            android:textColor="@color/bus_p_m1_112b57"
+            android:textColor="@color/charter_p_112b57"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_soft_fragment.xml
similarity index 78%
rename from OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_soft_fragment.xml
index 16ca18765c..4a1e72f2be 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_soft_fragment.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/m1_function_bg"
+    android:background="@drawable/charter_p_function_bg"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -11,7 +11,7 @@
         android:layout_height="0dp"
         android:clickable="true"
         android:layout_marginBottom="@dimen/dp_141_5"
-        android:background="@drawable/bus_p_function_setting_soft_b_shape"
+        android:background="@drawable/charter_p_function_setting_soft_b_shape"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="3:1"
         app:layout_constraintEnd_toEndOf="parent"
@@ -33,13 +33,13 @@
                 android:layout_width="@dimen/dp_160"
                 android:layout_height="50dp"
                 android:layout_marginBottom="@dimen/dp_26"
-                android:background="@drawable/bus_p_function_airconditon_bg_selector"
+                android:background="@drawable/charter_p_function_airconditon_bg_selector"
                 android:button="@null"
-                android:drawableLeft="@drawable/bus_p_function_airconditon_left_selector"
+                android:drawableLeft="@drawable/charter_p_function_airconditon_left_selector"
                 android:drawablePadding="-20dp"
                 android:gravity="center"
                 android:text="空 调"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
             <RadioButton
@@ -47,26 +47,26 @@
                 android:layout_width="@dimen/dp_160"
                 android:layout_height="50dp"
                 android:layout_marginBottom="@dimen/dp_26"
-                android:background="@drawable/bus_p_function_airconditon_bg_selector"
+                android:background="@drawable/charter_p_function_airconditon_bg_selector"
                 android:button="@null"
-                android:drawableLeft="@drawable/bus_p_function_light_left_selector"
+                android:drawableLeft="@drawable/charter_p_function_light_left_selector"
                 android:drawablePadding="-20dp"
                 android:gravity="center"
                 android:text="灯 光"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
             <RadioButton
                 android:id="@+id/tv_setting_voice"
                 android:layout_width="@dimen/dp_160"
                 android:layout_height="50dp"
-                android:background="@drawable/bus_p_function_airconditon_bg_selector"
+                android:background="@drawable/charter_p_function_airconditon_bg_selector"
                 android:button="@null"
-                android:drawableLeft="@drawable/bus_p_function_voice_left_selector"
+                android:drawableLeft="@drawable/charter_p_function_voice_left_selector"
                 android:drawablePadding="-20dp"
                 android:gravity="center"
                 android:text="声 音"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
         </RadioGroup>
 
@@ -78,7 +78,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:scaleType="fitXY"
-            android:src="@drawable/bus_p_function_aircondition_nor"
+            android:src="@drawable/charter_p_function_aircondition_nor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/gl_right"
             app:layout_constraintStart_toStartOf="@+id/gl_left"
@@ -99,14 +99,14 @@
             android:layout_height="@dimen/dp_76"
             android:layout_marginTop="@dimen/dp_57"
             android:layout_marginBottom="@dimen/dp_17"
-            android:background="@drawable/bus_p_function_aircondition_switch_selector"
+            android:background="@drawable/charter_p_function_aircondition_switch_selector"
             android:button="@null"
             android:checked="false"
-            android:drawableLeft="@drawable/bus_p_function_switch_left_selector"
+            android:drawableLeft="@drawable/charter_p_function_switch_left_selector"
             android:text="打开空调"
             android:gravity="left|center_vertical"
             android:drawablePadding="@dimen/dp_13"
-            android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+            android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
             android:textSize="@dimen/dp_24"
             app:layout_constraintBottom_toTopOf="@+id/tv_light_top_02"
             app:layout_constraintEnd_toEndOf="parent"
@@ -119,8 +119,8 @@
             android:id="@+id/tv_temperature_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/bus_p_m1_temperature"
-            android:textColor="@color/bus_p_aircondition_enable"
+            android:text="@string/charter_p_temperature"
+            android:textColor="@color/charter_p_aircondition_enable"
             android:textSize="@dimen/dp_24"
             app:layout_constraintBottom_toBottomOf="@+id/rv_aircondition_temperature"
             app:layout_constraintStart_toStartOf="@+id/tv_aircondition_switch"
@@ -132,7 +132,7 @@
             app:layout_constraintEnd_toEndOf="@+id/rv_aircondition_temperature"
             app:layout_constraintTop_toTopOf="@+id/rv_aircondition_temperature"
             app:layout_constraintBottom_toBottomOf="@+id/rv_aircondition_temperature"
-            android:background="@drawable/bus_p_function_aircondition_common_bg"
+            android:background="@drawable/charter_p_function_aircondition_common_bg"
             android:layout_width="0dp"
             android:layout_height="0dp"/>
 
@@ -142,7 +142,7 @@
             app:layout_constraintEnd_toEndOf="@+id/rv_aircondition_temperature"
             app:layout_constraintTop_toTopOf="@+id/rv_aircondition_temperature"
             app:layout_constraintBottom_toBottomOf="@+id/rv_aircondition_temperature"
-            android:src="@drawable/bus_p_function_aircondition_pattern_selected"
+            android:src="@drawable/charter_p_function_aircondition_pattern_selected"
             android:layout_width="@dimen/dp_59"
             android:layout_height="@dimen/dp_60"/>
 
@@ -151,7 +151,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_60"
             android:layout_marginTop="@dimen/dp_41"
-            android:background="@drawable/bus_p_function_aircondition_common_bg_01"
+            android:background="@drawable/charter_p_function_aircondition_common_bg_01"
             app:layout_constraintEnd_toEndOf="@+id/tv_aircondition_switch"
             app:layout_constraintTop_toBottomOf="@+id/tv_aircondition_switch"
             app:layout_constraintWidth_percent="0.244" />
@@ -161,7 +161,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="设置"
-            android:textColor="@color/bus_p_m1_47576e"
+            android:textColor="@color/charter_p_47576e"
             android:textSize="@dimen/dp_24"
             app:layout_constraintBottom_toBottomOf="@+id/rg_setting_pattern"
             app:layout_constraintStart_toStartOf="@+id/tv_aircondition_switch"
@@ -172,7 +172,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_60"
             android:layout_marginTop="@dimen/dp_41"
-            android:background="@drawable/bus_p_function_aircondition_common_bg"
+            android:background="@drawable/charter_p_function_aircondition_common_bg"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="@+id/tv_aircondition_switch"
@@ -184,12 +184,12 @@
                 android:layout_width="@dimen/dp_59"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/dp_21"
-                android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
+                android:background="@drawable/charter_p_function_aircondition_pattern_selecotr"
                 android:button="@null"
                 android:checked="true"
                 android:gravity="center"
-                android:text="@string/bus_p_m1_automatic"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:text="@string/charter_p_automatic"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
             <RadioButton
@@ -197,11 +197,11 @@
                 android:layout_width="@dimen/dp_59"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/dp_21"
-                android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
+                android:background="@drawable/charter_p_function_aircondition_pattern_selecotr"
                 android:button="@null"
                 android:gravity="center"
-                android:text="@string/bus_p_m1_refrigeration"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:text="@string/charter_p_refrigeration"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
             <RadioButton
@@ -209,22 +209,22 @@
                 android:layout_width="@dimen/dp_59"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/dp_21"
-                android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
+                android:background="@drawable/charter_p_function_aircondition_pattern_selecotr"
                 android:button="@null"
                 android:gravity="center"
-                android:text="@string/bus_p_m1_heating"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:text="@string/charter_p_heating"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
             <RadioButton
                 android:id="@+id/rb_pattern_ventilate"
                 android:layout_width="@dimen/dp_59"
                 android:layout_height="match_parent"
-                android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
+                android:background="@drawable/charter_p_function_aircondition_pattern_selecotr"
                 android:button="@null"
                 android:gravity="center"
-                android:text="@string/bus_p_m1_ventilate"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:text="@string/charter_p_ventilate"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
         </RadioGroup>
@@ -233,8 +233,8 @@
             android:id="@+id/tv_aircondition_wind_speed_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/bus_p_m1_wind_speed"
-            android:textColor="@color/bus_p_m1_47576e"
+            android:text="@string/charter_p_wind_speed"
+            android:textColor="@color/charter_p_47576e"
             android:textSize="@dimen/dp_24"
             app:layout_constraintBottom_toBottomOf="@+id/rg_setting_windspeed"
             app:layout_constraintStart_toStartOf="@+id/tv_aircondition_switch"
@@ -245,7 +245,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_60"
             android:layout_marginTop="@dimen/dp_41"
-            android:background="@drawable/bus_p_function_aircondition_common_bg"
+            android:background="@drawable/charter_p_function_aircondition_common_bg"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="@+id/tv_aircondition_switch"
@@ -257,12 +257,12 @@
                 android:layout_width="@dimen/dp_59"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/dp_44"
-                android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
+                android:background="@drawable/charter_p_function_aircondition_pattern_selecotr"
                 android:button="@null"
                 android:checked="true"
                 android:gravity="center"
-                android:text="@string/bus_p_m1_wind_speed_low"
-                android:textColor="@color/bus_p_function_airconditon_pattern_text_color_selector"
+                android:text="@string/charter_p_wind_speed_low"
+                android:textColor="@color/charter_p_function_airconditon_pattern_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
             <RadioButton
@@ -270,29 +270,29 @@
                 android:layout_width="@dimen/dp_59"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/dp_44"
-                android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
+                android:background="@drawable/charter_p_function_aircondition_pattern_selecotr"
                 android:button="@null"
                 android:gravity="center"
-                android:text="@string/bus_p_m1_wind_speed_middle"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:text="@string/charter_p_wind_speed_middle"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
 
             <RadioButton
                 android:id="@+id/rb_wind_speed_high"
                 android:layout_width="@dimen/dp_59"
                 android:layout_height="match_parent"
-                android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
+                android:background="@drawable/charter_p_function_aircondition_pattern_selecotr"
                 android:button="@null"
                 android:gravity="center"
-                android:text="@string/bus_p_m1_wind_speed_high"
-                android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+                android:text="@string/charter_p_wind_speed_high"
+                android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
                 android:textSize="@dimen/dp_24" />
         </RadioGroup>
 
         <ImageView
             android:id="@+id/iv_loading"
             android:visibility="gone"
-            android:src="@drawable/bus_p_loading"
+            android:src="@drawable/charter_p_loading"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -314,7 +314,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:scaleType="centerCrop"
-            android:src="@drawable/bus_p_function_light_nor"
+            android:src="@drawable/charter_p_function_light_nor"
             app:layout_constraintEnd_toStartOf="@+id/gl_right"
             app:layout_constraintHeight_percent="0.5"
             app:layout_constraintStart_toEndOf="@+id/gl_left"
@@ -325,7 +325,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:scaleType="centerCrop"
-            android:src="@drawable/bus_p_function_atmosphere_nor"
+            android:src="@drawable/charter_p_function_atmosphere_nor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/gl_right"
             app:layout_constraintHeight_percent="0.5"
@@ -337,13 +337,13 @@
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_76"
             android:layout_marginBottom="@dimen/dp_17"
-            android:background="@drawable/bus_p_function_light_switch_bg_selector"
+            android:background="@drawable/charter_p_function_light_switch_bg_selector"
             android:button="@null"
-            android:drawableLeft="@drawable/bus_p_function_switch_left_selector"
+            android:drawableLeft="@drawable/charter_p_function_switch_left_selector"
             android:drawablePadding="-20dp"
             android:gravity="center"
-            android:text="@string/bus_p_m1_close_light1"
-            android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+            android:text="@string/charter_p_close_light1"
+            android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
             android:textSize="@dimen/dp_24"
             app:layout_constraintBottom_toTopOf="@+id/tv_light_top_02"
             app:layout_constraintEnd_toEndOf="parent"
@@ -357,13 +357,13 @@
             android:layout_height="@dimen/dp_76"
             android:layout_marginTop="@dimen/dp_17"
             android:layout_marginBottom="@dimen/dp_17"
-            android:background="@drawable/bus_p_function_light_switch_bg_selector"
+            android:background="@drawable/charter_p_function_light_switch_bg_selector"
             android:button="@null"
-            android:drawableLeft="@drawable/bus_p_function_switch_left_selector"
+            android:drawableLeft="@drawable/charter_p_function_switch_left_selector"
             android:drawablePadding="-20dp"
             android:gravity="center"
-            android:text="@string/bus_p_m1_close_light2"
-            android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+            android:text="@string/charter_p__close_light2"
+            android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
             android:textSize="@dimen/dp_24"
             app:layout_constraintBottom_toTopOf="@+id/tv_light_atmosphere"
             app:layout_constraintEnd_toEndOf="parent"
@@ -375,13 +375,13 @@
             android:layout_width="@dimen/dp_220"
             android:layout_height="@dimen/dp_76"
             android:layout_marginTop="@dimen/dp_17"
-            android:background="@drawable/bus_p_function_light_switch_bg_selector"
+            android:background="@drawable/charter_p_function_light_switch_bg_selector"
             android:button="@null"
-            android:drawableLeft="@drawable/bus_p_function_switch_left_selector"
+            android:drawableLeft="@drawable/charter_p_function_switch_left_selector"
             android:drawablePadding="-20dp"
             android:gravity="center"
-            android:text="@string/bus_p_m1_close_atmosphere"
-            android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
+            android:text="@string/charter_p_close_atmosphere"
+            android:textColor="@drawable/charter_p_function_airconditon_text_color_selector"
             android:textSize="@dimen/dp_24"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -403,7 +403,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:scaleType="fitXY"
-            android:src="@drawable/bus_p_function_voice_middle_select"
+            android:src="@drawable/charter_p_function_voice_middle_select"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/gl_right"
             app:layout_constraintStart_toStartOf="@+id/gl_left"
@@ -416,7 +416,7 @@
             android:paddingStart="0dp"
             android:paddingEnd="0dp"
             android:splitTrack="false"
-            android:thumb="@drawable/bus_p_function_voice_right_process_humb"
+            android:thumb="@drawable/charter_p_function_voice_right_process_humb"
             android:thumbOffset="@dimen/dp_2"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -452,7 +452,7 @@
             android:layout_width="@dimen/dp_21"
             android:layout_height="@dimen/dp_23"
             android:layout_marginTop="@dimen/dp_24"
-            android:src="@drawable/bus_p_function_voice_min"
+            android:src="@drawable/charter_p_function_voice_min"
             app:layout_constraintStart_toStartOf="@+id/sb_voice_bar"
             app:layout_constraintTop_toBottomOf="@+id/sb_voice_bar" />
 
@@ -462,7 +462,7 @@
             android:layout_height="@dimen/dp_23"
             android:layout_marginTop="@dimen/dp_24"
             android:scaleType="fitEnd"
-            android:src="@drawable/bus_p_function_voice_max"
+            android:src="@drawable/charter_p_function_voice_max"
             app:layout_constraintEnd_toEndOf="@+id/sb_voice_bar"
             app:layout_constraintTop_toBottomOf="@+id/sb_voice_bar" />
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_soft_temperature_item.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_soft_temperature_item.xml
similarity index 88%
rename from OCH/charter/passenger/src/main/res/layout/m1_soft_temperature_item.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_soft_temperature_item.xml
index 9a8a6334af..2df99547cd 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_soft_temperature_item.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_soft_temperature_item.xml
@@ -6,5 +6,5 @@
     android:layout_height="match_parent"
     android:gravity="center"
     android:text="22°"
-    android:textColor="@color/bus_p_m1_47576e"
+    android:textColor="@color/charter_p_47576e"
     android:textSize="@dimen/dp_30" />
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_statusview_blue_tooth.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_blue_tooth.xml
similarity index 89%
rename from OCH/charter/passenger/src/main/res/layout/m1_statusview_blue_tooth.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_statusview_blue_tooth.xml
index 798bf31177..560fa9bfb7 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_statusview_blue_tooth.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_blue_tooth.xml
@@ -9,7 +9,7 @@
         android:layout_width="@dimen/dp_18"
         android:layout_height="@dimen/dp_26"
         android:scaleType="fitXY"
-        android:src="@drawable/bus_p_m1_blue_tooth_open"
+        android:src="@drawable/charter_p_blue_tooth_open"
         tools:ignore="ContentDescription" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_datetime.xml
similarity index 91%
rename from OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_statusview_datetime.xml
index 11a86bc214..70561adb14 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_statusview_datetime.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_datetime.xml
@@ -14,7 +14,7 @@
         app:layout_constraintEnd_toStartOf="@+id/viewTextClock"
         android:textSize="@dimen/dp_22"
         android:gravity="center"
-        android:textColor="@color/bus_p_m1_1b2546"
+        android:textColor="@color/charter_p_1b2546"
         android:textStyle="bold"
         android:layout_marginEnd="@dimen/dp_32"
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bizz_view"
-        android:textColor="@color/bus_p_m1_1b2546"
+        android:textColor="@color/charter_p_1b2546"
         android:includeFontPadding="false"
         android:textSize="@dimen/dp_22"
         android:textStyle="bold" />
@@ -47,7 +47,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/bizz_view"
         app:layout_constraintStart_toStartOf="@+id/bizz_view"
         app:layout_constraintEnd_toEndOf="@+id/bizz_view"
-        android:src="@drawable/baseline_link_off_24"
+        android:src="@drawable/charter_p_baseline_link_off_24"
         android:layout_width="@dimen/dp_34"
         android:layout_height="@dimen/dp_34"/>
 
@@ -70,7 +70,7 @@
         app:layout_constraintStart_toEndOf="@+id/wifiStateView"
         android:layout_width="@dimen/dp_18"
         android:layout_height="@dimen/dp_26"
-        android:src="@drawable/bus_p_m1_blue_tooth_open"
+        android:src="@drawable/charter_p_blue_tooth_open"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/dp_32" />
 
@@ -87,7 +87,7 @@
         android:maxHeight="@dimen/dp_10"
         android:minHeight="@dimen/dp_10"
         android:background="@null"
-        android:progressDrawable="@drawable/taxi_power_size_seekbar_style" />
+        android:progressDrawable="@drawable/charter_p_power_size_seekbar_style" />
 
     <TextView
         android:id="@+id/tv_power_cos"
@@ -96,7 +96,7 @@
         android:layout_marginStart="@dimen/dp_7"
         app:layout_constraintStart_toEndOf="@+id/progress"
         android:textSize="@dimen/dp_22"
-        android:textColor="@color/bus_p_m1_1b2546"
+        android:textColor="@color/charter_p_1b2546"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -106,7 +106,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:src="@drawable/bus_p_m1_status_bar_logo"
+        android:src="@drawable/charter_p_status_bar_logo"
         android:layout_width="@dimen/dp_116"
         android:layout_height="@dimen/dp_31"/>
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_video_fragment.xml
similarity index 93%
rename from OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_video_fragment.xml
index 9ae5b83786..f853f4a6b3 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_video_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_video_fragment.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/m1_function_bg"
+    android:background="@drawable/charter_p_function_bg"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_video_item.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_video_item.xml
similarity index 88%
rename from OCH/charter/passenger/src/main/res/layout/m1_video_item.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_video_item.xml
index 0025cf3d7a..ac7c5d2e43 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_video_item.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_video_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@drawable/bg_taxi_p_video_bg_shape"
+    android:background="@drawable/charter_p_video_bg_shape"
     android:layout_width="@dimen/dp_1300"
     android:layout_height="@dimen/dp_731">
 
diff --git a/OCH/charter/passenger/src/main/res/layout/m1_video_view.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_video_view.xml
similarity index 92%
rename from OCH/charter/passenger/src/main/res/layout/m1_video_view.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_video_view.xml
index 811e807de0..ec63d7a270 100644
--- a/OCH/charter/passenger/src/main/res/layout/m1_video_view.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_video_view.xml
@@ -30,7 +30,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:src="@drawable/taxi_p_mogo_video_play"
+        android:src="@drawable/charter_p_mogo_video_play"
         android:layout_width="@dimen/dp_180"
         android:layout_height="@dimen/dp_180"/>
 
@@ -38,7 +38,7 @@
         android:id="@+id/layout_top"
         android:layout_width="match_parent"
         android:layout_height="120dp"
-        android:background="@drawable/bg_taxi_p_video_bg_top"
+        android:background="@drawable/charter_p_video_bg_top"
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
@@ -58,7 +58,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/layout_bottom"
         android:layout_width="0dp"
-        android:background="@drawable/bg_taxi_p_video_bg"
+        android:background="@drawable/charter_p_bg_taxi_p_video_bg"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_height="@dimen/dp_119"
@@ -101,8 +101,8 @@
             android:maxHeight="@dimen/dp_7"
             android:minHeight="@dimen/dp_7"
             android:splitTrack="false"
-            android:progressDrawable="@drawable/taxi_video_seekbar_style"
-            android:thumb="@drawable/bg_taxi_p_video_index" />
+            android:progressDrawable="@drawable/charter_p_video_seekbar_style"
+            android:thumb="@drawable/charter_p_video_index" />
 
         <TextView
             android:id="@+id/total"
@@ -121,7 +121,7 @@
             android:layout_width="@dimen/dp_140"
             android:layout_height="match_parent"
             android:scaleType="centerInside"
-            android:src="@drawable/notice_video_pause_small" />
+            android:src="@drawable/charter_p_notice_video_pause_small" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <View
diff --git a/OCH/charter/passenger/src/main/res/layout/view_maker_sitename.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_view_maker_sitename.xml
similarity index 100%
rename from OCH/charter/passenger/src/main/res/layout/view_maker_sitename.xml
rename to OCH/charter/passenger/src/main/res/layout/charter_p_view_maker_sitename.xml
diff --git a/OCH/charter/passenger/src/main/res/values/arrays.xml b/OCH/charter/passenger/src/main/res/values/arrays.xml
index 75bc4c91eb..31a27f322a 100644
--- a/OCH/charter/passenger/src/main/res/values/arrays.xml
+++ b/OCH/charter/passenger/src/main/res/values/arrays.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="openlock">
-        <item>@drawable/open_lock_000</item>
-        <item>@drawable/open_lock_001</item>
-        <item>@drawable/open_lock_002</item>
-        <item>@drawable/open_lock_003</item>
-        <item>@drawable/open_lock_004</item>
-        <item>@drawable/open_lock_005</item>
-        <item>@drawable/open_lock_006</item>
-        <item>@drawable/open_lock_007</item>
-        <item>@drawable/open_lock_008</item>
-        <item>@drawable/open_lock_009</item>
+    <string-array name="charter_p_openlock">
+        <item>@drawable/charter_p_open_lock_000</item>
+        <item>@drawable/charter_p_open_lock_001</item>
+        <item>@drawable/charter_p_open_lock_002</item>
+        <item>@drawable/charter_p_open_lock_003</item>
+        <item>@drawable/charter_p_open_lock_004</item>
+        <item>@drawable/charter_p_open_lock_005</item>
+        <item>@drawable/charter_p_open_lock_006</item>
+        <item>@drawable/charter_p_open_lock_007</item>
+        <item>@drawable/charter_p_open_lock_008</item>
+        <item>@drawable/charter_p_open_lock_009</item>
 
-        <item>@drawable/open_lock_010</item>
-        <item>@drawable/open_lock_011</item>
-        <item>@drawable/open_lock_012</item>
-        <item>@drawable/open_lock_013</item>
-        <item>@drawable/open_lock_014</item>
-        <item>@drawable/open_lock_015</item>
-        <item>@drawable/open_lock_016</item>
-        <item>@drawable/open_lock_017</item>
-        <item>@drawable/open_lock_018</item>
-        <item>@drawable/open_lock_019</item>
+        <item>@drawable/charter_p_open_lock_010</item>
+        <item>@drawable/charter_p_open_lock_011</item>
+        <item>@drawable/charter_p_open_lock_012</item>
+        <item>@drawable/charter_p_open_lock_013</item>
+        <item>@drawable/charter_p_open_lock_014</item>
+        <item>@drawable/charter_p_open_lock_015</item>
+        <item>@drawable/charter_p_open_lock_016</item>
+        <item>@drawable/charter_p_open_lock_017</item>
+        <item>@drawable/charter_p_open_lock_018</item>
+        <item>@drawable/charter_p_open_lock_019</item>
 
-        <item>@drawable/open_lock_020</item>
-        <item>@drawable/open_lock_021</item>
-        <item>@drawable/open_lock_022</item>
-        <item>@drawable/open_lock_023</item>
+        <item>@drawable/charter_p_open_lock_020</item>
+        <item>@drawable/charter_p_open_lock_021</item>
+        <item>@drawable/charter_p_open_lock_022</item>
+        <item>@drawable/charter_p_open_lock_023</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/values/attrs.xml b/OCH/charter/passenger/src/main/res/values/attrs.xml
index 2b68f358f0..13afa3244e 100644
--- a/OCH/charter/passenger/src/main/res/values/attrs.xml
+++ b/OCH/charter/passenger/src/main/res/values/attrs.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="MainWindStatus">
-        <attr name="main_wind_drawable" format="reference" />
+    <declare-styleable name="CharterPMainWindStatus">
+        <attr name="charter_p_main_wind_drawable" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="BottomSelectView">
+    <declare-styleable name="CharterPBottomSelectView">
         <!-- 默认图片 -->
-        <attr name="normalDrawable" format="reference" />
+        <attr name="charterPnormalDrawable" format="reference" />
         <!-- 点击图片 -->
-        <attr name="selectedDrawable" format="reference" />
+        <attr name="charterPselectedDrawable" format="reference" />
         <!-- 显示背景view -->
-        <attr name="backageViewId" format="reference" />
-        <attr name="bottomTitle" format="string"/>
+        <attr name="charterPBackageViewId" format="reference" />
+        <attr name="charterPBottomTitle" format="string"/>
 
-        <attr name="bottomClick" format="boolean"/>
+        <attr name="charterPBottomClick" format="boolean"/>
     </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/values/color.xml b/OCH/charter/passenger/src/main/res/values/color.xml
index cbf9937b31..b53b633f6c 100644
--- a/OCH/charter/passenger/src/main/res/values/color.xml
+++ b/OCH/charter/passenger/src/main/res/values/color.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="module_main_window_background_color">#212831</color>
 
-    <color name="bus_p_m1_203555">#203555</color>
-    <color name="bus_p_m1_47576e">#47576E</color>
-    <color name="bus_p_m1_6647576e">#6647576E</color>
-    <color name="bus_p_m1_374968">#374968</color>
-    <color name="bus_p_m1_2cbffc">#2CBFFC</color>
-    <color name="bus_p_m1_1060ff">#1060FF</color>
-    <color name="bus_p_m1_96a5c2">#96A5C2</color>
-    <color name="bus_p_m1_f5fbff">#F5FBFF</color>
-    <color name="bus_p_m1_112b57">#112B57</color>
-    <color name="bus_p_m1_1b2546">#1B2546</color>
-    <color name="bus_p_m1_a3bdf2">#A3BDF2</color>
-    <color name="bus_p_m1_56c59c">#56C59C</color>
-    <color name="bus_p_m1_56efa0">#56EFA0</color>
-    <color name="bus_p_m1_6edbdc">#6EDBDC</color>
-    <color name="bus_p_m1_4a5375">#4A5375</color>
-    <color name="bus_p_m1_0f1e57">#0F1E57</color>
-    <color name="bus_p_m1_225eff">#225EFF</color>
-    <color name="bus_p_m1_0050E1">#0050E1</color>
-    <color name="bus_p_m1_1466FB">#1466FB</color>
-    <color name="bus_p_m1_331466FB">#331466FB</color>
-    <color name="bus_p_m1_43CEFE">#43CEFE</color>
-    <color name="bus_p_m1_3b4056">#3B4056</color>
-    <color name="bus_p_m1_23293b">#23293B</color>
-    <color name="bus_p_m1_485173">#485173</color>
-    <color name="bus_p_m1_292c39">#292C39</color>
-    <color name="bus_p_m1_2C2D31">#2C2D31</color>
-    <color name="bus_p_m1_222222">#222222</color>
-    <color name="bus_p_m1_090f28">#090F28</color>
-    <color name="bus_p_m1_5F7096">#5F7096</color>
-    <color name="bus_p_m1_9aabd2">#9AABD2</color>
-    <color name="bus_p_m1_b8c2d7">#B8C2D7</color>
-    <color name="bus_p_m1_b8c2d8">#B8C2D8</color>
-    <color name="bus_p_m1_d7e5f5">#D7E5F5</color>
-    <color name="bus_p_m1_e0efff">#E0EFFF</color>
-    <color name="bus_p_m1_101c35">#101C35</color>
-    <color name="bus_p_m1_20418D">#20418D</color>
-    <color name="bus_p_m1_662C2D31">#662C2D31</color>
-    <color name="bus_p_m1_332C2D31">#332C2D31</color>
+    <color name="charter_p_203555">#203555</color>
+    <color name="charter_p_212831">#212831</color>
+    <color name="charter_p_374968">#374968</color>
+    <color name="charter_p_47576e">#47576E</color>
+    <color name="charter_p_6647576e">#6647576E</color>
+    <color name="charter_p_2cbffc">#2CBFFC</color>
+    <color name="charter_p_1060ff">#1060FF</color>
+    <color name="charter_p_96a5c2">#96A5C2</color>
+    <color name="charter_p_f5fbff">#F5FBFF</color>
+    <color name="charter_p_112b57">#112B57</color>
+    <color name="charter_p_1b2546">#1B2546</color>
+    <color name="charter_p_a3bdf2">#A3BDF2</color>
+    <color name="charter_p_56c59c">#56C59C</color>
+    <color name="charter_p_56efa0">#56EFA0</color>
+    <color name="charter_p_6edbdc">#6EDBDC</color>
+    <color name="charter_p_4a5375">#4A5375</color>
+    <color name="charter_p_0f1e57">#0F1E57</color>
+    <color name="charter_p_225eff">#225EFF</color>
+    <color name="charter_p_0050E1">#0050E1</color>
+    <color name="charter_p_1466FB">#1466FB</color>
+    <color name="charter_p_331466FB">#331466FB</color>
+    <color name="charter_p_43CEFE">#43CEFE</color>
+    <color name="charter_p_3b4056">#3B4056</color>
+    <color name="charter_p_23293b">#23293B</color>
+    <color name="charter_p_485173">#485173</color>
+    <color name="charter_p_292c39">#292C39</color>
+    <color name="charter_p_2C2D31">#2C2D31</color>
+    <color name="charter_p_222222">#222222</color>
+    <color name="charter_p_090f28">#090F28</color>
+    <color name="charter_p_5F7096">#5F7096</color>
+    <color name="charter_p_9aabd2">#9AABD2</color>
+    <color name="charter_p_b8c2d7">#B8C2D7</color>
+    <color name="charter_p_b8c2d8">#B8C2D8</color>
+    <color name="charter_p_d7e5f5">#D7E5F5</color>
+    <color name="charter_p_e0efff">#E0EFFF</color>
+    <color name="charter_p_101c35">#101C35</color>
+    <color name="charter_p_20418D">#20418D</color>
+    <color name="charter_p_662C2D31">#662C2D31</color>
+    <color name="charter_p_332C2D31">#332C2D31</color>
 
-    <color name="bus_p_m1_80000000">#80000000</color>
-    <color name="bus_p_m1_80288dfc">#80288DFC</color>
-    <color name="bus_p_m1_3060ABFE">#3060ABFE</color>
-    <color name="bus_p_m1_0060ABFE">#0060ABFE</color>
-    <color name="bus_p_m1_00EFF6FF">#00EFF6FF</color>
-    <color name="bus_p_m1_B3EFF6FF">#B3EFF6FF</color>
-    <color name="bus_p_m1_91EFF6FF">#91EFF6FF</color>
-    <color name="bus_p_m1_CCFFFFFF">#CCFFFFFF</color>
-    <color name="bus_p_m1_80ffffff">#80FFFFFF</color>
-    <color name="bus_p_m1_40ffffff">#40FFFFFF</color>
-    <color name="bus_p_m1_f0e0efff">#F0E0EFFF </color>
-    <color name="bus_p_m1_66000000">#66000000</color>
+    <color name="charter_p_80000000">#80000000</color>
+    <color name="charter_p_80288dfc">#80288DFC</color>
+    <color name="charter_p_3060ABFE">#3060ABFE</color>
+    <color name="charter_p_0060ABFE">#0060ABFE</color>
+    <color name="charter_p_00EFF6FF">#00EFF6FF</color>
+    <color name="charter_p_B3EFF6FF">#B3EFF6FF</color>
+    <color name="charter_p_91EFF6FF">#91EFF6FF</color>
+    <color name="charter_p_CCFFFFFF">#CCFFFFFF</color>
+    <color name="charter_p_80ffffff">#80FFFFFF</color>
+    <color name="charter_p_40ffffff">#40FFFFFF</color>
+    <color name="charter_p_f0e0efff">#F0E0EFFF </color>
+    <color name="charter_p_66000000">#66000000</color>
 </resources>
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/values/strings.xml b/OCH/charter/passenger/src/main/res/values/strings.xml
index e2c3f5116a..45ef99f32e 100644
--- a/OCH/charter/passenger/src/main/res/values/strings.xml
+++ b/OCH/charter/passenger/src/main/res/values/strings.xml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bus_p_m1_refrigeration">制冷</string>
-    <string name="bus_p_m1_heating">制热</string>
-    <string name="bus_p_m1_ventilate">通风</string>
-    <string name="bus_p_m1_automatic">自动</string>
+    <string name="charter_p_refrigeration">制冷</string>
+    <string name="charter_p_heating">制热</string>
+    <string name="charter_p_ventilate">通风</string>
+    <string name="charter_p_automatic">自动</string>
 
-    <string name="bus_p_m1_temperature">温度</string>
+    <string name="charter_p_temperature">温度</string>
 
-    <string name="bus_p_m1_wind_speed">风速</string>
-    <string name="bus_p_m1_wind_speed_low">低</string>
-    <string name="bus_p_m1_wind_speed_middle">中</string>
-    <string name="bus_p_m1_wind_speed_high">高</string>
+    <string name="charter_p_wind_speed">风速</string>
+    <string name="charter_p_wind_speed_low">低</string>
+    <string name="charter_p_wind_speed_middle">中</string>
+    <string name="charter_p_wind_speed_high">高</string>
 
 
-    <string name="bus_p_m1_close_light1">关闭顶灯1</string>
-    <string name="bus_p_m1_close_light2">关闭顶灯2</string>
-    <string name="bus_p_m1_close_atmosphere">关闭氛围灯</string>
+    <string name="charter_p_close_light1">关闭顶灯1</string>
+    <string name="charter_p__close_light2">关闭顶灯2</string>
+    <string name="charter_p_close_atmosphere">关闭氛围灯</string>
 
-    <string name="bus_p_m1_open_light1">开启顶灯1</string>
-    <string name="bus_p_m1_open_light2">开启顶灯2</string>
-    <string name="bus_p_m1_open_atmosphere">开启氛围灯</string>
+    <string name="charter_p_open_light1">开启顶灯1</string>
+    <string name="charter_p_open_light2">开启顶灯2</string>
+    <string name="charter_p_open_atmosphere">开启氛围灯</string>
 
-    <string name="bus_p_m1_speed_unit">KM/h</string>
+    <string name="charter_p_speed_unit">KM/h</string>
 
-    <string name="m1_stop_site_zh">正在为您靠边停车，扶稳坐好哟</string>
-    <string name="m1_stop_site_success">靠边停车成功</string>
+    <string name="charter_p_stop_site_zh">正在为您靠边停车，扶稳坐好哟</string>
+    <string name="charter_p_stop_site_success">靠边停车成功</string>
 
-    <string name="m1_please_login_driver">请安全员登录司机屏</string>
-    <string name="m1_end_order_5min">包车将在5分钟后结束，结束后我们将自动为您寻找停车点</string>
+    <string name="charter_p_please_login_driver">请安全员登录司机屏</string>
+    <string name="charter_p_end_order_5min">包车将在5分钟后结束，结束后我们将自动为您寻找停车点</string>
 
 
-    <string name="m1_distance_unit_km">距离（KM）</string>
-    <string name="m1_distance_unit_m">距离（M）</string>
-    <string name="m1_arrive_left_time">剩余（分）</string>
-    <string name="m1_reach_time">到达</string>
+    <string name="charter_p_distance_unit_km">距离（KM）</string>
+    <string name="charter_p_distance_unit_m">距离（M）</string>
+    <string name="charter_p_arrive_left_time">剩余（分）</string>
+    <string name="charter_p_reach_time">到达</string>
 
-    <string name="m1_bottom_reach_time">--:--</string>
+    <string name="charter_p_bottom_reach_time">--:--</string>
 
-    <string name="m1_stop_site">靠边停车</string>
-    <string name="m1_welcome_tts">欢迎乘坐\'蘑菇车联\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！</string>
+    <string name="charter_p_stop_site">靠边停车</string>
+    <string name="charter_p_welcome_tts">欢迎乘坐\'蘑菇车联\'自动驾驶小巴车，按照桌面屏幕的指引，开始探索吧！</string>
 
-    <string name="m1_novice_guidance_tts">接下来由蘑菇小助手为您\'指引方向\'！</string>
-    <string name="m1_novice_guidance_door_tts">关闭车门后，点击‘出发’按钮启动</string>
-    <string name="m1_novice_guidance_stop_site_tts">点击‘停车’按钮后进行靠边停车，车辆停稳后就可以下车游玩啦！</string>
-    <string name="m1_novice_guidance_notice_tts">最后,蘑菇小助手为您送上乘车小贴士～</string>
-    <string name="m1_novice_guidance_complier_tts">太棒了！您已完成乘车指南，更多功能欢迎探索，蘑菇小助手预祝您旅途愉快</string>
+    <string name="charter_p_novice_guidance_tts">接下来由蘑菇小助手为您\'指引方向\'！</string>
+    <string name="charter_p_novice_guidance_door_tts">关闭车门后，点击‘出发’按钮启动</string>
+    <string name="charter_p_novice_guidance_stop_site_tts">点击‘停车’按钮后进行靠边停车，车辆停稳后就可以下车游玩啦！</string>
+    <string name="charter_p_novice_guidance_notice_tts">最后,蘑菇小助手为您送上乘车小贴士～</string>
+    <string name="charter_p_novice_guidance_complier_tts">太棒了！您已完成乘车指南，更多功能欢迎探索，蘑菇小助手预祝您旅途愉快</string>
 
-    <string name="m1_close_door_and_startauto">先关闭车门再启动吧～</string>
-    <string name="m1_start_auto_fail">自驾系统繁忙，稍后再试试吧～</string>
-    <string name="arrived_station_left_100">%1$s就要到啦！</string>
-    <string name="m1_net_error">稍后再来看看吧</string>
+    <string name="charter_p_close_door_and_startauto">先关闭车门再启动吧～</string>
+    <string name="charter_p_start_auto_fail">自驾系统繁忙，稍后再试试吧～</string>
+    <string name="charter_p_arrived_station_left_100">%1$s就要到啦！</string>
+    <string name="charter_p_net_error">稍后再来看看吧</string>
 <!--    <string name="m1_novice_guidance_tts">正在为您靠边停车，扶稳坐好哟</string>-->
 <!--    <string name="m1_novice_guidance_tts">靠边停车成功</string>-->
 <!--    <string name="m1_novice_guidance_tts">车辆系统繁忙，请稍后再试</string>-->
diff --git a/OCH/charter/passenger/src/main/res/values/styles.xml b/OCH/charter/passenger/src/main/res/values/styles.xml
index 0951fd761f..4cd331aa3b 100644
--- a/OCH/charter/passenger/src/main/res/values/styles.xml
+++ b/OCH/charter/passenger/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="DialogFullScreen" parent="Theme.AppCompat.Dialog">
+    <style name="CharterPDialogFullScreen" parent="Theme.AppCompat.Dialog">
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowOverscan">true</item>
@@ -20,8 +20,8 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-    <style name="och_window_anim_alpha">
-        <item name="android:windowEnterAnimation">@anim/alpha_hide_show</item>
+    <style name="charter_p_window_anim_alpha">
+        <item name="android:windowEnterAnimation">@anim/charter_p_alpha_hide_show</item>
     </style>
 
 
diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index d38b314f89..15da63986b 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -65,6 +65,10 @@
       "driver": ["ochJL"],
       "driverPassenger": ["ochJL"],
       "passenger": ["ochJL"]
+    },
+    "charter" :{
+      "driver": ["ochM1"],
+      "passenger": ["ochM1"]
     }
   }
 }