From 65c72a816c7881fe420486e615d788550066b20d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 12 Apr 2024 18:52:09 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[bus=20driver=20shuttle=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/bus/driver/build.gradle | 2 +- .../mogo/och/bus/fragment/BusFragment.java | 3 +- .../mogo/och/bus/ui/BusSwitchLineActivity.kt | 2 +- ...gment_och_bus.xml => bug_fragment_och.xml} | 0 ...us_switch_line.xml => bus_switch_line.xml} | 0 OCH/bus/passenger/build.gradle | 2 +- OCH/charter/driver/build.gradle | 2 +- OCH/charter/passenger/build.gradle | 2 +- .../och/biz/login/presenter/LoginPresenter.kt | 2 + .../mogo/och/biz/login/ui/LoginFragment.kt | 7 + .../biz/login/ui/LoginPassengerFragment.kt | 8 ++ .../biz/login/ui/debugview/BusinessView.kt | 130 ++++++++++++++++++ .../login/ui/debugview/BusinessViewModel.kt | 42 ++++++ .../biz/login/ui/errorview/ErrorInfoView.kt | 1 + .../login/ui/errorview/ErrorInfoViewModel.kt | 3 +- .../res/layout/biz_login_business_view.xml | 66 +++++++++ .../res/layout/biz_login_passenger_view.xml | 22 +++ .../src/main/res/layout/biz_login_view.xml | 10 ++ .../module/biz/constant/OchCommonConst.kt | 22 +-- .../module/biz/login/ILoginCallback.java | 1 + .../module/biz/login/LoginStatusManager.kt | 6 + .../biz/network/interceptor/FRetryWithTime.kt | 7 +- .../mogo/och/facade/route/FacadeProvider.kt | 19 ++- OCH/shuttle/driver/build.gradle | 2 +- .../driver/src/main/AndroidManifest.xml | 6 +- .../{bus => shuttle}/ShuttleDriverProvider.kt | 5 +- .../bean/BusCloseTaskRequest.java | 2 +- .../bean/BusOperationStatusRequest.java | 2 +- .../{bus => shuttle}/bean/BusOrderBean.java | 2 +- .../bean/BusOrdersResponse.java | 2 +- .../bean/BusQueryLineStationsRequest.java | 2 +- .../bean/BusQueryLineTaskResponse.java | 2 +- .../bean/BusQueryLinesResponse.java | 2 +- .../BusQueryWriteOffPassengersResponse.java | 2 +- .../bean/BusResetDrivingLineRequest.java | 2 +- .../bean/BusResetLineStatusRequest.java | 2 +- .../bean/BusRoutePlanningUpdateReqBean.java | 2 +- .../bean/BusRoutesResponse.java | 2 +- .../bean/BusUpdateSiteStatusRequest.java | 2 +- .../BusWriteOffPassengersQueryRequest.java | 2 +- .../bean/CarHeartbeatReqBean.java | 5 +- .../bean/QueryLeaveAwayPassengersRequest.java | 2 +- .../QueryLeaveAwayPassengersResponse.java | 2 +- .../bean/WriteOffCountResponse.java | 2 +- .../bean/WriteOffPassenger.java | 2 +- .../callback/IBusADASStatusCallback.java | 2 +- .../IBusControllerStatusCallback.java | 2 +- .../callback/IBusLinesCallback.java | 6 +- .../callback/IRefreshBusStationsCallback.java | 2 +- .../callback/ISlidePannelHideCallback.java | 2 +- .../och/{bus => shuttle}/constant/BusConst.kt | 2 +- .../fragment/BaseShuttleTabFragment.java | 14 +- .../fragment/ShuttleFragment.java | 17 ++- .../{bus => shuttle}/model/BusLineModel.java | 16 +-- .../{bus => shuttle}/model/OrderModel.java | 34 +++-- .../och/{bus => shuttle}/model/TicketModel.kt | 15 +- .../{bus => shuttle}/net/IBascApiService.java | 24 ++-- .../net/OrderServiceManager.kt | 14 +- .../presenter/BusLinePresenter.java | 14 +- .../presenter/BusModelLoopManager.java | 13 +- .../presenter/BusPresenter.java | 16 +-- .../receiver/TestBusBroadcastReceiver.java | 4 +- .../ui/BusStationCommonItem.kt | 8 +- .../ui/BusSwitchLineActivity.kt | 20 +-- .../ui/BusSwitchLineView.java | 6 +- .../ui/ShuttleTapPositionView.java | 4 +- .../ui/ShuttleTrafficDataView.java | 5 +- .../ui/adapter/OpenItemAnimator.java | 2 +- .../ui/adapter/SwitchLineAdapter.kt | 10 +- .../ui/adapter/SwitchLineTaskAdapter.kt | 10 +- .../ui/writeoff/WriteOffView.kt | 4 +- .../ui/writeoff/WriteOffViewModel.kt | 6 +- .../util/BusAnalyticsManager.java | 4 +- .../util/BusSendTripInfoManager.kt | 2 +- .../util/BusTrajectoryManager.java | 6 +- .../util/ShuttleVoiceManager.kt | 4 +- .../och/{bus => shuttle}/view/BizMapView.kt | 4 +- .../och/{bus => shuttle}/view/BusArcView.java | 4 +- .../view/NoTouchConstraintLayout.java | 2 +- .../{bus => shuttle}/view/SlidePanelView.java | 4 +- .../view/VerticalDashLineView.java | 2 +- .../main/res/layout/shuttle_base_fragment.xml | 10 +- ...t_och_bus.xml => shuttle_fragment_och.xml} | 8 +- ...ew.xml => shuttle_no_data_common_view.xml} | 0 ...line_view.xml => shuttle_no_line_view.xml} | 0 ...m.xml => shuttle_stations_common_item.xml} | 0 ...witch_line.xml => shuttle_switch_line.xml} | 2 +- ....xml => shuttle_switch_line_list_item.xml} | 0 ...=> shuttle_switch_line_list_task_item.xml} | 0 ...bar_view.xml => shuttle_test_bar_view.xml} | 0 .../main/res/layout/shuttle_traffic_data.xml | 2 +- OCH/shuttle/passenger/build.gradle | 2 +- OCH/sweeper/driver/build.gradle | 2 +- OCH/taxi/driver/build.gradle | 2 +- OCH/taxi/passenger/build.gradle | 2 +- OCH/taxi/unmanned-driver/build.gradle | 4 +- OCH/taxi/unmanned-passenger/build.gradle | 2 +- app/script/projectFlavors/project.gradle | 2 +- app/script/utils.gradle | 2 +- 99 files changed, 532 insertions(+), 225 deletions(-) rename OCH/bus/driver/src/main/res/layout/{fragment_och_bus.xml => bug_fragment_och.xml} (100%) rename OCH/bus/driver/src/main/res/layout/{activity_bus_switch_line.xml => bus_switch_line.xml} (100%) create mode 100644 OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt create mode 100644 OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessViewModel.kt create mode 100644 OCH/common/biz/src/main/res/layout/biz_login_business_view.xml rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ShuttleDriverProvider.kt (86%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusCloseTaskRequest.java (93%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusOperationStatusRequest.java (95%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusOrderBean.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusOrdersResponse.java (92%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusQueryLineStationsRequest.java (90%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusQueryLineTaskResponse.java (89%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusQueryLinesResponse.java (94%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusQueryWriteOffPassengersResponse.java (86%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusResetDrivingLineRequest.java (93%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusResetLineStatusRequest.java (91%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusRoutePlanningUpdateReqBean.java (95%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusRoutesResponse.java (94%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusUpdateSiteStatusRequest.java (94%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/BusWriteOffPassengersQueryRequest.java (94%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/CarHeartbeatReqBean.java (82%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/QueryLeaveAwayPassengersRequest.java (95%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/QueryLeaveAwayPassengersResponse.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/WriteOffCountResponse.java (85%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/bean/WriteOffPassenger.java (89%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/callback/IBusADASStatusCallback.java (85%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/callback/IBusControllerStatusCallback.java (91%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/callback/IBusLinesCallback.java (63%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/callback/IRefreshBusStationsCallback.java (93%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/callback/ISlidePannelHideCallback.java (76%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/constant/BusConst.kt (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/fragment/BaseShuttleTabFragment.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/fragment/ShuttleFragment.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/model/BusLineModel.java (92%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/model/OrderModel.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/model/TicketModel.kt (95%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/net/IBascApiService.java (87%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/net/OrderServiceManager.kt (91%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/presenter/BusLinePresenter.java (88%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/presenter/BusModelLoopManager.java (78%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/presenter/BusPresenter.java (95%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/receiver/TestBusBroadcastReceiver.java (92%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/BusStationCommonItem.kt (92%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/BusSwitchLineActivity.kt (93%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/BusSwitchLineView.java (68%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/ShuttleTapPositionView.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/ShuttleTrafficDataView.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/adapter/OpenItemAnimator.java (99%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/adapter/SwitchLineAdapter.kt (96%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/adapter/SwitchLineTaskAdapter.kt (89%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/writeoff/WriteOffView.kt (95%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/ui/writeoff/WriteOffViewModel.kt (93%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/util/BusAnalyticsManager.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/util/BusSendTripInfoManager.kt (97%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/util/BusTrajectoryManager.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/util/ShuttleVoiceManager.kt (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/view/BizMapView.kt (96%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/view/BusArcView.java (98%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/view/NoTouchConstraintLayout.java (96%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/view/SlidePanelView.java (99%) rename OCH/shuttle/driver/src/main/java/com/mogo/och/{bus => shuttle}/view/VerticalDashLineView.java (98%) rename OCH/shuttle/driver/src/main/res/layout/{fragment_och_bus.xml => shuttle_fragment_och.xml} (96%) rename OCH/shuttle/driver/src/main/res/layout/{bus_no_data_common_view.xml => shuttle_no_data_common_view.xml} (100%) rename OCH/shuttle/driver/src/main/res/layout/{bus_no_line_view.xml => shuttle_no_line_view.xml} (100%) rename OCH/shuttle/driver/src/main/res/layout/{bus_stations_common_item.xml => shuttle_stations_common_item.xml} (100%) rename OCH/shuttle/driver/src/main/res/layout/{activity_bus_switch_line.xml => shuttle_switch_line.xml} (98%) rename OCH/shuttle/driver/src/main/res/layout/{bus_switch_line_list_item.xml => shuttle_switch_line_list_item.xml} (100%) rename OCH/shuttle/driver/src/main/res/layout/{bus_switch_line_list_task_item.xml => shuttle_switch_line_list_task_item.xml} (100%) rename OCH/shuttle/driver/src/main/res/layout/{bus_test_bar_view.xml => shuttle_test_bar_view.xml} (100%) diff --git a/OCH/bus/driver/build.gradle b/OCH/bus/driver/build.gradle index cf6345a3bd..a0ac3cce2e 100644 --- a/OCH/bus/driver/build.gradle +++ b/OCH/bus/driver/build.gradle @@ -19,7 +19,7 @@ android { kapt { useBuildCache = false arguments { - arg("AROUTER_MODULE_NAME", project.getName()) + arg("AROUTER_MODULE_NAME", "bus"+project.getName()) } } } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 070a0f9998..5c3a324424 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -15,7 +15,6 @@ import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Group; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.temp.EventLogout; @@ -399,7 +398,7 @@ public class BusFragment extends BaseBusTabFragment @Override public int getStationPanelViewId() { - return R.layout.fragment_och_bus; + return R.layout.bug_fragment_och; } @Override diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt index 412574bdc4..fd6f7b874e 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt @@ -42,7 +42,7 @@ class BusSwitchLineActivity : MvpActivity private lateinit var linearLayoutManager:LinearLayoutManager private val mData: MutableList = ArrayList() override fun getLayoutId(): Int { - return R.layout.activity_bus_switch_line + return R.layout.bus_switch_line } override fun createPresenter(): BusLinePresenter { diff --git a/OCH/bus/driver/src/main/res/layout/fragment_och_bus.xml b/OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml similarity index 100% rename from OCH/bus/driver/src/main/res/layout/fragment_och_bus.xml rename to OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml diff --git a/OCH/bus/driver/src/main/res/layout/activity_bus_switch_line.xml b/OCH/bus/driver/src/main/res/layout/bus_switch_line.xml similarity index 100% rename from OCH/bus/driver/src/main/res/layout/activity_bus_switch_line.xml rename to OCH/bus/driver/src/main/res/layout/bus_switch_line.xml diff --git a/OCH/bus/passenger/build.gradle b/OCH/bus/passenger/build.gradle index 8c0a84d896..485f12e541 100644 --- a/OCH/bus/passenger/build.gradle +++ b/OCH/bus/passenger/build.gradle @@ -19,7 +19,7 @@ android { kapt { useBuildCache = false arguments { - arg("AROUTER_MODULE_NAME", project.getName()) + arg("AROUTER_MODULE_NAME", "bus"+project.getName()) } } } diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle index ba54bb07a1..91540463fb 100644 --- a/OCH/charter/driver/build.gradle +++ b/OCH/charter/driver/build.gradle @@ -18,7 +18,7 @@ android { kapt { useBuildCache = false arguments { - arg("AROUTER_MODULE_NAME", project.getName()) + arg("AROUTER_MODULE_NAME", "charter"+project.getName()) } } } diff --git a/OCH/charter/passenger/build.gradle b/OCH/charter/passenger/build.gradle index ef7833ad2b..7a15a65798 100644 --- a/OCH/charter/passenger/build.gradle +++ b/OCH/charter/passenger/build.gradle @@ -19,7 +19,7 @@ android { kapt { useBuildCache = false arguments { - arg("AROUTER_MODULE_NAME", project.getName()) + arg("AROUTER_MODULE_NAME", "charter"+project.getName()) } } } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt index 9a1bd6526a..5eb06f58d4 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPresenter.kt @@ -3,6 +3,7 @@ package com.mogo.och.biz.login.presenter import androidx.lifecycle.LifecycleOwner import com.mogo.commons.AbsMogoApplication import com.mogo.commons.mvp.Presenter +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.RegexUtils @@ -11,6 +12,7 @@ import com.mogo.och.biz.login.callback.ITaxiLoginCallback import com.mogo.och.biz.login.ui.LoginFragment import com.mogo.och.biz.login.model.LoginModel import com.mogo.och.biz.login.model.LoginStatusDefaultModel +import com.mogo.och.common.module.biz.login.BusinessEnum import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import io.reactivex.Observable diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt index 36fcc0ab85..f58a19fd16 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt @@ -8,6 +8,7 @@ import androidx.core.content.ContextCompat import androidx.core.widget.addTextChangedListener import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.storage.SharedPrefsMgr +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -17,6 +18,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.biz.R import com.mogo.och.biz.login.callback.ILoginViewCallback import com.mogo.och.biz.login.presenter.LoginPresenter +import com.mogo.och.common.module.biz.login.BusinessEnum import com.mogo.och.common.module.utils.RxUtils import kotlinx.android.synthetic.main.biz_login_view.biz_acbtn_login import kotlinx.android.synthetic.main.biz_login_view.biz_ace_login_phone_value @@ -25,6 +27,7 @@ import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_get_code import kotlinx.android.synthetic.main.biz_login_view.biz_actv_login_show_sn import kotlinx.android.synthetic.main.biz_login_view.biz_actv_welcome_login_title import kotlinx.android.synthetic.main.biz_login_view.biz_cl_driver_main +import kotlinx.android.synthetic.main.biz_login_view.bv_switch_business import kotlinx.android.synthetic.main.biz_login_view.eiv_Info @@ -107,6 +110,10 @@ class LoginFragment : MvpFragment(), ILoginView } } biz_actv_login_show_sn.text = SharedPrefsMgr.getInstance().sn + biz_actv_login_show_sn.setOnLongClickListener { + bv_switch_business.selectBusniess() + true + } RxUtils.createSubscribe(10_000) { CallerLogger.d(TAG,"宽度${biz_cl_driver_main.width}----${biz_cl_driver_main.height}----${biz_cl_driver_main.visibility}") } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt index b8b0f63bc1..f2f1ea14d0 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt @@ -1,13 +1,16 @@ package com.mogo.och.biz.login.ui import com.mogo.commons.mvp.MvpFragment +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.biz.R import com.mogo.och.biz.login.callback.ILoginViewCallback import com.mogo.och.biz.login.presenter.LoginPassengerPresenter +import kotlinx.android.synthetic.main.biz_login_passenger_view.biz_actv_login_show_sn import kotlinx.android.synthetic.main.biz_login_passenger_view.biz_cl_passenger_main +import kotlinx.android.synthetic.main.biz_login_passenger_view.bv_switch_business /** @@ -33,6 +36,11 @@ class LoginPassengerFragment : MvpFragment { + swtichBusiness(BusinessEnum.Shuttle) + } + + "bus" -> { + swtichBusiness(BusinessEnum.Bus) + } + + "taxi" -> { + swtichBusiness(BusinessEnum.Taxi) + } + + "charter" -> { + swtichBusiness(BusinessEnum.Charter) + } + + else -> {} + } + } + }else { + visibility = VISIBLE + actv_business_shuttle.visibility = GONE + actv_business_bus.visibility = GONE + actv_business_taxi.visibility = GONE + actv_business_charter.visibility = GONE + FunctionBuildConfig.supportBusiness.forEach { + when (it) { + "shuttle" -> { + actv_business_shuttle.visibility = VISIBLE + } + + "bus" -> { + actv_business_bus.visibility = VISIBLE + } + + "taxi" -> { + actv_business_taxi.visibility = VISIBLE + } + + "charter" -> { + actv_business_charter.visibility = VISIBLE + } + + else -> {} + } + } + } + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + +} \ No newline at end of file diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessViewModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessViewModel.kt new file mode 100644 index 0000000000..abaae395da --- /dev/null +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessViewModel.kt @@ -0,0 +1,42 @@ +package com.mogo.och.biz.login.ui.debugview + +import androidx.lifecycle.ViewModel +import com.mogo.commons.AbsMogoApplication +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.biz.R +import com.mogo.och.common.module.utils.RxUtils +import io.reactivex.Observable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.Disposable +import io.reactivex.schedulers.Schedulers +import java.util.concurrent.TimeUnit + +class BusinessViewModel : ViewModel() { + + private val TAG = BusinessViewModel::class.java.simpleName + + private var viewCallback: IErrorInfoViewCallback? = null + + + + init { + + } + + fun setDistanceCallback(viewCallback: IErrorInfoViewCallback) { + this.viewCallback = viewCallback + } + + override fun onCleared() { + super.onCleared() + this.viewCallback = null + + } + + interface IErrorInfoViewCallback { + + } + + +} \ No newline at end of file diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt index 542223e24f..e19ff9e096 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt @@ -7,6 +7,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.och.biz.R +import com.mogo.och.biz.login.ui.debugview.BusinessViewModel import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_countdown diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoViewModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoViewModel.kt index e0a03da75d..c6b63e532d 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoViewModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoViewModel.kt @@ -5,6 +5,7 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.biz.R +import com.mogo.och.biz.login.ui.debugview.BusinessViewModel import com.mogo.och.common.module.utils.RxUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -14,7 +15,7 @@ import java.util.concurrent.TimeUnit class ErrorInfoViewModel : ViewModel() { - private val TAG = ErrorInfoViewModel::class.java.simpleName + private val TAG = BusinessViewModel::class.java.simpleName private var viewCallback: IErrorInfoViewCallback? = null diff --git a/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml new file mode 100644 index 0000000000..b9b315631e --- /dev/null +++ b/OCH/common/biz/src/main/res/layout/biz_login_business_view.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view.xml index 317c8a65fa..401cecdabc 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view.xml @@ -6,4 +6,26 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/layout/biz_login_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_view.xml index 530b02862d..35f5c015b6 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_view.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_view.xml @@ -138,5 +138,15 @@ android:layout_width="@dimen/dp_939" android:layout_height="@dimen/dp_710"/> + + \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt index 1e6c4843f3..2a81a65c64 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/constant/OchCommonConst.kt @@ -30,22 +30,22 @@ class OchCommonConst { const val BIZ_LOGIN = "/ochbiz/common/login" - const val BUS_DRIVER = "/bus/driver" - const val BUS_PASSENGER = "/bus/passenger" + const val BUS_DRIVER = "/bus/busdriver" + const val BUS_PASSENGER = "/bus/buspassenger" - const val CHARTER_DRIVER = "/charter/driver" - const val CHARTER_PASSENGER = "/charter/passenger" + const val CHARTER_DRIVER = "/charter/charterdriver" + const val CHARTER_PASSENGER = "/charter/charterpassenger" - const val SHUTTLE_DRIVER = "/shuttle/driver" - const val SHUTTLE_PASSENGER = "/shuttle/passenger" + const val SHUTTLE_DRIVER = "/shuttle/shuttledriver" + const val SHUTTLE_PASSENGER = "/shuttle/shuttlepassenger" - const val SWEEPER_DRIVER = "/sweeper/driver" + const val SWEEPER_DRIVER = "/sweeper/sweeperdriver" - const val TAXI_DRIVER = "/taxi/driver" - const val TAXI_PASSENGER = "/taxi/passenger" + const val TAXI_DRIVER = "/taxi/taxidriver" + const val TAXI_PASSENGER = "/taxi/taxipassenger" - const val TAXI_UNMANNED_DRIVER = "/taxiunman/driver" - const val TAXI_UNMANNED_PASSENGER = "/taxiunman/passenger" + const val TAXI_UNMANNED_DRIVER = "/taxiunman/taxiunmandriver" + const val TAXI_UNMANNED_PASSENGER = "/taxiunman/taxiunmanpassenger" const val BUSINESS_STRING = 100 diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/ILoginCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/ILoginCallback.java index 4f9c821b3d..c8427ea07f 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/ILoginCallback.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/ILoginCallback.java @@ -8,5 +8,6 @@ public interface ILoginCallback { default void onStatusChange(LoginStatusEnum currentStatus){} default void onBusinessChange(BusinessEnum businessEnum){} + default void onBusinessChangeDebug(BusinessEnum businessEnum){} } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt index 5847941b4c..b17020348b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt @@ -95,6 +95,12 @@ object LoginStatusManager : CallerBase() { listener.onBusinessChange(currentStatus) } } + fun invokeLBusinessTypeChangeDebug(currentStatus: BusinessEnum) { + M_LISTENERS.forEach { + val listener = it.value + listener.onBusinessChangeDebug(currentStatus) + } + } @JvmStatic fun checkBusiness(businessType: Int):Boolean { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt index ed94bbfba7..2340e93050 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/interceptor/FRetryWithTime.kt @@ -1,7 +1,10 @@ package com.mogo.och.common.module.biz.network.interceptor import com.mogo.cloud.passport.MoGoAiCloudClient +import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.biz.login.LoginStatusEnum import io.reactivex.Observable @@ -16,7 +19,9 @@ class FRetryWithTime : Function> { MoGoAiCloudClient.getInstance().refreshToken() return Observable.error(OchCommonRetryException()) }else if(it.code == 1003){ - LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout) + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout) + } } } return Observable.just(baseData) diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index fc91c5a423..7b2021f9cf 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -21,12 +21,10 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.login.BusinessEnum import com.mogo.och.common.module.biz.login.ILoginCallback import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.biz.login.LoginStatusManager.queryLoginStatusByNet import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager import com.mogo.och.common.module.utils.ProjectUtils -import org.greenrobot.eventbus.EventBus /** * 网约车小巴业务实现入口 @@ -40,9 +38,9 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { private var commonService: CommonService? = null override fun init(context: Context) { d(TAG, "FacadeProvider:init") + LoginStatusManager.addListener(TAG, this) if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ - LoginStatusManager.addListener(TAG, this) - queryLoginStatusByNet() + LoginStatusManager.queryLoginStatusByNet() } } @@ -149,6 +147,19 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { } } + override fun onBusinessChangeDebug(businessEnum: BusinessEnum) { + onBusinessChange(businessEnum) + val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager + val fragment = getFragment() + + d(TAG, "切换 fragment:${fragment}") + + if (supportFragmentManager != null) { + val back = supportFragmentManager.beginTransaction() + back.replace(containerId, fragment, fragment.tag) + back.commit() + } + } private fun injectStatusBar() { activity?.let { diff --git a/OCH/shuttle/driver/build.gradle b/OCH/shuttle/driver/build.gradle index 741bb87e63..9d0078f8e6 100644 --- a/OCH/shuttle/driver/build.gradle +++ b/OCH/shuttle/driver/build.gradle @@ -19,7 +19,7 @@ android { kapt { useBuildCache = false arguments { - arg("AROUTER_MODULE_NAME", project.getName()) + arg("AROUTER_MODULE_NAME", "shuttle"+project.getName()) } } } diff --git a/OCH/shuttle/driver/src/main/AndroidManifest.xml b/OCH/shuttle/driver/src/main/AndroidManifest.xml index 76856fd226..d77be24a42 100644 --- a/OCH/shuttle/driver/src/main/AndroidManifest.xml +++ b/OCH/shuttle/driver/src/main/AndroidManifest.xml @@ -1,16 +1,16 @@ + package="com.mogo.och.shuttle"> - + - diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ShuttleDriverProvider.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt similarity index 86% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ShuttleDriverProvider.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt index 56aeb29158..261f28685b 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ShuttleDriverProvider.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ShuttleDriverProvider.kt @@ -1,13 +1,12 @@ -package com.mogo.och.bus +package com.mogo.och.shuttle import android.content.Context import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route 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.fragment.ShuttleFragment +import com.mogo.och.shuttle.fragment.ShuttleFragment import com.mogo.och.common.module.biz.constant.OchCommonConst -import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.biz.provider.CommonServiceImpl /** diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java similarity index 93% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java index 14346ad51a..7854aa0e07 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusCloseTaskRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.och.common.module.utils.DateTimeUtil; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOperationStatusRequest.java similarity index 95% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOperationStatusRequest.java index 11b865f15c..2b45d47011 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOperationStatusRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOperationStatusRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java index 85c3a1da58..4a4230ccd6 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrderBean.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrderBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; /** * @author congtaowang diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java similarity index 92% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java index 2215a298a5..03a2b23b96 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusOrdersResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusOrdersResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java similarity index 90% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java index f6c9828873..0f3cd777ea 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineStationsRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java similarity index 89% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java index 4911c3cf99..fbf8f22c3b 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLineTaskResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java similarity index 94% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java index 17540e3eed..a5ad54daa8 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryLinesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryWriteOffPassengersResponse.java similarity index 86% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryWriteOffPassengersResponse.java index 36a5e3b409..0d1139ee93 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusQueryWriteOffPassengersResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusQueryWriteOffPassengersResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java similarity index 93% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java index 75432c7782..ef6cdbda93 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetDrivingLineRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.och.common.module.utils.DateTimeUtil; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetLineStatusRequest.java similarity index 91% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetLineStatusRequest.java index e3642a892e..24bdcb8a59 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusResetLineStatusRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusResetLineStatusRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutePlanningUpdateReqBean.java similarity index 95% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutePlanningUpdateReqBean.java index 080e7d47bd..598b8c8ef5 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutePlanningUpdateReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import java.util.List; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java similarity index 94% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java index 39d43217af..667135077b 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusRoutesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.eagle.core.data.BaseData; import com.mogo.och.data.bean.BusRoutesResult; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java similarity index 94% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java index 92f5f22ea4..13ba2e4f3c 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusUpdateSiteStatusRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusWriteOffPassengersQueryRequest.java similarity index 94% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusWriteOffPassengersQueryRequest.java index 3e41b91727..d0148f79e9 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/BusWriteOffPassengersQueryRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/BusWriteOffPassengersQueryRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/CarHeartbeatReqBean.java similarity index 82% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/CarHeartbeatReqBean.java index dcacb5e380..b1489610ea 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/CarHeartbeatReqBean.java @@ -1,6 +1,7 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; -import com.mogo.och.bus.constant.BusConst; +import com.mogo.och.shuttle.constant.BusConst; +import com.mogo.och.shuttle.constant.BusConst; import java.util.UUID; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java similarity index 95% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java index 72e5a3a68f..8c13428bff 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersRequest.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java index 98105058b8..b11ba9329b 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/QueryLeaveAwayPassengersResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffCountResponse.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java similarity index 85% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffCountResponse.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java index c34204a1b1..b8eaa7e68d 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffCountResponse.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffCountResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java similarity index 89% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java index dd9f9f67c6..624c296d9f 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.shuttle.bean; import java.io.Serializable; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java similarity index 85% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java index 186fc0b5f4..8a59bcb206 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusADASStatusCallback.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusADASStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.callback; +package com.mogo.och.shuttle.callback; /** * Created on 2021/9/8 diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java similarity index 91% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java index 8e4528feba..2e3a71fff3 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.callback; +package com.mogo.och.shuttle.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java similarity index 63% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java index 8250b337c5..f52a9c7454 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IBusLinesCallback.java @@ -1,7 +1,7 @@ -package com.mogo.och.bus.callback; +package com.mogo.och.shuttle.callback; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; +import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse; +import com.mogo.och.shuttle.bean.BusQueryLinesResponse; /** * @author: wangmingjun diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java similarity index 93% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java index 4f28bf76b9..14e30a34fa 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/IRefreshBusStationsCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.callback; +package com.mogo.och.shuttle.callback; import com.mogo.och.data.bean.BusStationBean; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java similarity index 76% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java index 16e6893135..6acad8a540 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/callback/ISlidePannelHideCallback.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/callback/ISlidePannelHideCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.callback; +package com.mogo.och.shuttle.callback; /** * @author: wangmingjun diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt index d62d02cebe..0c68d7b5e0 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.constant +package com.mogo.och.shuttle.constant import com.mogo.commons.debug.DebugConfig diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseShuttleTabFragment.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java index 65df210214..2287d8a8e5 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseShuttleTabFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java @@ -1,6 +1,6 @@ -package com.mogo.och.bus.fragment; +package com.mogo.och.shuttle.fragment; -import static com.mogo.och.bus.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL; +import static com.mogo.och.shuttle.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL; import android.animation.ObjectAnimator; import android.os.Bundle; @@ -41,12 +41,12 @@ import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.och.bus.R; -import com.mogo.och.bus.ui.ShuttleTrafficDataView; -import com.mogo.och.bus.view.BizMapView; +import com.mogo.och.shuttle.R; +import com.mogo.och.shuttle.ui.ShuttleTrafficDataView; +import com.mogo.och.shuttle.view.BizMapView; import com.mogo.och.data.bean.BusRoutesResult; -import com.mogo.och.bus.model.OrderModel; -import com.mogo.och.bus.view.SlidePanelView; +import com.mogo.och.shuttle.model.OrderModel; +import com.mogo.och.shuttle.view.SlidePanelView; import com.mogo.och.common.module.utils.SoundPoolHelper; import org.greenrobot.eventbus.EventBus; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/ShuttleFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/ShuttleFragment.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java index 1f2532228a..a5981c29a6 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/ShuttleFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.fragment; +package com.mogo.och.shuttle.fragment; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; import static com.mogo.map.MogoMap.DEFAULT; @@ -15,7 +15,6 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Group; import androidx.annotation.Nullable; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.temp.EventLogout; @@ -29,13 +28,13 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.map.overlay.IMoGoOverlayManager; import com.mogo.map.overlay.core.Level; import com.mogo.map.overlay.point.Point; -import com.mogo.och.bus.R; +import com.mogo.och.shuttle.R; import com.mogo.och.data.bean.BusStationBean; -import com.mogo.och.bus.constant.BusConst; -import com.mogo.och.bus.presenter.BusPresenter; -import com.mogo.och.bus.ui.BusStationCommonItem; -import com.mogo.och.bus.ui.BusSwitchLineActivity; -import com.mogo.och.bus.view.SlidePanelView; +import com.mogo.och.shuttle.constant.BusConst; +import com.mogo.och.shuttle.presenter.BusPresenter; +import com.mogo.och.shuttle.ui.BusStationCommonItem; +import com.mogo.och.shuttle.ui.BusSwitchLineActivity; +import com.mogo.och.shuttle.view.SlidePanelView; import com.mogo.och.common.module.utils.BlinkAnimationUtil; import com.mogo.och.common.module.utils.OCHThreadPoolManager; import com.mogo.och.common.module.utils.QRUtilsKt; @@ -406,7 +405,7 @@ public class ShuttleFragment extends BaseShuttleTabFragment private lateinit var linearLayoutManager:LinearLayoutManager private val mData: MutableList = ArrayList() override fun getLayoutId(): Int { - return R.layout.activity_bus_switch_line + return R.layout.shuttle_switch_line } override fun createPresenter(): BusLinePresenter { @@ -80,7 +80,7 @@ class BusSwitchLineActivity : MvpActivity ) mLinesListView.setAdapter(mAdapter) //设置item 点击事件 - mAdapter.setOnLineItemClickListener(object :SwitchLineAdapter.LineItemClickListener{ + mAdapter.setOnLineItemClickListener(object : SwitchLineAdapter.LineItemClickListener{ override fun onItemClick(position: Int, close: Boolean) { mPresenter?.queryBusLineTasks(mData[position].lineId, position, close) } @@ -146,7 +146,7 @@ class BusSwitchLineActivity : MvpActivity finish() } - override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int,autoRefresh:Boolean) { + override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int, autoRefresh:Boolean) { val result = mData[position] if (result.taskList == null) { result.taskList = ArrayList() diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java similarity index 68% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java index 6646068909..5a4d85d312 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/BusSwitchLineView.java @@ -1,8 +1,8 @@ -package com.mogo.och.bus.ui; +package com.mogo.och.shuttle.ui; import com.mogo.commons.mvp.IView; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; +import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse; +import com.mogo.och.shuttle.bean.BusQueryLinesResponse; /** * @author: wangmingjun diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTapPositionView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTapPositionView.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTapPositionView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTapPositionView.java index 12ba52cda7..bf24d1bb0b 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTapPositionView.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTapPositionView.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.ui; +package com.mogo.och.shuttle.ui; import android.content.Context; import android.content.res.TypedArray; @@ -12,7 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; -import com.mogo.och.bus.R; +import com.mogo.och.shuttle.R; import org.jetbrains.annotations.NotNull; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTrafficDataView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTrafficDataView.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTrafficDataView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTrafficDataView.java index 56c48321b4..199114506c 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/ShuttleTrafficDataView.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/ShuttleTrafficDataView.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.ui; +package com.mogo.och.shuttle.ui; import static com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING; @@ -24,9 +24,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisBrakeStateListen import com.mogo.eagle.core.function.call.autopilot.CallerChassisGearStateListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerChassisThrottleStateListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager; -import com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView; import com.mogo.eagle.core.utilcode.util.ThreadUtils; -import com.mogo.och.bus.R; +import com.mogo.och.shuttle.R; import org.jetbrains.annotations.NotNull; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java similarity index 99% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java index 71e18d6523..bc8596d255 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/OpenItemAnimator.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.ui.adapter; +package com.mogo.och.shuttle.ui.adapter; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt similarity index 96% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt index 0bf345177a..19738350eb 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.ui.adapter +package com.mogo.och.shuttle.ui.adapter import android.content.Context import android.view.LayoutInflater @@ -9,9 +9,9 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.mogo.och.bus.R -import com.mogo.och.bus.bean.BusQueryLinesResponse -import com.mogo.och.bus.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder +import com.mogo.och.shuttle.R +import com.mogo.och.shuttle.bean.BusQueryLinesResponse +import com.mogo.och.shuttle.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder import kotlin.text.StringBuilder /** @@ -33,7 +33,7 @@ class SwitchLineAdapter( viewType: Int ): SwitchLineViewHolder { val view = LayoutInflater.from(mContext).inflate( - R.layout.bus_switch_line_list_item, parent, false + R.layout.shuttle_switch_line_list_item, parent, false ) return SwitchLineViewHolder(view) } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt similarity index 89% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt index 8183e0efd4..95d5badfb8 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/adapter/SwitchLineTaskAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.ui.adapter +package com.mogo.och.shuttle.ui.adapter import android.content.Context import android.view.LayoutInflater @@ -7,9 +7,9 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.utilcode.util.TimeUtils -import com.mogo.och.bus.R -import com.mogo.och.bus.bean.BusQueryLineTaskResponse -import com.mogo.och.bus.ui.adapter.SwitchLineTaskAdapter.SwitchLineTaskViewHolder +import com.mogo.och.shuttle.R +import com.mogo.och.shuttle.bean.BusQueryLineTaskResponse +import com.mogo.och.shuttle.ui.adapter.SwitchLineTaskAdapter.SwitchLineTaskViewHolder /** * 路线列表adapter @@ -22,7 +22,7 @@ class SwitchLineTaskAdapter( ) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SwitchLineTaskViewHolder { val view = LayoutInflater.from(mContext).inflate( - R.layout.bus_switch_line_list_task_item, parent, false + R.layout.shuttle_switch_line_list_task_item, parent, false ) return SwitchLineTaskViewHolder(view) } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffView.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt similarity index 95% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffView.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt index 2f877f4691..b0d7b3851a 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffView.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.ui.writeoff +package com.mogo.och.shuttle.ui.writeoff import android.content.Context import android.util.AttributeSet @@ -7,7 +7,7 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner -import com.mogo.och.bus.R +import com.mogo.och.shuttle.R import kotlinx.android.synthetic.main.shuttle_wirte_off_view.view.tv_write_off_count class WriteOffView : ConstraintLayout, WriteOffViewModel.IwriteOffViewCallback { diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffViewModel.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt similarity index 93% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffViewModel.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt index 95e4f4993d..27953a4012 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/ui/writeoff/WriteOffViewModel.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/ui/writeoff/WriteOffViewModel.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.ui.writeoff +package com.mogo.och.shuttle.ui.writeoff import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.bus.R -import com.mogo.och.bus.model.TicketModel +import com.mogo.och.shuttle.R +import com.mogo.och.shuttle.model.TicketModel import com.mogo.och.common.module.utils.RxUtils import io.reactivex.Observable import io.reactivex.Observer diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java index 789e8491fd..1f6e7b3bb7 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusAnalyticsManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.util; +package com.mogo.och.shuttle.util; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; @@ -13,7 +13,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.bus.constant.BusConst; +import com.mogo.och.shuttle.constant.BusConst; import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager; import java.util.HashMap; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt similarity index 97% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt index b4da61f56f..51fb81a0d0 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusSendTripInfoManager.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.util +package com.mogo.och.shuttle.util import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java index 5648ab04c3..8eb07704f4 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusTrajectoryManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.util; +package com.mogo.och.shuttle.util; import androidx.annotation.Nullable; @@ -8,8 +8,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager; import com.mogo.och.data.bean.BusRoutesResult; -import com.mogo.och.bus.constant.BusConst; -import com.mogo.och.bus.model.OrderModel; +import com.mogo.och.shuttle.constant.BusConst; +import com.mogo.och.shuttle.model.OrderModel; import com.mogo.och.common.module.biz.login.LoginStatusManager; import java.util.concurrent.TimeUnit; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/ShuttleVoiceManager.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/ShuttleVoiceManager.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt index dc23049d05..76198fdd0f 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/ShuttleVoiceManager.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/ShuttleVoiceManager.kt @@ -1,10 +1,10 @@ -package com.mogo.och.bus.util +package com.mogo.och.shuttle.util import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.och.bus.R +import com.mogo.och.shuttle.R import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.tts.base.LangTtsEntity import com.mogo.tts.base.LanguageType diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt similarity index 96% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt index fcb1ba9c23..d396c664ca 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BizMapView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.view +package com.mogo.och.shuttle.view import android.content.Context import android.os.Bundle @@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.view.MapBizView import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.IMogoMapUIController -import com.mogo.och.bus.R +import com.mogo.och.shuttle.R /** * 魔戒蓝牙控件 diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BusArcView.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BusArcView.java index 5be7429728..dc62425463 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BusArcView.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/BusArcView.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.view; +package com.mogo.och.shuttle.view; import android.animation.ValueAnimator; import android.content.Context; @@ -15,7 +15,7 @@ import android.view.View; import androidx.annotation.Nullable; -import com.mogo.och.bus.R; +import com.mogo.och.shuttle.R; /** * created by wujifei on 2021/3/24 16:20 diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/NoTouchConstraintLayout.java similarity index 96% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/NoTouchConstraintLayout.java index 558a515bd9..b797efe5a8 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/NoTouchConstraintLayout.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/NoTouchConstraintLayout.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.view; +package com.mogo.och.shuttle.view; import android.content.Context; import android.util.AttributeSet; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java similarity index 99% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java index 1c6a0823bc..5bfa6e6264 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/SlidePanelView.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/SlidePanelView.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.view; +package com.mogo.och.shuttle.view; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; @@ -26,7 +26,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ConvertUtils; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.bus.R; +import com.mogo.och.shuttle.R; import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager; import me.jessyan.autosize.AutoSizeConfig; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java similarity index 98% rename from OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java rename to OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java index 250d4a41b6..2b0fdfcf6d 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/VerticalDashLineView.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/view/VerticalDashLineView.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.view; +package com.mogo.och.shuttle.view; import android.content.Context; import android.graphics.Canvas; diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml index f1ec45407e..c4c99a87b4 100644 --- a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml +++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/dp_72"> - @@ -29,7 +29,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"> - @@ -206,7 +206,7 @@ - - - - - - diff --git a/OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_item.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_switch_line_list_item.xml similarity index 100% rename from OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_item.xml rename to OCH/shuttle/driver/src/main/res/layout/shuttle_switch_line_list_item.xml diff --git a/OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_task_item.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_switch_line_list_task_item.xml similarity index 100% rename from OCH/shuttle/driver/src/main/res/layout/bus_switch_line_list_task_item.xml rename to OCH/shuttle/driver/src/main/res/layout/shuttle_switch_line_list_task_item.xml diff --git a/OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_test_bar_view.xml similarity index 100% rename from OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml rename to OCH/shuttle/driver/src/main/res/layout/shuttle_test_bar_view.xml diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_traffic_data.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_traffic_data.xml index abbad9395d..9b81f97808 100644 --- a/OCH/shuttle/driver/src/main/res/layout/shuttle_traffic_data.xml +++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_traffic_data.xml @@ -45,7 +45,7 @@ app:layout_constraintRight_toRightOf="@+id/speedImage" app:layout_constraintTop_toTopOf="parent" /> - // 匹配flavor对应的 json - println "对比${flavorNames.toLowerCase()}---------${key}---${value}" + println "${env}____ 对比${flavorNames.toLowerCase()}---------${key}---${value}" if(flavorNames.toLowerCase().contains("${env}${key.toLowerCase()}")){ getKey = key println "对比结果${flavorNames.toLowerCase()}---------${key}"