diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle index 2d0d6bcc7c..883435c245 100644 --- a/OCH/mogo-och-bus-passenger/build.gradle +++ b/OCH/mogo-och-bus-passenger/build.gradle @@ -63,6 +63,24 @@ android { buildConfigField 'int', 'NEW_TEST', '1' } } + sourceSets { + shuttle { + res.srcDirs = [ + 'src/basecommon/res', 'src/shuttle/res', + ] + java.srcDirs=[ + 'src/basecommon/java', 'src/shuttle/java', + ] + } + base { + res.srcDirs = [ + 'src/basecommon/res', 'src/base/res', + ] + java.srcDirs=[ + 'src/basecommon/java', 'src/base/java', + ] + } + } } dependencies { diff --git a/OCH/mogo-och-bus-passenger/src/basc/java/com/mogo/och/bus/passenger/constant/URLConst.kt b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/constant/URLConst.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/basc/java/com/mogo/och/bus/passenger/constant/URLConst.kt rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/constant/URLConst.kt diff --git a/OCH/mogo-och-bus-passenger/src/base/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 deleted file mode 100644 index a7512971dc..0000000000 --- a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.mogo.och.bus.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 io.reactivex.Observable; -import retrofit2.http.Body; -import retrofit2.http.GET; -import retrofit2.http.Header; -import retrofit2.http.Headers; -import retrofit2.http.POST; -import retrofit2.http.Query; - -/** - * Created on 2022/3/31 - * - * Bus乘客端接口定义 - */ -interface BusPassengerServiceApi { - /** - * 查询bus司机端绑定路线 - * @return 接口返回数据 - */ - @Headers( {"Content-Type:application/json;charset=UTF-8"} ) - @POST( "/autopilot-car-hailing/line/v2/driver/bus/passenger/lineDataWithDriver/query" ) - Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body BusPassengerQueryLineRequest request); - - /** - * 查询司机端的登陆状态 - * @param sn - * @return - */ - @Headers({"Content-type:application/json;charset=UTF-8"}) -// @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query") - @GET("/autopilot-car-hailing/operation/v1/driver/bus/passenger/loginStatus") - Observable queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); - - -} diff --git a/OCH/mogo-och-bus-passenger/src/basc/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java b/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/basc/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java rename to OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerQueryLineRequest.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResponse.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerRoutesResult.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/bean/BusPassengerStation.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerADASStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerAutopilotPlanningCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerMapViewCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/callback/IBusPassengerRouteLineInfoCallback.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerModelLoopManager.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/IBusPassengerMapDirectionView.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java b/OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java rename to OCH/mogo-och-bus-passenger/src/basecommon/java/com/mogo/och/bus/passenger/utils/BPRouteDataTestUtils.java diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bg_bus_p_arrived_station.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bg_bus_p_arrived_station.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bg_bus_p_arrived_station.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bg_bus_p_arrived_station.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_arrow_nor.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_arrow_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_arrow_nor.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_arrow_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_auto_nor.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_auto_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_auto_nor.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_auto_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_green_nor.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_green_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_green_nor.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_green_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_red_nor.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_red_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_red_nor.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_red_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_yellow_nor.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_yellow_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_light_yellow_nor.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_light_yellow_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_blue.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_blue.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_blue.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_blue.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_green.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_green.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_green.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_green.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_grey.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_grey.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_line_grey.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_line_grey.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_arrived.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_arrived.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_arrived.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_arrived.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_arrow_un_arrive.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_car.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_car.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_car.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_car.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_end_point.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_end_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_end_point.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_end_point.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_way_point.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_way_point.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_map_view_dir_way_point.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_map_view_dir_way_point.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_mogo_nor.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_mogo_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_mogo_nor.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_mogo_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_no_order_data.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_no_order_data.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_no_order_data.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_no_order_data.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_blue.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_blue.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_blue.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_blue.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_gray.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_gray.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_gray.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_gray.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_green.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_green.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_point_green.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_point_green.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_un_auto_nor.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_un_auto_nor.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/bus_p_un_auto_nor.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/bus_p_un_auto_nor.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/station_arrow.png b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/station_arrow.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable-nodpi/station_arrow.png rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable-nodpi/station_arrow.png diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_station_circle.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_tag_bg.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_tag_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_end_tag_bg.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_end_tag_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_middle_station_circle.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_middle_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_middle_station_circle.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_middle_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_station_circle.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_station_circle.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_station_circle.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_tag_bg.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_tag_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_start_tag_bg.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_start_tag_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_traffic_light_background.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_traffic_light_background.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bg_bus_p_traffic_light_background.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bg_bus_p_traffic_light_background.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_dividing_line_bg.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_dividing_line_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_dividing_line_bg.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_dividing_line_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_panel_cur_station_panel.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_panel_cur_station_panel.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_panel_cur_station_panel.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_panel_cur_station_panel.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_route_bg.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_route_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_p_route_bg.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_p_route_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_progress_bar_bg.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_progress_bar_bg.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/bus_progress_bar_bg.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/bus_progress_bar_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/drawable/progress_item_round.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/progress_item_round.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/drawable/progress_item_round.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/drawable/progress_item_round.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_base_fragment.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_base_fragment.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_base_fragment.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_map_view.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_map_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_map_view.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_map_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_no_data_common_view.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_no_data_common_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_no_data_common_view.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_no_data_common_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_route_fragment.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_route_fragment.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_route_fragment.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_stations_common_item.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_stations_common_item.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_stations_common_item.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_traffic_light_view.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_traffic_light_view.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/layout/bus_p_traffic_light_view.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/layout/bus_p_traffic_light_view.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/values/colors.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/values/colors.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/values/colors.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/values/dimens.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/values/dimens.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/values/dimens.xml diff --git a/OCH/mogo-och-bus-passenger/src/base/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/basecommon/res/values/strings.xml similarity index 100% rename from OCH/mogo-och-bus-passenger/src/base/res/values/strings.xml rename to OCH/mogo-och-bus-passenger/src/basecommon/res/values/strings.xml diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle index ac8ab2372d..57930c1d10 100644 --- a/OCH/mogo-och-bus/build.gradle +++ b/OCH/mogo-och-bus/build.gradle @@ -43,7 +43,7 @@ android { flavorDimensions "product" productFlavors { - basc { + base { dimension "product" buildConfigField 'int', 'NEW_TEST', '0' } diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/bean/BusOrdersResponse.java b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusOrdersResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/bean/BusOrdersResponse.java rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusOrdersResponse.java diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusRoutesResponse.java similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusRoutesResponse.java diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/bean/BusStationBean.java b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusStationBean.java similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/bean/BusStationBean.java rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/bean/BusStationBean.java diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/constant/URLConst.kt b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/constant/URLConst.kt similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/constant/URLConst.kt rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/constant/URLConst.kt diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/model/OrderModel.java similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/model/OrderModel.java rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/model/OrderModel.java diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/IBascApiService.java b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/IBascApiService.java similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/IBascApiService.java rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/IBascApiService.java diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/OrderServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/OrderServiceManager.kt rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/OrderServiceManager.kt diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchCommonServiceManager.kt diff --git a/OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java b/OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java similarity index 100% rename from OCH/mogo-och-bus/src/basc/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java rename to OCH/mogo-och-bus/src/base/java/com/mogo/och/bus/net/login/OchLoginServiceApi.java diff --git a/app/build.gradle b/app/build.gradle index 398c3c85b6..799764f821 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -295,6 +295,8 @@ android { }else if(names.contains("fMultiDisplayOchBus")){ }else if(names.contains("fPadLenovoOchBusPassengerM1")){ }else if(names.contains("fPadLenovoOchBusPassengerM2")){ + }else if(names.contains("fPadLenovoOchBusShuttle")){ + }else if(names.contains("fPadLenovoOchBusShuttlePassenger")){ }else { setIgnore(true) } diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index 391555e4fe..7a8943d7a7 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -14,7 +14,7 @@ project.android.productFlavors { // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" - matchingFallbacks = ['basc'] + matchingFallbacks = ['base'] // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' diff --git a/app/productFlavors/fPadLenovoOchBusShuttle.gradle b/app/productFlavors/fPadLenovoOchBusShuttle.gradle index 774379e1bf..3271f6ecf2 100644 --- a/app/productFlavors/fPadLenovoOchBusShuttle.gradle +++ b/app/productFlavors/fPadLenovoOchBusShuttle.gradle @@ -30,7 +30,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Shuttle\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Driver_Shuttle\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 diff --git a/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle b/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle index 010da94f36..d2cdf0e1d1 100644 --- a/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusShuttlePassenger.gradle @@ -28,7 +28,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Shuttle_Passenger\"" + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Bus_Passenger_Shuttle\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式