From 1b676d34a3ec27bad21bb0fa019527f00537e926 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 6 Dec 2023 10:30:00 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=20[shuttle-jl]=20[=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/shuttle/passenger/build.gradle | 15 +++++++++++++ .../com/mogo/och/bus/passenger/IMogoOCH.java | 2 +- .../passenger/constant/BusPassengerConst.kt | 2 -- .../passenger/MogoOCHBusPassenger.java | 5 +++-- .../BusPassengerLineStationsAdapter.java | 2 +- .../BusPassengerOperationStatusResponse.java | 2 +- .../bean/BusPassengerQueryLineRequest.java | 2 +- .../bean/BusPassengerRoutesResponse.java | 2 +- .../bean/BusPassengerRoutesResult.java | 2 +- .../passenger/bean/BusPassengerStation.java | 2 +- .../IBusPassegerDriverStatusCallback.java | 2 +- .../IBusPassengerADASStatusCallback.java | 2 +- ...BusPassengerAutopilotPlanningCallback.java | 2 +- ...IBusPassengerControllerStatusCallback.java | 2 +- .../IBusPassengerMapViewCallback.java | 2 +- .../IBusPassengerRouteLineInfoCallback.java | 2 +- .../passenger/model/BusPassengerModel.java | 21 +++++++++--------- .../network/BusPassengerModelLoopManager.java | 4 ++-- .../network/BusPassengerServiceManager.kt | 12 +++++----- .../network/ShettlePassengerServiceApi.java | 8 +++---- .../presenter/BaseBusPassengerPresenter.java | 16 ++++++------- .../provider/B1StatusViewManager.java | 4 ++-- .../passenger/ui/BusPBlueToothView.kt | 4 ++-- .../passenger/ui/BusPStatusBarView.kt | 2 +- .../ui/BusPassengerBaseFragment.java | 2 +- .../ui/BusPassengerRouteFragment.java | 10 ++++----- .../ui/BusPassengerTrafficLightView.kt | 8 +++---- .../ui/IBusPassengerMapDirectionView.java | 2 +- .../ui/layoutmanager/CenterLayoutManager.java | 2 +- .../BusPassengerMapDirectionView.kt | 4 ++-- .../mapdirectionview/MapDirectionViewModel.kt | 6 ++--- .../passenger/ui/widget/BusPTurnLightView.kt | 2 +- .../shuttle_p_jl_arrive_line_blue.png | Bin .../shuttle_p_jl_arrive_line_green.png | Bin .../shuttle_p_jl_auto_close.png | Bin .../drawable-nodpi/shuttle_p_jl_auto_open.png | Bin .../shuttle_p_jl_bg_arrived_station.png | Bin .../shuttle_p_jl_bg_end_tag_bg.png | Bin .../shuttle_p_jl_bg_start_tag_bg.png | Bin .../shuttle_p_jl_blue_tooth_close.png | Bin .../shuttle_p_jl_blue_tooth_open.png | Bin .../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 .../shuttle_p_jl_light_green_nor.png | Bin .../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 .../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 .../shuttle_p_jl_map_end_point.png | Bin .../shuttle_p_jl_map_start_point.png | Bin .../shuttle_p_jl_map_unarrived_point.png | Bin .../shuttle_p_jl_no_order_data.png | Bin .../shuttle_p_jl_point_blue.png | Bin .../shuttle_p_jl_point_gray.png | Bin .../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 .../shuttle_p_jl_split_line_bg.png | Bin .../shuttle_p_jl_status_bar_logo.png | Bin .../shuttle_p_jl_youzhuan_open.png | Bin .../shuttle_p_jl_youzhuan_un_open.png | Bin .../shuttle_p_jl_zuozhuan_open.png | Bin .../shuttle_p_jl_zuozhuan_un_open.png | Bin .../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 .../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 ...uttle_p_jl_bg_traffic_light_background.xml | 0 ...tle_p_jl_brakelight_background_daytime.xml | 0 .../shuttle_p_jl_dividing_line_bg.xml | 0 .../shuttle_p_jl_panel_cur_station_panel.xml | 0 .../shuttle_p_jl_progress_item_round.xml | 0 .../layout/shuttle_p_jl_base_fragment.xml | 2 +- .../jinlv}/layout/shuttle_p_jl_map_view.xml | 0 .../shuttle_p_jl_no_data_common_view.xml | 0 .../layout/shuttle_p_jl_route_fragment.xml | 4 ++-- .../shuttle_p_jl_stations_common_item.xml | 0 .../shuttle_p_jl_traffic_light_view.xml | 0 .../layout/shuttle_p_jl_view_blue_tooth.xml | 0 .../layout/shuttle_p_jl_view_status_bar.xml | 2 +- .../layout/view_turn_light_status_daytime.xml | 0 .../res => main/res/jinlv}/values/colors.xml | 0 .../res => main/res/jinlv}/values/dimens.xml | 0 .../res => main/res/jinlv}/values/strings.xml | 0 93 files changed, 88 insertions(+), 75 deletions(-) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/MogoOCHBusPassenger.java (96%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/adapter/BusPassengerLineStationsAdapter.java (99%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/bean/BusPassengerOperationStatusResponse.java (91%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/bean/BusPassengerQueryLineRequest.java (84%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/bean/BusPassengerRoutesResponse.java (93%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/bean/BusPassengerRoutesResult.java (97%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/bean/BusPassengerStation.java (98%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/callback/IBusPassegerDriverStatusCallback.java (81%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/callback/IBusPassengerADASStatusCallback.java (90%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/callback/IBusPassengerAutopilotPlanningCallback.java (86%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/callback/IBusPassengerControllerStatusCallback.java (89%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/callback/IBusPassengerMapViewCallback.java (74%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/callback/IBusPassengerRouteLineInfoCallback.java (88%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/model/BusPassengerModel.java (97%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/network/BusPassengerModelLoopManager.java (95%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/network/BusPassengerServiceManager.kt (86%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/network/ShettlePassengerServiceApi.java (81%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/presenter/BaseBusPassengerPresenter.java (89%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/provider/B1StatusViewManager.java (86%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/BusPBlueToothView.kt (89%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/BusPStatusBarView.kt (98%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/BusPassengerBaseFragment.java (98%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/BusPassengerRouteFragment.java (97%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/BusPassengerTrafficLightView.kt (94%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/IBusPassengerMapDirectionView.java (88%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/layoutmanager/CenterLayoutManager.java (96%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt (98%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/mapdirectionview/MapDirectionViewModel.kt (91%) rename OCH/shuttle/passenger/src/{jinlvvan/java/com/mogo/och/bus => main/java/jinlv/com/mogo/och/shuttle}/passenger/ui/widget/BusPTurnLightView.kt (87%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_arrive_line_green.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_auto_close.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_auto_open.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_bus_line_logo.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_light_green_nor.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_light_red_nor.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_line_blue.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_line_green.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_map_arrived_point.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_map_car.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_map_end_point.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_map_start_point.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_no_order_data.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_point_blue.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_point_gray.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_right_route_bg.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_route_bg.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_split_line_bg.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_status_bar_logo.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_youzhuan_open.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_bg_end_station_circle.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_bg_middle_station_circle.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_bg_progress_bar.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_bg_start_station_circle.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_bg_status_bar.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_bg_traffic_light_background.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_brakelight_background_daytime.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_dividing_line_bg.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_panel_cur_station_panel.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/drawable/shuttle_p_jl_progress_item_round.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_base_fragment.xml (98%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_map_view.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_no_data_common_view.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_route_fragment.xml (98%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_stations_common_item.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_traffic_light_view.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_view_blue_tooth.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/shuttle_p_jl_view_status_bar.xml (97%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/layout/view_turn_light_status_daytime.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/values/colors.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/values/dimens.xml (100%) rename OCH/shuttle/passenger/src/{jinlvvan/res => main/res/jinlv}/values/strings.xml (100%) diff --git a/OCH/shuttle/passenger/build.gradle b/OCH/shuttle/passenger/build.gradle index 5b8512b929..db47636500 100644 --- a/OCH/shuttle/passenger/build.gradle +++ b/OCH/shuttle/passenger/build.gradle @@ -44,6 +44,21 @@ android { } } + sourceSets { + main { + res.srcDirs = [ + 'src/main/res', + 'src/main/res/m2', + 'src/main/res/jinlv', + ] + java.srcDirs = [ + 'src/main/java', + 'src/main/java/m2', + 'src/main/java/jinlv', + ] + } + } + flavorDimensions "vehicle" productFlavors { // 车型：金旅星辰、开沃 小巴业务 diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java index fb146e17c3..1f70b2dd7b 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/IMogoOCH.java @@ -10,7 +10,7 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; * * Created on 2022/3/29 */ -interface IMogoOCH extends IMoGoFunctionProvider { +public interface IMogoOCH extends IMoGoFunctionProvider { /** * 初始化网约车容器 diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt index 88fbdc0127..0831646d4d 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt @@ -1,7 +1,5 @@ package com.mogo.och.bus.passenger.constant -import com.mogo.commons.debug.DebugConfig - /** * Created on 2021/12/6 */ diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/MogoOCHBusPassenger.java similarity index 96% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/MogoOCHBusPassenger.java index 6848df9720..4d22eed043 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/MogoOCHBusPassenger.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger; +package com.mogo.och.shuttle.passenger; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; @@ -14,8 +14,9 @@ import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils; +import com.mogo.och.bus.passenger.IMogoOCH; import com.mogo.och.bus.passenger.constant.BusPassengerConst; -import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment; +import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment; import com.mogo.och.common.module.wigets.video.VideoPlayerActivity; import org.jetbrains.annotations.NotNull; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 99% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java index 41705f748a..93812807b7 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.adapter; +package com.mogo.och.shuttle.passenger.adapter; import android.content.Context; import android.text.TextUtils; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 91% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerOperationStatusResponse.java index c559d22368..b5d3da4997 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerOperationStatusResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerQueryLineRequest.java similarity index 84% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerQueryLineRequest.java index 35ba94ce3a..c1d06830e5 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerQueryLineRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; public /** diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResponse.java similarity index 93% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResponse.java index 1fbc4b4fd7..cf8b7ed6f6 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import com.mogo.eagle.core.data.BaseData; import com.mogo.och.data.bean.BusRoutesResult; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResult.java similarity index 97% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResult.java index bd78b4a286..fc2b345648 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerRoutesResult.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import java.util.List; import java.util.Objects; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerStation.java similarity index 98% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerStation.java index 401bcd9dd1..6a512d1e1b 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/bean/BusPassengerStation.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.shuttle.passenger.bean; import java.util.Objects; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 81% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java index 06885b74ab..8be27da6e0 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassegerDriverStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback; +package com.mogo.och.shuttle.passenger.callback; /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 90% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java index 4dbf53010c..d989cddaa1 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerADASStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback; +package com.mogo.och.shuttle.passenger.callback; /** * Created on 2022/3/31 diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 86% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java index 8d8c4b0453..67905d33c4 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerAutopilotPlanningCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback; +package com.mogo.och.shuttle.passenger.callback; import com.amap.api.maps.model.LatLng; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 89% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java index cc0bc3f4c7..d0121360cf 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback; +package com.mogo.och.shuttle.passenger.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerMapViewCallback.java similarity index 74% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerMapViewCallback.java index 25f7d3bbec..abba03e07d 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerMapViewCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback; +package com.mogo.och.shuttle.passenger.callback; /** * @author: wangmingjun diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 88% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java index 615185f0e0..aeebb9dfd4 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/callback/IBusPassengerRouteLineInfoCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback; +package com.mogo.och.shuttle.passenger.callback; import com.mogo.och.data.bean.BusStationBean; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java similarity index 97% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java index b996d96f58..b94d10814f 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.model; +package com.mogo.och.shuttle.passenger.model; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; import static com.mogo.och.bus.passenger.constant.BusPassengerConst.QUERY_BUS_P_STATION_DELAY; @@ -21,7 +21,6 @@ import com.mogo.commons.module.intent.IntentManager; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager; import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; @@ -29,8 +28,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant; import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.bus.passenger.R; -import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse; -import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse; +import com.mogo.och.shuttle.passenger.bean.BusPassengerOperationStatusResponse; +import com.mogo.och.shuttle.passenger.bean.BusPassengerRoutesResponse; import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg; import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg; import com.mogo.och.common.module.bean.dpmsg.DPMsgType; @@ -54,14 +53,14 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.NetworkUtils; -import com.mogo.och.bus.passenger.callback.IBusPassegerDriverStatusCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerADASStatusCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerRouteLineInfoCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassegerDriverStatusCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerADASStatusCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerAutopilotPlanningCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerControllerStatusCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerRouteLineInfoCallback; import com.mogo.och.bus.passenger.constant.BusPassengerConst; -import com.mogo.och.bus.passenger.network.BusPassengerModelLoopManager; -import com.mogo.och.bus.passenger.network.BusPassengerServiceManager; +import com.mogo.och.shuttle.passenger.network.BusPassengerModelLoopManager; +import com.mogo.och.shuttle.passenger.network.BusPassengerServiceManager; import com.mogo.och.common.module.biz.network.OchCommonServiceCallback; import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager; import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java similarity index 95% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java index 6f9c029f3b..e6f8826bf5 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerModelLoopManager.java @@ -1,7 +1,7 @@ -package com.mogo.och.bus.passenger.network; +package com.mogo.och.shuttle.passenger.network; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.och.bus.passenger.model.BusPassengerModel; +import com.mogo.och.shuttle.passenger.model.BusPassengerModel; import java.util.concurrent.TimeUnit; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt similarity index 86% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt index 5bd843b708..4d7d88b823 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/BusPassengerServiceManager.kt @@ -1,13 +1,12 @@ -package com.mogo.och.bus.passenger.network +package com.mogo.och.shuttle.passenger.network import android.content.Context import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.getServerToken -import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse +import com.mogo.och.shuttle.passenger.bean.BusPassengerRoutesResponse import com.mogo.cloud.passport.MoGoAiCloudClientConfig -import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest -import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse +import com.mogo.och.shuttle.passenger.bean.BusPassengerQueryLineRequest +import com.mogo.och.shuttle.passenger.bean.BusPassengerOperationStatusResponse import com.mogo.eagle.core.network.MoGoRetrofitFactory -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl @@ -21,7 +20,8 @@ object BusPassengerServiceManager { private var driverSnCache = "" private var mShuttleBusPassengerServiceApi = - MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create(ShettlePassengerServiceApi::class.java) + MoGoRetrofitFactory.getInstance(OchCommonConst.getShuttleUrl()).create( + ShettlePassengerServiceApi::class.java) /** * 获取Bus司机端的sn diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/ShettlePassengerServiceApi.java similarity index 81% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/ShettlePassengerServiceApi.java index c780786bf2..411eb33a14 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/ShettlePassengerServiceApi.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/network/ShettlePassengerServiceApi.java @@ -1,8 +1,8 @@ -package com.mogo.och.bus.passenger.network; +package com.mogo.och.shuttle.passenger.network; -import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse; -import com.mogo.och.bus.passenger.bean.BusPassengerQueryLineRequest; -import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse; +import com.mogo.och.shuttle.passenger.bean.BusPassengerOperationStatusResponse; +import com.mogo.och.shuttle.passenger.bean.BusPassengerQueryLineRequest; +import com.mogo.och.shuttle.passenger.bean.BusPassengerRoutesResponse; import io.reactivex.Observable; import retrofit2.http.Body; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java similarity index 89% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java index e27d90bde7..8a7abbaa49 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/presenter/BaseBusPassengerPresenter.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.presenter; +package com.mogo.och.shuttle.passenger.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS_P; @@ -13,13 +13,13 @@ import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.bus.passenger.callback.IBusPassegerDriverStatusCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerADASStatusCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerAutopilotPlanningCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerControllerStatusCallback; -import com.mogo.och.bus.passenger.callback.IBusPassengerRouteLineInfoCallback; -import com.mogo.och.bus.passenger.model.BusPassengerModel; -import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment; +import com.mogo.och.shuttle.passenger.callback.IBusPassegerDriverStatusCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerADASStatusCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerAutopilotPlanningCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerControllerStatusCallback; +import com.mogo.och.shuttle.passenger.callback.IBusPassengerRouteLineInfoCallback; +import com.mogo.och.shuttle.passenger.model.BusPassengerModel; +import com.mogo.och.shuttle.passenger.ui.BusPassengerRouteFragment; import com.mogo.och.data.bean.BusStationBean; import java.util.List; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/provider/B1StatusViewManager.java similarity index 86% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/provider/B1StatusViewManager.java index d37690eb07..e29ef04b47 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/provider/B1StatusViewManager.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/provider/B1StatusViewManager.java @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.provider; +package com.mogo.och.shuttle.passenger.provider; import android.content.Context; import android.view.View; -import com.mogo.och.bus.passenger.ui.BusPStatusBarView; +import com.mogo.och.shuttle.passenger.ui.BusPStatusBarView; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt similarity index 89% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt index 6b41cb9cd9..9add9a9e5d 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPBlueToothView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPBlueToothView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.shuttle.passenger.ui import android.content.Context import android.util.AttributeSet @@ -7,7 +7,7 @@ import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_view_blue_tooth.view.blueView +import kotlinx.android.synthetic.main.shuttle_p_jl_view_blue_tooth.view.blueView /** * 魔戒蓝牙控件 diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt similarity index 98% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt index 44a5a5f89a..4ee59f2561 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPStatusBarView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.shuttle.passenger.ui import android.annotation.* import android.content.Context diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java similarity index 98% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java index 424eb20d16..1b10d55532 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerBaseFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui; +package com.mogo.och.shuttle.passenger.ui; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java similarity index 97% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java index 02f6a3ca5c..4420187491 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui; +package com.mogo.och.shuttle.passenger.ui; import android.graphics.drawable.AnimationDrawable; import android.os.Bundle; @@ -19,11 +19,11 @@ import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.och.bus.passenger.R; -import com.mogo.och.bus.passenger.adapter.BusPassengerLineStationsAdapter; +import com.mogo.och.shuttle.passenger.adapter.BusPassengerLineStationsAdapter; import com.mogo.och.bus.passenger.constant.BusPassengerConst; -import com.mogo.och.bus.passenger.presenter.BaseBusPassengerPresenter; -import com.mogo.och.bus.passenger.ui.layoutmanager.CenterLayoutManager; -import com.mogo.och.bus.passenger.ui.mapdirectionview.BusPassengerMapDirectionView; +import com.mogo.och.shuttle.passenger.presenter.BaseBusPassengerPresenter; +import com.mogo.och.shuttle.passenger.ui.layoutmanager.CenterLayoutManager; +import com.mogo.och.shuttle.passenger.ui.mapdirectionview.BusPassengerMapDirectionView; import com.mogo.och.common.module.utils.NumberFormatUtil; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.common.module.wigets.OCHGradientTextView; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt similarity index 94% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt index 89f27513cb..7f53fc69b9 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.shuttle.passenger.ui import android.content.Context import android.util.AttributeSet @@ -10,9 +10,9 @@ import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListen import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_bg -import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_iv -import kotlinx.android.synthetic.jinlvvan.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_time_tv +import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_bg +import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_iv +import kotlinx.android.synthetic.main.shuttle_p_jl_traffic_light_view.view.bus_p_traffic_light_time_tv /** * bus乘客端：红绿灯view diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/IBusPassengerMapDirectionView.java similarity index 88% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/IBusPassengerMapDirectionView.java index 7f525d0464..643da8a824 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/IBusPassengerMapDirectionView.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui; +package com.mogo.och.shuttle.passenger.ui; /** * @author xiaoyuzhou diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 96% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java index 42210cbcaf..d7b712d6ea 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/layoutmanager/CenterLayoutManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.layoutmanager; +package com.mogo.och.shuttle.passenger.ui.layoutmanager; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt similarity index 98% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt index 2ce075277c..906f7f30d9 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/BusPassengerMapDirectionView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.mapdirectionview +package com.mogo.och.shuttle.passenger.ui.mapdirectionview import android.content.Context import android.os.Bundle @@ -28,7 +28,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.ui.IBusPassengerMapDirectionView +import com.mogo.och.shuttle.passenger.ui.IBusPassengerMapDirectionView import com.mogo.och.bus.passenger.utils.BusPassengerMapAssetStyleUtil /** diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/MapDirectionViewModel.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/MapDirectionViewModel.kt similarity index 91% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/MapDirectionViewModel.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/MapDirectionViewModel.kt index c1be106fb8..3b2df2feec 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/mapdirectionview/MapDirectionViewModel.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/mapdirectionview/MapDirectionViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.mapdirectionview +package com.mogo.och.shuttle.passenger.ui.mapdirectionview import androidx.lifecycle.ViewModel import com.amap.api.maps.model.LatLng @@ -11,14 +11,14 @@ class MapDirectionViewModel: ViewModel(), ITrajectoryListener { private val TAG = MapDirectionViewModel::class.java.simpleName - private var viewCallback:ItineraryViewCallback?=null + private var viewCallback: ItineraryViewCallback?=null init { TrajectoryAndDistanceManager.addTrajectoryListener(TAG,this) } - fun setDistanceCallback(viewCallback:ItineraryViewCallback){ + fun setDistanceCallback(viewCallback: ItineraryViewCallback){ this.viewCallback = viewCallback } diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt similarity index 87% rename from OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt index a822623d22..b3b7d046fe 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/widget/BusPTurnLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.widget +package com.mogo.och.shuttle.passenger.ui.widget import android.content.Context import android.util.AttributeSet diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_arrive_line_green.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_arrive_line_green.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_auto_close.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_auto_close.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_auto_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_auto_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bus_line_logo.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_bus_line_logo.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_light_green_nor.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_light_green_nor.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_light_red_nor.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_light_red_nor.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_line_blue.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_line_blue.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_line_green.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_line_green.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_arrived_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_arrived_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_car.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_car.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_end_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_end_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_start_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_start_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_no_order_data.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_no_order_data.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_point_blue.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_point_blue.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_point_gray.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_point_gray.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_right_route_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_right_route_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_route_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_route_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_split_line_bg.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_split_line_bg.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_status_bar_logo.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_status_bar_logo.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_youzhuan_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_youzhuan_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png b/OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_end_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_end_station_circle.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_middle_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_middle_station_circle.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_progress_bar.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_progress_bar.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_start_station_circle.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_start_station_circle.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_status_bar.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_status_bar.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_traffic_light_background.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_bg_traffic_light_background.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_brakelight_background_daytime.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_dividing_line_bg.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_dividing_line_bg.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_panel_cur_station_panel.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_panel_cur_station_panel.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_progress_item_round.xml b/OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml similarity index 100% rename from OCH/shuttle/passenger/src/jinlvvan/res/drawable/shuttle_p_jl_progress_item_round.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml diff --git a/OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_base_fragment.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml similarity index 98% rename from OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_base_fragment.xml rename to OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml index d911e5b4a2..fff8c5c193 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/res/layout/shuttle_p_jl_base_fragment.xml +++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml @@ -16,7 +16,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> - - - -