From e565f0a403862603c22dbde77d319c43ef6335d7 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 13 Jan 2023 19:34:09 +0800 Subject: [PATCH] =?UTF-8?q?[1.0.0]=20[m1]=20[=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=8A=BD=E5=88=B0base=20=E4=B8=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/mogo-och-bus-passenger/build.gradle | 13 +++ .../bus/passenger/MogoOCHBusPassenger.java | 0 .../BusPassengerLineStationsAdapter.java | 0 .../BusPassengerOperationStatusResponse.java | 0 .../bean/BusPassengerQueryLineRequest.java | 0 .../bean/BusPassengerRoutesResponse.java | 0 .../bean/BusPassengerRoutesResult.java | 0 .../passenger/bean/BusPassengerStation.java | 0 .../IBusPassegerDriverStatusCallback.java | 0 .../IBusPassengerADASStatusCallback.java | 0 ...BusPassengerAutopilotPlanningCallback.java | 0 ...IBusPassengerControllerStatusCallback.java | 0 .../IBusPassengerMapViewCallback.java | 0 .../IBusPassengerRouteLineInfoCallback.java | 0 .../passenger/model/BusPassengerModel.java | 0 .../network/BusPassengerModelLoopManager.java | 0 .../network/BusPassengerServiceApi.java | 0 .../network/BusPassengerServiceManager.kt | 5 +- .../presenter/BaseBusPassengerPresenter.java | 1 - .../ui/BusPassengerBaseFragment.java | 0 .../ui/BusPassengerMapDirectionView.java | 0 .../ui/BusPassengerRouteFragment.java | 0 .../ui/BusPassengerTrafficLightView.java | 0 .../ui/IBusPassengerMapDirectionView.java | 0 .../ui/layoutmanager/CenterLayoutManager.java | 0 .../passenger/utils/BPRouteDataTestUtils.java | 0 .../bg_bus_p_arrived_station.png | Bin .../res/drawable-nodpi}/bus_p_arrow_nor.png | Bin .../res/drawable-nodpi}/bus_p_auto_nor.png | Bin .../drawable-nodpi}/bus_p_light_green_nor.png | Bin .../drawable-nodpi}/bus_p_light_red_nor.png | Bin .../bus_p_light_yellow_nor.png | Bin .../res/drawable-nodpi}/bus_p_line_blue.png | Bin .../res/drawable-nodpi}/bus_p_line_green.png | Bin .../res/drawable-nodpi}/bus_p_line_grey.png | Bin .../bus_p_map_arrow_arrived.png | Bin .../bus_p_map_arrow_un_arrive.png | Bin .../res/drawable-nodpi}/bus_p_map_car.png | Bin .../bus_p_map_view_dir_end_point.png | Bin .../bus_p_map_view_dir_way_point.png | Bin .../res/drawable-nodpi}/bus_p_mogo_nor.png | Bin .../drawable-nodpi}/bus_p_no_order_data.png | Bin .../res/drawable-nodpi}/bus_p_point_blue.png | Bin .../res/drawable-nodpi}/bus_p_point_gray.png | Bin .../res/drawable-nodpi}/bus_p_point_green.png | Bin .../res/drawable-nodpi}/bus_p_un_auto_nor.png | Bin .../res/drawable-nodpi}/station_arrow.png | Bin .../drawable/bg_bus_p_end_station_circle.xml | 0 .../res/drawable/bg_bus_p_end_tag_bg.xml | 0 .../bg_bus_p_middle_station_circle.xml | 0 .../bg_bus_p_start_station_circle.xml | 0 .../res/drawable/bg_bus_p_start_tag_bg.xml | 0 .../bg_bus_p_traffic_light_background.xml | 0 .../res/drawable/bus_p_dividing_line_bg.xml | 0 .../bus_p_panel_cur_station_panel.xml | 0 .../res/drawable/bus_p_route_bg.xml | 0 .../res/drawable/bus_progress_bar_bg.xml | 0 .../res/drawable/progress_item_round.xml | 0 .../res/layout/bus_p_base_fragment.xml | 0 .../res/layout/bus_p_map_view.xml | 0 .../res/layout/bus_p_no_data_common_view.xml | 0 .../res/layout/bus_p_route_fragment.xml | 0 .../res/layout/bus_p_stations_common_item.xml | 0 .../res/layout/bus_p_traffic_light_view.xml | 0 .../src/{main => base}/res/values/colors.xml | 0 .../src/{main => base}/res/values/dimens.xml | 0 .../src/{main => base}/res/values/strings.xml | 0 .../och/bus/passenger/MogoOCHBusPassenger.kt | 89 ++++++++++++++++++ .../presenter/BusPassengerPresenter.kt | 7 ++ .../passenger/ui/BusPassengerRouteFragment.kt | 40 ++++++++ .../src/m1/res/layout/bus_p_fragment.xml | 6 ++ app/build.gradle | 2 + app/functions/och.gradle | 2 + .../fPadLenovoOchBusPassenger.gradle | 1 + .../fPadLenovoOchBusPassengerM1.gradle | 37 ++++++++ 75 files changed, 201 insertions(+), 2 deletions(-) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt (96%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java (99%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bg_bus_p_arrived_station.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_arrow_nor.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_auto_nor.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_light_green_nor.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_light_red_nor.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_light_yellow_nor.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_line_blue.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_line_green.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_line_grey.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_map_arrow_arrived.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_map_arrow_un_arrive.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_map_car.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_map_view_dir_end_point.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_map_view_dir_way_point.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_mogo_nor.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_no_order_data.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_point_blue.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_point_gray.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_point_green.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/bus_p_un_auto_nor.png (100%) rename OCH/mogo-och-bus-passenger/src/{main/res/drawable-xhdpi => base/res/drawable-nodpi}/station_arrow.png (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bg_bus_p_end_station_circle.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bg_bus_p_end_tag_bg.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bg_bus_p_middle_station_circle.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bg_bus_p_start_station_circle.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bg_bus_p_start_tag_bg.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bg_bus_p_traffic_light_background.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bus_p_dividing_line_bg.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bus_p_panel_cur_station_panel.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bus_p_route_bg.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/bus_progress_bar_bg.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/drawable/progress_item_round.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/layout/bus_p_base_fragment.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/layout/bus_p_map_view.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/layout/bus_p_no_data_common_view.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/layout/bus_p_route_fragment.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/layout/bus_p_stations_common_item.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/layout/bus_p_traffic_light_view.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/values/colors.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/values/dimens.xml (100%) rename OCH/mogo-och-bus-passenger/src/{main => base}/res/values/strings.xml (100%) create mode 100644 OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt create mode 100644 OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt create mode 100644 OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml create mode 100644 app/productFlavors/fPadLenovoOchBusPassengerM1.gradle diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle index af805de9a1..67ade96703 100644 --- a/OCH/mogo-och-bus-passenger/build.gradle +++ b/OCH/mogo-och-bus-passenger/build.gradle @@ -38,6 +38,19 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + flavorDimensions "product" + productFlavors { + base { + dimension "product" + buildConfigField 'int', 'NEW_TEST', '0' + } + // 接驳车 + m1 { + dimension "product" + buildConfigField 'int', 'NEW_TEST', '1' + } + } } dependencies { diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt similarity index 96% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt index 0e70161643..44256d02ea 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt +++ b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt @@ -38,7 +38,10 @@ object BusPassengerServiceManager { mBusPassengerServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, MoGoAiCloudClientConfig.getInstance().token, - BusPassengerQueryLineRequest(driverAppSn)) + BusPassengerQueryLineRequest( + driverAppSn + ) + ) .transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) } diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java similarity index 99% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index b87abc0736..8af483516a 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -1,6 +1,5 @@ package com.mogo.och.bus.passenger.presenter; -import android.location.Location; import android.os.Looper; import androidx.annotation.NonNull; diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bg_bus_p_arrived_station.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bg_bus_p_arrived_station.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bg_bus_p_arrived_station.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bg_bus_p_arrived_station.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_arrow_nor.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_arrow_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_arrow_nor.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_arrow_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_auto_nor.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_auto_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_auto_nor.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_auto_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_light_green_nor.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_green_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_light_green_nor.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_green_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_light_red_nor.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_red_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_light_red_nor.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_red_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_light_yellow_nor.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_yellow_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_light_yellow_nor.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_yellow_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_blue.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_blue.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_blue.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_blue.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_green.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_green.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_green.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_green.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_grey.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_grey.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_line_grey.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_grey.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_arrived.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_arrived.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_arrived.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_un_arrive.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_arrow_un_arrive.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_car.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_car.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_car.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_car.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_view_dir_end_point.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_end_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_view_dir_end_point.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_end_point.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_view_dir_way_point.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_way_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_map_view_dir_way_point.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_way_point.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_mogo_nor.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_mogo_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_mogo_nor.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_mogo_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_no_order_data.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_no_order_data.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_no_order_data.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_no_order_data.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_blue.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_blue.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_blue.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_blue.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_gray.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_gray.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_gray.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_gray.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_green.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_green.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_point_green.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_green.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_un_auto_nor.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_un_auto_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/bus_p_un_auto_nor.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_un_auto_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/station_arrow.png b/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/station_arrow.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable-xhdpi/station_arrow.png rename to OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/station_arrow.png diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_station_circle.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_tag_bg.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_tag_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_tag_bg.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_tag_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_middle_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_middle_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_station_circle.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_tag_bg.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_tag_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_tag_bg.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_tag_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_traffic_light_background.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_traffic_light_background.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_dividing_line_bg.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_dividing_line_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_dividing_line_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_panel_cur_station_panel.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_panel_cur_station_panel.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_route_bg.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_route_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_p_route_bg.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_route_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_progress_bar_bg.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_progress_bar_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/bus_progress_bar_bg.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_progress_bar_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/progress_item_round.xml b/OCH/mogo-och-bus-passenger/src/base/res/drawable/progress_item_round.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/drawable/progress_item_round.xml rename to OCH/mogo-och-bus-passenger/src/base/res/drawable/progress_item_round.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_base_fragment.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml rename to OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_base_fragment.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_map_view.xml b/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_map_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_map_view.xml rename to OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_map_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_no_data_common_view.xml b/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_no_data_common_view.xml rename to OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_no_data_common_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_route_fragment.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml rename to OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_route_fragment.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml rename to OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_stations_common_item.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_traffic_light_view.xml b/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_traffic_light_view.xml rename to OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_traffic_light_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/base/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/values/colors.xml rename to OCH/mogo-och-bus-passenger/src/base/res/values/colors.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/base/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml rename to OCH/mogo-och-bus-passenger/src/base/res/values/dimens.xml diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/base/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/main/res/values/strings.xml rename to OCH/mogo-och-bus-passenger/src/base/res/values/strings.xml diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt new file mode 100644 index 0000000000..422f601d8b --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt @@ -0,0 +1,89 @@ +package com.mogo.och.bus.passenger + +import android.content.Context +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.commons.module.status.IMogoStatusChangedListener +import com.mogo.commons.module.status.MogoStatusManager +import com.mogo.commons.module.status.StatusDescriptor +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController +import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.bus.passenger.constant.BusPassengerConst +import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment + +/** + * 网约车-Bus-乘客端 + * + * Created on 2022/3/29 + */ +@Route(path = BusPassengerConst.PATH) +class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener { + private var mActivity: FragmentActivity? = null + private var mContainerId = 0 + private var mPassengerFragment: BusPassengerRouteFragment? = null + override fun createCoverage(activity: FragmentActivity, containerId: Int) {} + override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? { + mActivity = activity + mContainerId = containerId!! + return null + } + + override val functionName: String + get() = "och-bus-passenger-m1" + + override fun onDestroy() { + // 若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠 + mActivity?.finish() + } + + override fun init(context: Context) { + MogoStatusManager.getInstance() + .registerStatusChangedListener("OchBus", StatusDescriptor.VR_MODE, this) + } + + override fun onStatusChanged(descriptor: StatusDescriptor, isTrue: Boolean) { + if (descriptor == StatusDescriptor.VR_MODE) { + if (isTrue) { + showFragment() + } else { + hideFragment() + } + } + } + + /** + * 进入鹰眼模式，设置手势缩放地图失效 + */ + private fun stepIntoVrMode() { + d(SceneConstant.M_TAXI_P + TAG, "进入vr模式") + getMapUIController()?.stepInVrMode(true) // 白天模式 + stepInDayMode() //白天模式 状态栏字体颜色变黑 + } + + private fun showFragment() { + if (mPassengerFragment == null) { + d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======") + mPassengerFragment = BusPassengerRouteFragment() + mActivity!!.supportFragmentManager.beginTransaction() + .add(mContainerId, mPassengerFragment!!).commitAllowingStateLoss() + return + } + d(SceneConstant.M_TAXI_P + TAG, "准备show fragment") + mActivity!!.supportFragmentManager.beginTransaction().show(mPassengerFragment!!) + .commitAllowingStateLoss() + } + + private fun hideFragment() { + if (mPassengerFragment != null) { + mActivity!!.supportFragmentManager.beginTransaction().hide(mPassengerFragment!!) + .commitAllowingStateLoss() + } + } + + companion object { + private val TAG = MogoOCHBusPassenger::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt new file mode 100644 index 0000000000..6df3e4a056 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -0,0 +1,7 @@ +package com.mogo.och.bus.passenger.presenter + +import com.mogo.commons.mvp.Presenter +import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment + +class BusPassengerPresenter(view: BusPassengerRouteFragment?) : + Presenter(view) \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt new file mode 100644 index 0000000000..1dacbaec9a --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt @@ -0,0 +1,40 @@ +package com.mogo.och.bus.passenger.ui + +import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.function.call.map.CallerSmpManager.hidePanel +import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class BusPassengerRouteFragment : + MvpFragment() { + /** + * 改变自动驾驶状态 + * + * @param status 2 - running 1 - enable 2 - disable + */ + private val mPrevAPStatus = -1 + override fun getLayoutId(): Int { + return R.layout.bus_p_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + //隐藏小地图 + hidePanel() + } + + override fun createPresenter(): BusPassengerPresenter { + return BusPassengerPresenter(this) + } + + companion object { + private val TAG = BusPassengerRouteFragment::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml new file mode 100644 index 0000000000..77d9ef65f8 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8ef4cbbd4f..20807f17a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -246,6 +246,7 @@ android { apply from: "./productFlavors/fPadLenovoOchBus.gradle" apply from: "./productFlavors/fPadLenovoOchTaxi.gradle" apply from: "./productFlavors/fPadLenovoOchBusPassenger.gradle" + apply from: "./productFlavors/fPadLenovoOchBusPassengerM1.gradle" apply from: "./productFlavors/fPadLenovoOchTaxiPassenger.gradle" apply from: "./productFlavors/fPadLenovoOchSweeper.gradle" apply from: "./productFlavors/fMultiDisplayOchBus.gradle" @@ -289,6 +290,7 @@ android { if(names.contains("fPadLenovoOchBus")){ }else if(names.contains("fPadLenovoOchBusPassenger")){ }else if(names.contains("fMultiDisplayOchBus")){ + }else if(names.contains("fPadLenovoOchBusPassengerM1")){ }else { setIgnore(true) } diff --git a/app/functions/och.gradle b/app/functions/och.gradle index e29a99cbe1..b263d8d615 100644 --- a/app/functions/och.gradle +++ b/app/functions/och.gradle @@ -9,6 +9,7 @@ project.dependencies { fPadLenovoOchBusImplementation(rootProject.ext.dependencies.mogoochbus) // Bus乘客端 fPadLenovoOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) + fPadLenovoOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) // taxi司机端 fPadLenovoOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) @@ -33,6 +34,7 @@ project.dependencies { fPadLenovoOchBusImplementation (project(':OCH:mogo-och-bus')) // Bus乘客端 fPadLenovoOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) + fPadLenovoOchBusPassengerM1Implementation (project(':OCH:mogo-och-bus-passenger')) // taxi司机端 fPadLenovoOchTaxiImplementation (project(':OCH:mogo-och-taxi')) diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index 7d3a4fb24b..0f08cb0fee 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -12,6 +12,7 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" + matchingFallbacks = ['base'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' diff --git a/app/productFlavors/fPadLenovoOchBusPassengerM1.gradle b/app/productFlavors/fPadLenovoOchBusPassengerM1.gradle new file mode 100644 index 0000000000..623d3bc33f --- /dev/null +++ b/app/productFlavors/fPadLenovoOchBusPassengerM1.gradle @@ -0,0 +1,37 @@ +project.android.productFlavors { + // 衡阳-联想Pad-网约车-小巴车-乘客端 + fPadLenovoOchBusPassengerM1 { + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + dimension "product" + matchingFallbacks = ['m1'] + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true] + + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Base\"" + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' + } +} \ No newline at end of file