From 708a3522de483d5413f874bce68bc93a1bade84a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 30 May 2025 11:49:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[8.1.0]=20[fea]=20[=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/shuttle/passenger_weaknet/build.gradle | 8 ++++---- .../presenter/BaseBusPassengerPresenter.kt | 0 .../passenger/ui/BusPassengerBaseFragment.java | 0 .../passenger/ui/BusPassengerRouteFragment.java | 0 .../ui/adapter/BusPassengerLineStationsAdapter.java | 0 .../ui/layoutmanager/CenterLayoutManager.java | 0 .../passenger/ui/widget/BusPBlueToothView.kt | 0 .../passenger/ui/widget/BusPStatusBarView.kt | 0 .../passenger/ui/widget/BusPTurnLightView.kt | 0 .../ui/widget/BusPassengerTrafficLightView.kt | 0 .../shuttle/weaknet/passenger/constant/M2Const.kt | 0 .../weaknet/passenger/presenter/PM2ADASPresenter.kt | 0 .../passenger/presenter/PM2DrivingPresenter.kt | 0 .../weaknet/passenger/presenter/PM2Presenter.kt | 0 .../shuttle/weaknet/passenger/ui/PM2BaseFragment.kt | 0 .../weaknet/passenger/ui/PM2DrivingInfoFragment.kt | 0 .../weaknet/passenger/ui/PM2HPMapFragment.kt | 0 .../weaknet/passenger/ui/widget/M2BlueToothView.kt | 0 .../passenger/ui/widget/M2PTrafficLightView.kt | 0 .../weaknet/passenger/ui/widget/M2StatusBarView.kt | 0 .../weaknet/passenger/ui/widget/M2TurnLightView.kt | 0 .../shuttle_p_jl_arrive_line_blue.png | Bin .../shuttle_p_jl_arrive_line_green.png | Bin .../drawable-nodpi/shuttle_p_jl_auto_close.png | Bin .../drawable-nodpi/shuttle_p_jl_auto_open.png | Bin .../shuttle_p_jl_bg_arrived_station.png | Bin .../drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png | Bin .../drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png | Bin .../shuttle_p_jl_blue_tooth_close.png | Bin .../drawable-nodpi/shuttle_p_jl_blue_tooth_open.png | Bin .../drawable-nodpi/shuttle_p_jl_bus_line_logo.png | Bin .../shuttle_p_jl_cur_station_arrived_bg.png | Bin .../shuttle_p_jl_cur_station_un_arrived_bg.png | Bin .../drawable-nodpi/shuttle_p_jl_light_green_nor.png | Bin .../drawable-nodpi/shuttle_p_jl_light_red_nor.png | Bin .../shuttle_p_jl_light_yellow_nor.png | Bin .../drawable-nodpi/shuttle_p_jl_line_blue.png | Bin .../drawable-nodpi/shuttle_p_jl_line_green.png | Bin .../shuttle_p_jl_map_arrived_point.png | Bin .../shuttle_p_jl_map_arrow_arrived.png | Bin .../shuttle_p_jl_map_arrow_un_arrive.png | Bin .../drawable-nodpi/shuttle_p_jl_map_car.png | Bin .../drawable-nodpi/shuttle_p_jl_map_end_point.png | Bin .../drawable-nodpi/shuttle_p_jl_map_start_point.png | Bin .../shuttle_p_jl_map_unarrived_point.png | Bin .../drawable-nodpi/shuttle_p_jl_no_order_data.png | Bin .../drawable-nodpi/shuttle_p_jl_point_blue.png | Bin .../drawable-nodpi/shuttle_p_jl_point_gray.png | Bin .../drawable-nodpi/shuttle_p_jl_right_route_bg.png | Bin .../drawable-nodpi/shuttle_p_jl_route_bg.png | Bin .../shuttle_p_jl_speak_arrived_icon_0.png | Bin .../shuttle_p_jl_speak_arrived_icon_1.png | Bin .../shuttle_p_jl_speak_arrived_icon_2.png | Bin .../drawable-nodpi/shuttle_p_jl_split_line_bg.png | Bin .../drawable-nodpi/shuttle_p_jl_status_bar_logo.png | Bin .../drawable-nodpi/shuttle_p_jl_youzhuan_open.png | Bin .../shuttle_p_jl_youzhuan_un_open.png | Bin .../drawable-nodpi/shuttle_p_jl_zuozhuan_open.png | Bin .../shuttle_p_jl_zuozhuan_un_open.png | Bin .../drawable/shuttle_p_jl_bg_end_station_circle.xml | 0 .../shuttle_p_jl_bg_middle_station_circle.xml | 0 .../drawable/shuttle_p_jl_bg_progress_bar.xml | 0 .../drawable/shuttle_p_jl_bg_speak_icon_arrived.xml | 0 .../shuttle_p_jl_bg_start_station_circle.xml | 0 .../drawable/shuttle_p_jl_bg_status_bar.xml | 0 .../shuttle_p_jl_bg_traffic_light_background.xml | 0 .../shuttle_p_jl_brakelight_background_daytime.xml | 0 .../drawable/shuttle_p_jl_dividing_line_bg.xml | 0 .../shuttle_p_jl_panel_cur_station_panel.xml | 0 .../drawable/shuttle_p_jl_progress_item_round.xml | 0 .../layout/shuttle_p_weak_jl_base_fragment.xml | 0 .../layout/shuttle_p_weak_jl_map_view.xml | 0 .../shuttle_p_weak_jl_no_data_common_view.xml | 0 .../layout/shuttle_p_weak_jl_route_fragment.xml | 0 .../shuttle_p_weak_jl_stations_common_item.xml | 0 .../layout/shuttle_p_weak_jl_traffic_light_view.xml | 0 .../layout/shuttle_p_weak_jl_turn_light_status.xml | 0 .../layout/shuttle_p_weak_jl_view_blue_tooth.xml | 0 .../layout/shuttle_p_weak_jl_view_status_bar.xml | 0 .../src/main/res/{jinlv => b1}/values/colors.xml | 0 .../src/main/res/{jinlv => b1}/values/dimens.xml | 0 .../src/main/res/{jinlv => b1}/values/strings.xml | 0 .../shuttle_p_m2_amap_arrived_road.png | Bin .../shuttle_p_m2_amap_arriving_road.png | Bin .../shuttle_p_m2_amap_custom_corner.png | Bin .../drawable-nodpi/shuttle_p_m2_arrived_an_0.png | Bin .../drawable-nodpi/shuttle_p_m2_arrived_an_1.png | Bin .../drawable-nodpi/shuttle_p_m2_arrived_an_2.png | Bin .../drawable-nodpi/shuttle_p_m2_auto_button_bg.png | Bin .../shuttle_p_m2_bg_driving_info_image.png | Bin .../shuttle_p_m2_blue_tooth_close.png | Bin .../drawable-nodpi/shuttle_p_m2_blue_tooth_open.png | Bin .../drawable-nodpi/shuttle_p_m2_bottom_bg.png | Bin .../drawable-nodpi/shuttle_p_m2_card_split.png | Bin .../drawable-nodpi/shuttle_p_m2_clock_bg.png | Bin .../drawable-nodpi/shuttle_p_m2_electricity.png | Bin .../drawable-nodpi/shuttle_p_m2_img_drive_bg.png | Bin .../drawable-nodpi/shuttle_p_m2_img_line_bg.png | Bin .../drawable-nodpi/shuttle_p_m2_img_time_bg.png | Bin .../drawable-nodpi/shuttle_p_m2_light_green_nor.png | Bin .../drawable-nodpi/shuttle_p_m2_light_red_nor.png | Bin .../shuttle_p_m2_light_yellow_nor.png | Bin .../drawable-nodpi/shuttle_p_m2_lightyellow_nor.png | Bin .../drawable-nodpi/shuttle_p_m2_line_name.png | Bin .../drawable-nodpi/shuttle_p_m2_line_noselect.png | Bin .../drawable-nodpi/shuttle_p_m2_line_tile.png | Bin .../drawable-nodpi/shuttle_p_m2_map_car_icon.png | Bin .../drawable-nodpi/shuttle_p_m2_map_end_icon.png | Bin .../drawable-nodpi/shuttle_p_m2_map_start_icon.png | Bin .../shuttle_p_m2_map_staton_arrived_icon.png | Bin .../drawable-nodpi/shuttle_p_m2_map_staton_icon.png | Bin .../drawable-nodpi/shuttle_p_m2_p_video_holder.png | Bin .../drawable-nodpi/shuttle_p_m2_sky_bg.png | Bin .../drawable-nodpi/shuttle_p_m2_status_bar_logo.png | Bin .../shuttle_p_m2_video_bottom_left.png | Bin .../shuttle_p_m2_video_bottom_right.png | Bin .../drawable-nodpi/shuttle_p_m2_video_top_left.png | Bin .../drawable-nodpi/shuttle_p_m2_video_top_right.png | Bin .../drawable-nodpi/shuttle_p_m2_youzhuan_open.png | Bin .../shuttle_p_m2_youzhuan_un_open.png | Bin .../drawable-nodpi/shuttle_p_m2_zuozhuan_open.png | Bin .../shuttle_p_m2_zuozhuan_un_open.png | Bin .../drawable/shuttle_p_m2_bg_dashed_line.xml | 0 .../shuttle_p_m2_bg_driving_arrived_notice.xml | 0 .../shuttle_p_m2_bg_driving_distance_lefttime.xml | 0 .../drawable/shuttle_p_m2_bg_driving_info.xml | 0 .../drawable/shuttle_p_m2_bg_driving_selector.xml | 0 .../shuttle_p_m2_bg_p_m2_arrived_station.xml | 0 .../drawable/shuttle_p_m2_bg_p_m2_auto.xml | 0 .../drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml | 0 .../res/{m2 => b2}/drawable/shuttle_p_m2_bg_pnc.xml | 0 .../shuttle_p_m2_brakelight_background_daytime.xml | 0 .../drawable/shuttle_p_m2_power_seekbar_style.xml | 0 .../layout/shuttle_p_m2_driving_info_fragment.xml | 0 .../res/{m2 => b2}/layout/shuttle_p_m2_fragment.xml | 0 .../layout/shuttle_p_m2_hpmap_fragment.xml | 0 .../layout/shuttle_p_m2_traffic_light_view.xml | 0 .../layout/shuttle_p_m2_turn_light_status.xml | 0 .../layout/shuttle_p_m2_video_fragment.xml | 0 .../{m2 => b2}/layout/shuttle_p_m2_video_view.xml | 0 .../layout/shuttle_p_m2_view_blue_tooth.xml | 0 .../layout/shuttle_p_m2_view_status_bar.xml | 0 .../src/main/res/{m2 => b2}/raw/star_marker.nt3d | Bin .../src/main/res/{m2 => b2}/raw/station_marker.nt3d | Bin .../src/main/res/{m2 => b2}/values/colors.xml | 0 .../src/main/res/{m2 => b2}/values/dimens.xml | 0 .../src/main/res/{m2 => b2}/values/ids.xml | 0 .../src/main/res/{m2 => b2}/values/strings.xml | 0 148 files changed, 4 insertions(+), 4 deletions(-) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{jinlv => b1}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/java/{m2 => b2}/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_arrive_line_green.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_auto_close.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_auto_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_bus_line_logo.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_light_green_nor.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_light_red_nor.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_line_blue.png (100%) mode change 100755 => 100644 rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_line_green.png (100%) mode change 100755 => 100644 rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_map_arrived_point.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_map_car.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_map_end_point.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_map_start_point.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_no_order_data.png (100%) mode change 100755 => 100644 rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_point_blue.png (100%) mode change 100755 => 100644 rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_point_gray.png (100%) mode change 100755 => 100644 rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_right_route_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_route_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_split_line_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_status_bar_logo.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_youzhuan_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_bg_end_station_circle.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_bg_middle_station_circle.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_bg_progress_bar.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_bg_start_station_circle.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_bg_status_bar.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_bg_traffic_light_background.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_brakelight_background_daytime.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_dividing_line_bg.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_panel_cur_station_panel.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/drawable/shuttle_p_jl_progress_item_round.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_base_fragment.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_map_view.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_no_data_common_view.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_route_fragment.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_stations_common_item.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_traffic_light_view.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_turn_light_status.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_view_blue_tooth.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/layout/shuttle_p_weak_jl_view_status_bar.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/values/colors.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/values/dimens.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{jinlv => b1}/values/strings.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_arrived_an_0.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_arrived_an_1.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_arrived_an_2.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_auto_button_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_bottom_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_card_split.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_clock_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_electricity.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_img_drive_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_img_line_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_img_time_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_light_green_nor.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_light_red_nor.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_line_name.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_line_noselect.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_line_tile.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_map_car_icon.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_map_end_icon.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_map_start_icon.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_map_staton_icon.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_p_video_holder.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_sky_bg.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_status_bar_logo.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_video_bottom_left.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_video_bottom_right.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_video_top_left.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_video_top_right.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_youzhuan_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_dashed_line.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_driving_info.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_driving_selector.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_p_m2_auto.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_bg_pnc.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_brakelight_background_daytime.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/drawable/shuttle_p_m2_power_seekbar_style.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_driving_info_fragment.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_fragment.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_hpmap_fragment.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_traffic_light_view.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_turn_light_status.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_video_fragment.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_video_view.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_view_blue_tooth.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/layout/shuttle_p_m2_view_status_bar.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/raw/star_marker.nt3d (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/raw/station_marker.nt3d (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/values/colors.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/values/dimens.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/values/ids.xml (100%) rename OCH/shuttle/passenger_weaknet/src/main/res/{m2 => b2}/values/strings.xml (100%) diff --git a/OCH/shuttle/passenger_weaknet/build.gradle b/OCH/shuttle/passenger_weaknet/build.gradle index 6de3388d2b..7883d04966 100644 --- a/OCH/shuttle/passenger_weaknet/build.gradle +++ b/OCH/shuttle/passenger_weaknet/build.gradle @@ -48,13 +48,13 @@ android { main { res.srcDirs = [ 'src/main/res', - 'src/main/res/m2', - 'src/main/res/jinlv', + 'src/main/res/b2', + 'src/main/res/b1', ] java.srcDirs = [ 'src/main/java', - 'src/main/java/m2', - 'src/main/java/jinlv', + 'src/main/java/b2', + 'src/main/java/b1', ] } } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_green.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_green.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_close.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_close.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bus_line_logo.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bus_line_logo.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_green_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_green_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_red_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_red_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_blue.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_blue.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_green.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_green.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrived_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrived_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_car.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_car.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_end_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_end_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_start_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_start_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_no_order_data.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_no_order_data.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_blue.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_blue.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_gray.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_gray.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_right_route_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_right_route_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_route_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_route_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_split_line_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_split_line_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_status_bar_logo.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_status_bar_logo.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_end_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_end_station_circle.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_middle_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_middle_station_circle.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_progress_bar.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_progress_bar.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_start_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_start_station_circle.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_status_bar.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_status_bar.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_traffic_light_background.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_traffic_light_background.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_brakelight_background_daytime.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_brakelight_background_daytime.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_dividing_line_bg.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_dividing_line_bg.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_panel_cur_station_panel.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_panel_cur_station_panel.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_progress_item_round.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_progress_item_round.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_base_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_base_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_map_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_map_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_map_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_map_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_no_data_common_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_no_data_common_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_no_data_common_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_no_data_common_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_stations_common_item.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_stations_common_item.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_stations_common_item.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_stations_common_item.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_traffic_light_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_traffic_light_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_traffic_light_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_traffic_light_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_turn_light_status.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_turn_light_status.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_turn_light_status.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_turn_light_status.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_blue_tooth.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_blue_tooth.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_blue_tooth.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_blue_tooth.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_status_bar.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/colors.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/colors.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/dimens.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/dimens.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/dimens.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/values/dimens.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/strings.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/strings.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/strings.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/values/strings.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bottom_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bottom_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bottom_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bottom_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_card_split.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_card_split.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_card_split.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_card_split.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_clock_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_clock_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_clock_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_clock_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_electricity.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_electricity.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_electricity.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_electricity.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_line_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_line_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_line_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_line_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_time_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_time_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_time_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_time_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_green_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_green_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_green_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_green_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_red_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_red_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_red_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_red_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_name.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_name.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_name.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_name.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_noselect.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_noselect.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_noselect.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_noselect.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_tile.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_tile.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_tile.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_tile.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_car_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_car_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_car_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_car_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_end_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_end_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_end_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_end_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_start_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_start_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_start_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_start_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_p_video_holder.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_p_video_holder.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_p_video_holder.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_p_video_holder.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_sky_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_sky_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_sky_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_sky_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_left.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_left.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_left.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_left.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_right.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_right.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_right.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_right.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_dashed_line.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_dashed_line.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_dashed_line.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_dashed_line.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_info.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_info.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_info.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_info.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_selector.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_selector.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_selector.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_selector.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_auto.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_auto.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_auto.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_auto.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_pnc.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_pnc.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_pnc.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_pnc.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_brakelight_background_daytime.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_brakelight_background_daytime.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_brakelight_background_daytime.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_brakelight_background_daytime.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_power_seekbar_style.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_power_seekbar_style.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_power_seekbar_style.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_power_seekbar_style.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_driving_info_fragment.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_driving_info_fragment.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_fragment.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_fragment.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_traffic_light_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_traffic_light_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_traffic_light_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_traffic_light_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_turn_light_status.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_turn_light_status.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_video_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_video_fragment.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_video_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_video_fragment.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_video_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_video_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_video_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_video_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_blue_tooth.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_blue_tooth.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_view_status_bar.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/star_marker.nt3d b/OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/star_marker.nt3d similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/star_marker.nt3d rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/star_marker.nt3d diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/station_marker.nt3d b/OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/station_marker.nt3d similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/station_marker.nt3d rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/station_marker.nt3d diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/colors.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/colors.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/colors.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/colors.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/dimens.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/dimens.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/dimens.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/dimens.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/ids.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/ids.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/ids.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/ids.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/strings.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/strings.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml From b088c48ff15e90a8964b0200297593c1cf1c1f20 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 3 Jun 2025 11:03:48 +0800 Subject: [PATCH 2/2] [8.1.0] [fea] [status bar] --- .../passenger/ui/widget/M2StatusBarView.kt | 34 +--- .../res/b2/drawable-nodpi/m2_p_battery.png | Bin 0 -> 828 bytes .../shuttle_p_m2_status_bar_logo.png | Bin 3327 -> 3514 bytes .../layout/shuttle_p_m2_view_status_bar.xml | 155 ++++++++++-------- .../src/main/res/b2/values/strings.xml | 2 + .../function/hmi/ui/widget/WifiStateView.kt | 7 + .../src/main/res/values/attr.xml | 1 + 7 files changed, 101 insertions(+), 98 deletions(-) create mode 100644 OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt index f46d22882d..f723e2b065 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt @@ -2,15 +2,12 @@ package com.mogo.och.shuttle.weaknet.passenger.ui.widget import android.annotation.* import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import chassis.ChassisStatesOuterClass import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisStatesListener -import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener -import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisStatesListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager @@ -20,10 +17,9 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.manager.bluetooth.BleManager import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.shuttle.weaknet.passenger.R -import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.aciv_wait_ele import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.iv_logon -import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.progress import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_power_cos import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -34,7 +30,7 @@ import me.jessyan.autosize.utils.AutoSizeUtils */ class M2StatusBarView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : ConstraintLayout(context, attrs), IViewControlListener, IMoGoSkinModeChangeListener, +) : ConstraintLayout(context, attrs), IMoGoChassisStatesListener { companion object { @@ -46,7 +42,7 @@ class M2StatusBarView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_view_status_bar, this, true) - setBackgroundColor(Color.parseColor("#80FFFFFF")) + setBackgroundColor(ResourcesUtils.getColor(R.color.white)) isClickable = true isFocusable = true } @@ -55,24 +51,18 @@ class M2StatusBarView @JvmOverloads constructor( @SuppressLint("ClickableViewAccessibility") override fun onAttachedToWindow() { super.onAttachedToWindow() + post { val params: ViewGroup.LayoutParams = getLayoutParams() - params.height = AutoSizeUtils.dp2px(context,60f) + params.height = AutoSizeUtils.dp2px(context,100f) layoutParams = params } - //添加view控制 - CallerHmiViewControlListenerManager.addListener(TAG,this) - // 添加换肤监听 - CallerSkinModeListenerManager.addListener(TAG, this) + //电量 CallerChassisStatesListenerManager.addListener(TAG,this) - progress?.also { - it.progress = 0 - aciv_wait_ele.visibility = VISIBLE - } tv_power_cos?.also { - it.text = "检测中" + it.text = "?" } iv_logon.onClick { BizLoopManager.runInMainThread{ @@ -86,13 +76,6 @@ class M2StatusBarView @JvmOverloads constructor( } } - override fun onSkinModeChange(skinMode: Int) { - when (skinMode) { - 0 -> setStatusBarDarkOrLight(false) - 1 -> setStatusBarDarkOrLight(true) - } - } - override fun onDetachedFromWindow() { super.onDetachedFromWindow() CallerHmiViewControlListenerManager.removeListener(TAG) @@ -112,14 +95,11 @@ class M2StatusBarView @JvmOverloads constructor( if (oldBmsSoc != bmsSoc ) { scope.launch { if(bmsSoc >1){ - progress?.also { it.progress = bmsSoc.toInt() } tv_power_cos?.also { it.text = "${bmsSoc.toInt()}%" } }else{ val power = (bmsSoc * 100).toInt() - progress?.also { it.progress = power } tv_power_cos?.also {it.text = "$power%" } } - aciv_wait_ele.visibility = GONE } } } finally { diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png new file mode 100644 index 0000000000000000000000000000000000000000..023d42d64766ebda9c598e47c5d7f11bfafdef9e GIT binary patch literal 828 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 Y0mI~HS3fZm3jhEB07*qoM6N<$f + + + + + + + + + + - - - - - - + android:id="@+id/aciv_battery_bg" + app:layout_constraintTop_toTopOf="@+id/iv_logon" + app:layout_constraintBottom_toBottomOf="@+id/iv_logon" + app:layout_constraintEnd_toEndOf="parent" + android:src="@drawable/m2_p_battery" + android:layout_marginEnd="@dimen/dp_22" + android:layout_width="@dimen/dp_50" + android:layout_height="@dimen/dp_29"/> - - + android:layout_width="@dimen/dp_50" + android:layout_height="@dimen/dp_29" + android:textColor="@color/common_203555" + android:textSize="@dimen/dp_20" + android:paddingStart="@dimen/dp_5" + android:textStyle="bold" + android:paddingEnd="@dimen/dp_9" + app:layout_constraintTop_toTopOf="@+id/aciv_battery_bg" + app:layout_constraintBottom_toBottomOf="@+id/aciv_battery_bg" + app:layout_constraintStart_toStartOf="@+id/aciv_battery_bg" + app:layout_constraintEnd_toEndOf="@+id/aciv_battery_bg" + tools:text="20"/> diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml index d2faf78c18..61b950582c 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml @@ -11,4 +11,6 @@ —分钟 请按秩序下车 暂无路线 + + MOGO BUS \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt index 8ab18f4cf6..05d61db1b0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/WifiStateView.kt @@ -75,6 +75,7 @@ class WifiStateView @JvmOverloads constructor( } private val txtSize: Float + private val txtShow: Boolean init { LayoutInflater.from(context).inflate(R.layout.view_wifi_state, this, true) @@ -83,6 +84,7 @@ class WifiStateView @JvmOverloads constructor( R.styleable.WifiStateView_wifi_size, resources.getDimension(R.dimen.dp_30) ) + txtShow = a.getBoolean(R.styleable.WifiStateView_wifi_show_title,true) a.recycle() viewStatusBarTag.setTextSize(TypedValue.COMPLEX_UNIT_PX,AutoSizeUtils.dp2px(context,txtSize).toFloat()) wifiManager = @@ -91,6 +93,11 @@ class WifiStateView @JvmOverloads constructor( val wifiInfo = wifiManager!!.connectionInfo Log.d(TAG, "wifi-info : $wifiInfo, ssid->: ${wifiInfo.ssid}") wifiName = wifiInfo.ssid.replace("\"","") + if(txtShow){ + viewStatusBarTag.visibility = VISIBLE + }else{ + viewStatusBarTag.visibility = GONE + } } private val wifiStateReceiver: BroadcastReceiver = object : BroadcastReceiver() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index b27ed87536..a80b58aaa8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -91,6 +91,7 @@ +