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