From d6ac2ad37d2d97851483d8bb0f82c31daec128e9 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 24 Aug 2023 15:13:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[6.0.0]=20[charter]=20[=E5=8C=85=E8=BD=A6?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E4=B8=9A=E5=8A=A1=E5=90=90=E5=8F=B8?= =?UTF-8?q?=E5=AE=9A=E5=88=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/charter/net/DriverM1ServiceManager.kt | 4 + .../passenger/model/CharterPassengerModel.kt | 23 +++-- .../net/BusPassengerServiceManager.kt | 4 +- .../presenter/BusPassengerPresenter.kt | 21 ++--- .../mogo/och/bus/passenger/ui/MainFragment.kt | 6 +- .../ui/bottom/impl/GoViewWithArrive.kt | 12 +-- .../passenger/ui/bottom/impl/StopSiteView.kt | 8 +- .../bus/passenger/ui/debugview/DebugView.kt | 5 +- .../ui/orderinfo/OrderInfoViewModel.kt | 6 +- .../passenger/ui/selectline/SelectLineView.kt | 2 - .../ui/selectline/SelectLineViewModel.kt | 24 ++--- .../adapter/OrderSiteItemAdapter.kt | 6 +- .../ui/softcontrol/SoftControlView.kt | 14 +-- .../ui/softcontrol/SoftControlViewModel.kt | 22 ++--- .../passenger/ui/video/ConsultVideoPlayer.kt | 6 +- .../video/adapter/RecyclerVideoAdapter.java | 6 +- .../bus/passenger/utils/ToastCharterUtils.kt | 66 -------------- .../module/biz/model/OchCommonLoginModel.kt | 17 ++-- .../biz/model/OchCommonLoginStatusModel.java | 9 +- .../biz/presenter/OchCommonLoginPresenter.kt | 10 +- .../manager/AbnormalFactorsLoopManager.kt | 8 +- .../debug/DebugViewWatchDogFragment.kt | 6 +- .../LightAirconditionDoorManager.kt | 7 +- .../map/AmapNaviToDestinationModel.java | 54 ++++++----- .../common/module/utils/ToastUtilsOch.java | 10 +- .../module/wigets/toast/ToastCharterUtils.kt | 91 +++++++++++++++++++ .../module/wigets}/toast/ToastCharterView.kt | 4 +- .../res/drawable/charter_p_toast_shape.xml | 2 +- .../main/res/layout/charter_p_view_toast.xml | 3 +- .../src/main/res/values/colors.xml | 2 + .../utilcode/mogo/AppIdentityModeUtils.kt | 16 +++- .../eagle/core/utilcode/util/ToastUtils.java | 10 ++ 32 files changed, 269 insertions(+), 215 deletions(-) delete mode 100644 OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ToastCharterUtils.kt create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt rename OCH/{charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui => mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets}/toast/ToastCharterView.kt (87%) rename OCH/{charter/passenger => mogo-och-common-module}/src/main/res/drawable/charter_p_toast_shape.xml (77%) rename OCH/{charter/passenger => mogo-och-common-module}/src/main/res/layout/charter_p_view_toast.xml (89%) diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt index dc2c462b1d..7ea6311112 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt @@ -16,6 +16,10 @@ import com.mogo.och.common.module.utils.DateTimeUtil */ object DriverM1ServiceManager { + init { + + } + private val mDriverM1ServiceApi: IDriverM1Service = MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create( IDriverM1Service::class.java diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 5df3061500..48e2d99355 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -12,7 +12,6 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLi import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLonLat import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener -import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.startAutoPilot @@ -31,7 +30,7 @@ import com.mogo.och.bus.passenger.callback.* import com.mogo.och.bus.passenger.constant.CharterPassengerConst import com.mogo.och.common.module.manager.loopmanager.BizLoopManager import com.mogo.och.bus.passenger.net.BusPassengerServiceManager -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.bus.passenger.utils.VoiceFocusManager import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg @@ -196,7 +195,7 @@ object CharterPassengerModel { super.onAutopilotGuardian(guardianInfo) guardianInfo?.let { if (it.code=="IMAP_TRA_LOADED") { - ToastCharterUtils.showShort("请等待车辆完成掉头后再出发吧～") + ToastCharterUtils.showToastShort("请等待车辆完成掉头后再出发吧～") } } } @@ -349,7 +348,7 @@ object CharterPassengerModel { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("$code:$msg") + ToastCharterUtils.showToastShort("$code:$msg") } }) } @@ -478,7 +477,7 @@ object CharterPassengerModel { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("$code:$msg") + ToastCharterUtils.showToastShort("$code:$msg") } }) } @@ -585,7 +584,7 @@ object CharterPassengerModel { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("$code:$msg") + ToastCharterUtils.showToastShort("$code:$msg") } }) } @@ -609,7 +608,7 @@ object CharterPassengerModel { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("$code:$msg") + ToastCharterUtils.showToastShort("$code:$msg") } }) } @@ -890,7 +889,7 @@ object CharterPassengerModel { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("$code:$msg") + ToastCharterUtils.showToastShort("$code:$msg") broadcastList[requestIngSign] = false } @@ -1027,7 +1026,7 @@ object CharterPassengerModel { */ fun startAutopilot() { if (!OCHAdasAbilityManager.getInstance().autopilotAbilityStatus) { - ToastCharterUtils.showLong( + ToastCharterUtils.showToastLong( OCHAdasAbilityManager.getInstance().autopilotUnAbilityReason + ", 请稍候重试" ) @@ -1035,19 +1034,19 @@ object CharterPassengerModel { } orderInfo?.let { if (it.arriveStatus == OrderInfoResponse.ARRIVED) { - ToastCharterUtils.showLong("已到达目的地请重新选择线路") + ToastCharterUtils.showToastLong("已到达目的地请重新选择线路") return } val parameters = initAutopilotControlParameters() if (null == parameters) { - ToastCharterUtils.showShort("请选择站点") + ToastCharterUtils.showToastShort("请选择站点") e( SceneConstant.M_BUS + TAG, "行程日志-AutopilotControlParameters is empty." ) return } - ToastCharterUtils.showShort("启动自动驾驶中") + ToastCharterUtils.showToastShort("启动自动驾驶中") cleanRoutePoints() startAutoPilot(parameters) d( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt index 624775a776..41245d7a80 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt @@ -7,7 +7,7 @@ import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.och.bus.passenger.bean.request.ArriveDestRequest import com.mogo.och.bus.passenger.bean.request.EndOrderRequest import com.mogo.och.bus.passenger.bean.response.* -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl @@ -39,7 +39,7 @@ object BusPassengerServiceManager { private fun beforeNet():Boolean{ if (draiverSn.isBlank()) { - ToastCharterUtils.showShort("已断开司机屏连接、请联系安全员") + ToastCharterUtils.showToastShort("已断开司机屏连接、请联系安全员") return true } return false diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 7475455919..7909cfbd60 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -28,7 +28,6 @@ import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener import com.mogo.och.bus.passenger.model.OrderStatusEnum import com.mogo.och.bus.passenger.receive.DriverMessage import com.mogo.och.bus.passenger.ui.MainFragment -import com.mogo.och.bus.passenger.utils.ToastCharterUtils import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteName import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteNamewithCheck import com.mogo.och.common.module.biz.network.OchCommonServiceCallback @@ -36,6 +35,7 @@ import com.mogo.och.common.module.manager.StopSideStatusManager import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.voice.VoiceNotice +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import me.jessyan.autosize.utils.AutoSizeUtils import java.util.concurrent.ConcurrentHashMap @@ -61,7 +61,6 @@ class BusPassengerPresenter(view: MainFragment?) : CallerTelematicListenerManager.addListener(TAG, DriverMessage) StopSideStatusManager.addListener(TAG, this) setCarChangeListener(R.raw.m1) - } override fun onDestroy(owner: LifecycleOwner) { @@ -114,11 +113,11 @@ class BusPassengerPresenter(view: MainFragment?) : OrderStatusEnum.NoOrderUse -> { when (CallerAutoPilotStatusListenerManager.getState()) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastCharterUtils.showShort("设备未就绪请稍等，请安全员主动停止车辆") + ToastCharterUtils.showToastShort("设备未就绪请稍等，请安全员主动停止车辆") } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - ToastCharterUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") + ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { @@ -127,7 +126,7 @@ class BusPassengerPresenter(view: MainFragment?) : } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请安全员主动停止车辆") + ToastCharterUtils.showToastShort("因车辆正在平行驾驶中无法靠边停车，请安全员主动停止车辆") } else -> {} @@ -184,7 +183,7 @@ class BusPassengerPresenter(view: MainFragment?) : UiThreadHandler.post { when (actionStatus) { StopSideStatusManager.Status.NOSTART -> { - ToastCharterUtils.showShort(errorInfo?:"") + ToastCharterUtils.showToastShort(errorInfo?:"") } StopSideStatusManager.Status.START -> { @@ -199,7 +198,7 @@ class BusPassengerPresenter(view: MainFragment?) : } StopSideStatusManager.Status.EndingSuccess -> { - ToastCharterUtils.showShort("靠边停车成功") + ToastCharterUtils.showToastShort("靠边停车成功") VoiceNotice.showNotice( context.getString(R.string.m1_stop_site_success), AIAssist.LEVEL0 @@ -207,7 +206,7 @@ class BusPassengerPresenter(view: MainFragment?) : } StopSideStatusManager.Status.EndingFaile -> { - ToastCharterUtils.showShort("车辆系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("车辆系统繁忙，请稍后再试") } } } @@ -216,9 +215,9 @@ class BusPassengerPresenter(view: MainFragment?) : override fun onDoorStatusCallback(isOpen: Boolean, isFirst: Boolean) { if (!isFirst) { if (isOpen) { - ToastCharterUtils.showShort("已开启车门") + ToastCharterUtils.showToastShort("已开启车门") } else { - ToastCharterUtils.showShort("已关门车门") + ToastCharterUtils.showToastShort("已关门车门") } } } @@ -247,7 +246,7 @@ class BusPassengerPresenter(view: MainFragment?) : } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("$code:$msg") + ToastCharterUtils.showToastShort("$code:$msg") } }) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index c4078a6ecf..0419ab9a6d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -30,7 +30,7 @@ import com.mogo.och.bus.passenger.ui.bottom.BottomClickView import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.biz.constant.LoginStatusManager import kotlinx.android.synthetic.main.m1_main_fragment.* import org.greenrobot.eventbus.EventBus @@ -115,11 +115,11 @@ class MainFragment : MvpFragment(), IMogo if (mPresenter?.haveOrder() == true) { } else { - ToastCharterUtils.showShort("请确认订单") + ToastCharterUtils.showToastShort("请确认订单") return true } } else { - ToastCharterUtils.showShort(requireContext().getString(R.string.m1_please_login_driver)) + ToastCharterUtils.showToastShort(requireContext().getString(R.string.m1_please_login_driver)) return true } showBizView(orderinfo = true) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt index 6176fd01f3..bdc10bfdfb 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt @@ -15,7 +15,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.ClickUtils -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.callback.ICharterPassengerAutoStatusChangeCallback import com.mogo.och.bus.passenger.model.CharterPassengerModel @@ -66,7 +66,7 @@ class GoViewWithArrive @JvmOverloads constructor( }) setOnClickListener { if (ClickUtils.isClickTooFrequent(this,3000)) { - ToastCharterUtils.showShort("请稍后点击") + ToastCharterUtils.showToastShort("请稍后点击") return@setOnClickListener } startGo() @@ -78,12 +78,12 @@ class GoViewWithArrive @JvmOverloads constructor( if (LightAirconditionDoorStatusManager.doorStatus.isOpen) { val string = AbsMogoApplication.getApp().getString(R.string.m1_close_door_and_startauto) - ToastCharterUtils.showShort(string) + ToastCharterUtils.showToastShort(string) return } when (CallerAutoPilotStatusListenerManager.getState()) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastCharterUtils.showShort("设备未就绪请稍等") + ToastCharterUtils.showToastShort("设备未就绪请稍等") } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// onceRegisterAutoStatus() @@ -94,7 +94,7 @@ class GoViewWithArrive @JvmOverloads constructor( CharterPassengerModel.leaveStation() } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") + ToastCharterUtils.showToastShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") } else -> {} } @@ -123,7 +123,7 @@ class GoViewWithArrive @JvmOverloads constructor( startAutoTimeOut = RxUtils.createSubscribe(20_000) { if (CallerAutoPilotStatusListenerManager.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { val string = AbsMogoApplication.getApp().getString(R.string.m1_start_auto_fail) - ToastCharterUtils.showLong(string) + ToastCharterUtils.showToastLong(string) } CharterPassengerModel.setAutoStatusCallback(TAG, null) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt index 1f7ca44fcb..1b2fae3cf6 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.ui.bottom.BottomClickView import com.mogo.och.common.module.utils.SoundPoolHelper @@ -31,17 +31,17 @@ class StopSiteView @JvmOverloads constructor( private fun stopSite(){ when (CallerAutoPilotStatusListenerManager.getState()) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶 - ToastCharterUtils.showShort("设备未就绪请稍等，请稍后再试") + ToastCharterUtils.showToastShort("设备未就绪请稍等，请稍后再试") } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// - ToastCharterUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请稍后再试") + ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请稍后再试") } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { // 靠边停车 CallerAutoPilotControlManager.sendPlanningCmd(1) } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") + ToastCharterUtils.showToastShort("因车辆正在平行驾驶中无法靠边停车，请稍后再试") } else -> {} } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt index 003d300a4c..e7db47ab07 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt @@ -11,12 +11,11 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.ui.debugview.DebugView import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.MainFragment import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment import kotlinx.android.synthetic.main.m1_p_debug.view.debug_arrive_dest import kotlinx.android.synthetic.main.m1_p_debug.view.debug_change_modle @@ -66,7 +65,7 @@ class DebugView @JvmOverloads constructor( fragment?.showNoviceGuidanceFragment() } debug_change_modle.setOnClickListener { - ToastCharterUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") + ToastCharterUtils.showToastShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") when (HdMapBuildConfig.currentCarVrIconRes) { R.raw.aiqinghao -> { fragment?.setCarMode(OrderInfoResponse.M1_FAMILY) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt index 941ef59c1e..b81809d67e 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.callback.ITimeCallback import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.EndOrderMsg import com.mogo.och.common.module.biz.constant.OchCommonConst @@ -68,7 +68,7 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback { CharterPassengerModel.endOrder(object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { if (null != data && 0 == data.code) { - ToastCharterUtils.showShort("结束成功") + ToastCharterUtils.showToastShort("结束成功") CharterPassengerModel.setEndOrderStatus() viewCallback?.setViewGone() val msg = EndOrderMsg( @@ -83,7 +83,7 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("$code:$msg") + ToastCharterUtils.showToastShort("$code:$msg") } }) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt index dacf920327..5608cd7df0 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt @@ -18,11 +18,9 @@ import com.mogo.och.bus.passenger.bean.event.EventLineSites import com.mogo.och.bus.passenger.bean.response.LineInfoResponse import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse import com.mogo.och.bus.passenger.callback.IClearViewCallback -import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.ui.selectline.adapter.OrderLineItemAdapter import com.mogo.och.bus.passenger.ui.selectline.adapter.OrderSiteItemAdapter import com.mogo.och.bus.passenger.ui.selectline.layoutmanage.BottomDecoration -import com.mogo.och.bus.passenger.utils.ToastCharterUtils import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.m1_order_fragment.view.aciv_driver_refuse_group diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt index c6c318859e..a8599877a8 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt @@ -20,7 +20,7 @@ import com.mogo.och.bus.passenger.model.CharterPassengerModel import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener import com.mogo.och.bus.passenger.model.OrderStatusEnum import com.mogo.och.bus.passenger.net.BusPassengerServiceManager -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg import com.mogo.och.common.module.bean.dpmsg.DPMsgType @@ -85,7 +85,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { if (msg.arriveStatus == 2) { return@post } - ToastCharterUtils.showShort("站点确定") + ToastCharterUtils.showToastShort("站点确定") viewCallback?.setEnableSiteStatus(true) checkLine = tempCheckLine checkSite = tempCheckSite @@ -98,7 +98,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { CharterPassengerModel.cleanbroadcastListInfo(checkSite) CharterPassengerModel.queryOrder() } else { - ToastCharterUtils.showShort("司机端拒绝请重新选择") + ToastCharterUtils.showToastShort("司机端拒绝请重新选择") viewCallback?.hideDataDriverRefuse() } RxUtils.disposeSubscribe(subscribeSelectSite) @@ -201,7 +201,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } override fun onFail(code: Int, msg: String) { - ToastCharterUtils.showShort("查询线路失败") + ToastCharterUtils.showToastShort("查询线路失败") viewCallback?.setVisableByTrun(showNetError = true) } @@ -214,7 +214,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { fun changeSites(siteList: MutableList) { if (!CallerTelematicManager.getClientConnStatus()) { - ToastCharterUtils.showLong("乘客屏无法连接司机屏请联系安全员") + ToastCharterUtils.showToastLong("乘客屏无法连接司机屏请联系安全员") return } val sentDataSite: MutableList = mutableListOf() @@ -249,7 +249,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { RxUtils.disposeSubscribe(subscribeSelectSite) subscribeSelectSite = RxUtils.createSubscribe(120_000) { - ToastCharterUtils.showShort("请联系安全员确认") + ToastCharterUtils.showToastShort("请联系安全员确认") viewCallback?.hideDataDriverRefuse() } } @@ -297,13 +297,13 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } override fun onFail(code: Int, msg: String?) { - ToastCharterUtils.showShort("查询站点失败") + ToastCharterUtils.showToastShort("查询站点失败") viewCallback?.setVisableByTrun(showNetError = true) } override fun onError() { super.onError() - ToastCharterUtils.showShort("查询站点失败") + ToastCharterUtils.showToastShort("查询站点失败") viewCallback?.setVisableByTrun(showNetError = true) } }) @@ -311,7 +311,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { private fun checkServerStatus() { if (!CallerTelematicManager.getClientConnStatus()) { - ToastCharterUtils.showShort("断开和司机端连接、请联系安全员") + ToastCharterUtils.showToastShort("断开和司机端连接、请联系安全员") BizLoopManager.removeLoopFunction(TAGLINELOOP) viewCallback?.hideDataDriverRefuse() CallerLogger.d( @@ -383,21 +383,21 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener { } else -> { - ToastCharterUtils.showShort("自动驾驶中无法切换线路") + ToastCharterUtils.showToastShort("自动驾驶中无法切换线路") false } } } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { - ToastCharterUtils.showShort("因车辆正在平行驾驶中无法切换线路") + ToastCharterUtils.showToastShort("因车辆正在平行驾驶中无法切换线路") return false } else -> {} } } else { - ToastCharterUtils.showShort("请停车后再修改目的地～") + ToastCharterUtils.showToastShort("请停车后再修改目的地～") return false } return true diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt index b821955fd0..8db2811dd9 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt @@ -8,7 +8,7 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.event.EventLineSites import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse @@ -95,9 +95,9 @@ class OrderSiteItemAdapter( checkChangeListener?.onCheckListener(tempInfo) } else { if (siteInfo.isNear) { - ToastCharterUtils.showShort("您已在此站点附近") + ToastCharterUtils.showToastShort("您已在此站点附近") } else { - ToastCharterUtils.showShort("站点已过，请选择返程路线") + ToastCharterUtils.showToastShort("站点已过，请选择返程路线") } } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt index 2cde65d6b2..52c5c9bdbf 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt @@ -33,7 +33,7 @@ import com.mogo.och.bus.passenger.ui.selectline.layoutmanage.PickerLayoutManager import com.mogo.och.bus.passenger.ui.softcontrol.adapter.TemperatureAdapter import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.PagerCenterSnapHelper -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.utils.SoundPoolHelper import com.mogo.och.common.module.wigets.MineGradientDrawable @@ -385,11 +385,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (leftLight) { tv_light_top_01.text = context.getString(R.string.bus_p_m1_close_light1) tv_light_top_01.isChecked = true - if (!isFirst) ToastCharterUtils.showShort("打开顶灯1") + if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯1") } else { tv_light_top_01.text = context.getString(R.string.bus_p_m1_open_light1) tv_light_top_01.isChecked = false - if (!isFirst) ToastCharterUtils.showShort("关闭顶灯1") + if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯1") } } } @@ -399,11 +399,11 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba if (rightLight) { tv_light_top_02.text = context.getString(R.string.bus_p_m1_close_light2) tv_light_top_02.isChecked = true - if (!isFirst) ToastCharterUtils.showShort("打开顶灯2") + if (!isFirst) ToastCharterUtils.showToastShort("打开顶灯2") } else { tv_light_top_02.text = context.getString(R.string.bus_p_m1_open_light2) tv_light_top_02.isChecked = false - if (!isFirst) ToastCharterUtils.showShort("关闭顶灯2") + if (!isFirst) ToastCharterUtils.showToastShort("关闭顶灯2") } } } @@ -414,12 +414,12 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_close_atmosphere) tv_light_atmosphere.isChecked = true iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_select) - if (!isFirst) ToastCharterUtils.showShort("打开氛围灯") + if (!isFirst) ToastCharterUtils.showToastShort("打开氛围灯") } else { tv_light_atmosphere.text = context.getString(R.string.bus_p_m1_open_atmosphere) tv_light_atmosphere.isChecked = false iv_bottom_light_setting.setImageResource(R.drawable.bus_p_function_atmosphere_nor) - if (!isFirst) ToastCharterUtils.showShort("关闭氛围灯") + if (!isFirst) ToastCharterUtils.showToastShort("关闭氛围灯") } } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt index 79735a6e23..8a27bf082d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt @@ -5,7 +5,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager import com.mogo.och.common.module.manager.devicemanage.data.AirconditionStatus @@ -146,7 +146,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(airconditionDisposable) airconditionDisposable = RxUtils.createSubscribe(10000) { if (!LightAirconditionDoorStatusManager.airconditionStatus.isOpen && LightAirconditionDoorStatusManager.airconditionStatus.windSpeed != windSpeedCmd && LightAirconditionDoorStatusManager.airconditionStatus.temperature != temperatureCmd && LightAirconditionDoorStatusManager.airconditionStatus.pattert != modeCmd) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } @@ -159,7 +159,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(airconditionDisposable) airconditionDisposable = RxUtils.createSubscribe(10000) { if (LightAirconditionDoorStatusManager.airconditionStatus.isOpen) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } @@ -173,7 +173,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(heaterDisposable) heaterDisposable = RxUtils.createSubscribe(10000) { if (!LightAirconditionDoorStatusManager.heaterStatue.isOpen && LightAirconditionDoorStatusManager.heaterStatue.windSpeed != windSpeedCmd) { - ToastCharterUtils.showShort("暖风机操作未生效，请稍后重试吧～") + ToastCharterUtils.showToastShort("暖风机操作未生效，请稍后重试吧～") } } } @@ -184,7 +184,7 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { RxUtils.disposeSubscribe(heaterDisposable) heaterDisposable = RxUtils.createSubscribe(10000) { if (LightAirconditionDoorStatusManager.heaterStatue.isOpen) { - ToastCharterUtils.showShort("暖风机操作未生效，请稍后重试吧～")//还是开着的 + ToastCharterUtils.showToastShort("暖风机操作未生效，请稍后重试吧～")//还是开着的 } } } @@ -196,14 +196,14 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(1) RxUtils.createSubscribe { if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } else { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp1Cmd(2) RxUtils.createSubscribe { if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight1) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } @@ -216,14 +216,14 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(1) RxUtils.createSubscribe { if (!LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } else { CallerAutoPilotControlManager.sendRoboBusJinlvM1MainLamp2Cmd(2) RxUtils.createSubscribe { if (LightAirconditionDoorStatusManager.lightStatus.isOpenLight2) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } @@ -236,14 +236,14 @@ class SoftControlViewModel : ViewModel(), LightAirconditionDoorCallback { CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(1) RxUtils.createSubscribe { if (!LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } else { CallerAutoPilotControlManager.sendRoboBusJinlvM1SmallLampCmd(2) RxUtils.createSubscribe { if (LightAirconditionDoorStatusManager.lightStatus.isOpenatmosphere) { - ToastCharterUtils.showShort("控制系统繁忙，请稍后再试") + ToastCharterUtils.showToastShort("控制系统繁忙，请稍后再试") } } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt index d24717d35e..bb8dae89a9 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt @@ -18,7 +18,7 @@ import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.app.ActivityCompat import com.mogo.eagle.core.utilcode.util.TimeTransformUtils -import com.mogo.och.bus.passenger.utils.ToastCharterUtils +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.utils.FullVideoUtils @@ -141,7 +141,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun setStateAndUi(state: Int) { super.setStateAndUi(state) if(state==CURRENT_STATE_PLAYING_BUFFERING_START){ - ToastCharterUtils.showShort("加载中请稍等") + ToastCharterUtils.showToastShort("加载中请稍等") } } @@ -267,7 +267,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { override fun onError(what: Int, extra: Int) { super.onError(what, extra) mThumbImageViewLayout?.visibility = View.VISIBLE - ToastCharterUtils.showLong("哎呀，出错了，看看其他视频吧") + ToastCharterUtils.showToastLong("哎呀，出错了，看看其他视频吧") currentTime = -1 if(isIfCurrentIsFullscreen){ smalllPlayer?.clearFullscreenLayout(this) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java index b9a9eec122..fd7710714a 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.mogo.och.bus.passenger.utils.ToastCharterUtils; +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils; import com.mogo.och.bus.passenger.R; import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay; import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack; @@ -102,12 +102,12 @@ public class RecyclerVideoAdapter extends RecyclerView.Adapter { queryCarStatus(); @@ -106,9 +107,9 @@ public abstract class OchCommonLoginStatusModel { @Override public void onError() { if (!NetworkUtils.isConnected(mContext)) { - ToastUtils.showShort(mContext.getString(R.string.network_error_tip)); + ToastCharterUtils.showToastShort(mContext.getString(R.string.network_error_tip)); } else { - ToastUtils.showShort(mContext.getString(R.string.request_error_tip)); + ToastCharterUtils.showToastShort(mContext.getString(R.string.request_error_tip)); } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt index 4f607084b2..784d7f3e43 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/presenter/OchCommonLoginPresenter.kt @@ -6,11 +6,11 @@ import com.mogo.commons.mvp.Presenter 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 -import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.R -import com.mogo.och.common.module.biz.ui.TaxiLoginDialogFragment import com.mogo.och.common.module.biz.callback.ITaxiLoginCallback import com.mogo.och.common.module.biz.model.OchCommonLoginModel +import com.mogo.och.common.module.biz.ui.TaxiLoginDialogFragment +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable @@ -42,7 +42,7 @@ class OchCommonLoginPresenter(view: TaxiLoginDialogFragment?) : initListeners() } if (!RegexUtils.isMobileExact(phone)) { - ToastUtils.showShort(R.string.module_och_taxi_login_phone_error) + ToastCharterUtils.showToastShort(R.string.module_och_taxi_login_phone_error) mView?.inputPhoneError() return } @@ -98,12 +98,12 @@ class OchCommonLoginPresenter(view: TaxiLoginDialogFragment?) : initListeners() } if (!RegexUtils.isMobileExact(phone)) { - ToastUtils.showShort(R.string.module_och_taxi_login_phone_error) + ToastCharterUtils.showToastShort(R.string.module_och_taxi_login_phone_error) mView?.inputPhoneError() return } if(code.isBlank()||code.length<4){ - ToastUtils.showShort(R.string.module_och_taxi_login_code_error) + ToastCharterUtils.showToastShort(R.string.module_och_taxi_login_code_error) return } mView?.closeSoftInput() diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt index 3ac45bea20..76db0f8f1c 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/AbnormalFactorsLoopManager.kt @@ -9,8 +9,8 @@ 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.i import com.mogo.eagle.core.utilcode.util.NetworkUtils -import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.utils.PermissionUtil +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable @@ -36,9 +36,9 @@ object AbnormalFactorsLoopManager : IMogoStatusChangedListener { return@observable } if (newValue) { - ToastUtils.showLong("长链接状态恢复") + ToastCharterUtils.showToastLong("长链接状态恢复") } else { - ToastUtils.showLong("长链接异常，请开启相应权限或者查看网络") + ToastCharterUtils.showToastLong("长链接异常，请开启相应权限或者查看网络") } } @@ -88,7 +88,7 @@ object AbnormalFactorsLoopManager : IMogoStatusChangedListener { i(TAG, "abnormal_factors_Str = $toastStr") if (!FunctionBuildConfig.isDemoMode && toastStr !== "") { - ToastUtils.showLong(toastStr + "请开启相应权限或者查看网络") + ToastCharterUtils.showToastLong(toastStr + "请开启相应权限或者查看网络") } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt index 51ddc897f0..b7eeafedee 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/debug/DebugViewWatchDogFragment.kt @@ -17,8 +17,8 @@ import com.mogo.eagle.core.utilcode.util.AppStateManager import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.KeyboardUtils -import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.R +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import kotlinx.android.synthetic.main.m1_debugview_pass.* /** @@ -43,7 +43,7 @@ class DebugViewWatchDogFragment : actv_password_submit.setOnClickListener { val text = acet_close.text if(text==null||text.isEmpty()){ - ToastUtils.showShort("请输入密码") + ToastCharterUtils.showToastShort("请输入密码") }else{ if(text.toString() == "123987"){ dismissAllowingStateLoss() @@ -52,7 +52,7 @@ class DebugViewWatchDogFragment : } ToggleDebugView.toggleDebugView.toggle(requireContext()) }else{ - ToastUtils.showShort("请输入正确密码") + ToastCharterUtils.showToastShort("请输入正确密码") } } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt index 01262dba66..4db99d75e8 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt @@ -8,6 +8,7 @@ import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg import com.mogo.och.common.module.manager.LanSocketManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import io.reactivex.disposables.Disposable object LightAirconditionDoorManager { @@ -19,7 +20,7 @@ object LightAirconditionDoorManager { fun go2OpenDoor(go2Open:Boolean){ val canOpenOrCloseDoor = canOpenOrCloseDoor() if(!canOpenOrCloseDoor.isNullOrBlank()){ - ToastUtils.showLong(canOpenOrCloseDoor) + ToastCharterUtils.showToastLong(canOpenOrCloseDoor) return } RxUtils.disposeSubscribe(dooorSubscribe) @@ -35,7 +36,7 @@ object LightAirconditionDoorManager { doorStatusSubscribe = RxUtils.createSubscribe(6000) { if (LightAirconditionDoorStatusManager.doorStatus.isOpen) { if(!go2Open) {// 关门失败 - ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") + ToastCharterUtils.showToastShort("车辆系统繁忙，稍后再试试吧～") VoiceNotice.showNotice( "车辆系统繁忙，稍后再试试吧～", AIAssist.LEVEL0 @@ -44,7 +45,7 @@ object LightAirconditionDoorManager { } }else{ if(go2Open) {//开门失败 - ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～") + ToastCharterUtils.showToastShort("车辆系统繁忙，稍后再试试吧～") VoiceNotice.showNotice( "车辆系统繁忙，稍后再试试吧～", AIAssist.LEVEL0 diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index c730bdd54a..95758c90a9 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -24,8 +24,8 @@ import com.amap.api.navi.model.NaviInfo; import com.amap.api.navi.model.NaviLatLng; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; -import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.common.module.utils.PermissionUtil; +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils; import java.util.ArrayList; import java.util.List; @@ -47,6 +47,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { private ICommonNaviChangedCallback mNaviChangedCallback; private AtomicInteger errorCount = new AtomicInteger(0); private boolean isPlay; + public static AmapNaviToDestinationModel getInstance(Context context) { mContext = context; return SingletonHolder.INSTANCE; @@ -55,25 +56,28 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { private static final class SingletonHolder { private static final AmapNaviToDestinationModel INSTANCE = new AmapNaviToDestinationModel(); } - private AmapNaviToDestinationModel(){ + + private AmapNaviToDestinationModel() { } - public void initAMapNavi(NaviLatLng startLatLng,NaviLatLng endLatLng) { + + public void initAMapNavi(NaviLatLng startLatLng, NaviLatLng endLatLng) { try { mAMapNavi = AMapNavi.getInstance(mContext); mAMapNavi.addAMapNaviListener(this); mAMapNavi.setUseInnerVoice(true, true); sList.add(startLatLng); eList.add(endLatLng); - }catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } } - public void setVoiceIsMute(boolean isPlay){ + + public void setVoiceIsMute(boolean isPlay) { if (mAMapNavi == null) return; this.isPlay = isPlay; - if (isPlay){ + if (isPlay) { mAMapNavi.startSpeak(); - }else { + } else { mAMapNavi.stopSpeak(); } } @@ -82,8 +86,8 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { return mAMapNavi; } - public void destroyAmaNavi(){ - if (mAMapNavi != null){ + public void destroyAmaNavi() { + if (mAMapNavi != null) { isPlay = false; sList.clear(); eList.clear(); @@ -94,9 +98,10 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { } } - public void setOCHTaciNaviChangedCallback(ICommonNaviChangedCallback callback){ + public void setOCHTaciNaviChangedCallback(ICommonNaviChangedCallback callback) { this.mNaviChangedCallback = callback; } + @Override public void onInitNaviFailure() { Toast.makeText(mContext, "init navi Failed", Toast.LENGTH_SHORT).show(); @@ -126,6 +131,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { } mAMapNavi.calculateDriveRoute(sList, eList, mWayPointList, strategy); } + @Override public void onCalculateRouteSuccess(int[] ints) { //多路径算路成功回调 @@ -135,9 +141,9 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { @Override public void onNaviInfoUpdate(NaviInfo naviinfo) { //导航过程中的信息更新，请看NaviInfo的具体说明 - if (null != mNaviChangedCallback){ + if (null != mNaviChangedCallback) { CallerLogger.i(M_TAXI + TAG, "距离=" + naviinfo.getPathRetainDistance() + ", 剩余时间 " + naviinfo.getPathRetainTime()); - mNaviChangedCallback.onCurrentNaviDistAndTimeChanged(naviinfo.getPathRetainDistance(),naviinfo.getPathRetainTime());// 米、秒 + mNaviChangedCallback.onCurrentNaviDistAndTimeChanged(naviinfo.getPathRetainDistance(), naviinfo.getPathRetainTime());// 米、秒 } } @@ -150,23 +156,23 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void onCalculateRouteFailure(AMapCalcRouteResult result) { //路线计算失败 //多路径算路成功回调 - if (errorCount.get() < 5){ + if (errorCount.get() < 5) { errorCount.getAndIncrement(); - if (mNaviChangedCallback != null){ - mNaviChangedCallback.reInitNaviAmap(isPlay,true); + if (mNaviChangedCallback != null) { + mNaviChangedCallback.reInitNaviAmap(isPlay, true); } } - if (!NetworkUtils.isConnected(mContext) || result.getErrorCode() == 2){ - ToastUtils.showShort("网络异常，请重试"); - if (mNaviChangedCallback != null){ - mNaviChangedCallback.reInitNaviAmap(isPlay,false); + if (!NetworkUtils.isConnected(mContext) || result.getErrorCode() == 2) { + ToastCharterUtils.showToastShort("网络异常，请重试"); + if (mNaviChangedCallback != null) { + mNaviChangedCallback.reInitNaviAmap(isPlay, false); } return; } - if (!PermissionUtil.isLocServiceEnable(mContext) || !PermissionUtil.checkPermission(mContext,new String[]{Manifest.permission.ACCESS_FINE_LOCATION})){ - ToastUtils.showShort("请开启车机定位后重试"); - if (mNaviChangedCallback != null){ - mNaviChangedCallback.reInitNaviAmap(isPlay,false); + if (!PermissionUtil.isLocServiceEnable(mContext) || !PermissionUtil.checkPermission(mContext, new String[]{Manifest.permission.ACCESS_FINE_LOCATION})) { + ToastCharterUtils.showToastShort("请开启车机定位后重试"); + if (mNaviChangedCallback != null) { + mNaviChangedCallback.reInitNaviAmap(isPlay, false); } return; } @@ -174,6 +180,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { CallerLogger.i(M_TAXI + TAG, "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail()); CallerLogger.i(M_TAXI + TAG, "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/"); } + @Override public void onStartNavi(int type) { //开始导航回调 @@ -233,6 +240,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void onGpsOpenStatus(boolean enabled) { //GPS开关状态回调 } + @Override public void showModeCross(AMapModelCross aMapModelCross) { } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java index cdfe46ed50..248eb054cb 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/ToastUtilsOch.java @@ -4,7 +4,7 @@ import android.content.Context; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.utilcode.util.NetworkUtils; -import com.mogo.eagle.core.utilcode.util.ToastUtils; +import com.mogo.och.common.module.wigets.toast.ToastCharterUtils; public class ToastUtilsOch { @@ -17,9 +17,9 @@ public class ToastUtilsOch { return; } if (DebugConfig.isDebug()) { - ToastUtils.showShort(code+","+message); + ToastCharterUtils.showToastShort(code+","+message); }else { - ToastUtils.showShort(message); + ToastCharterUtils.showToastShort(message); } } @@ -36,9 +36,9 @@ public class ToastUtilsOch { public static void toastRequestError(Context context,String failMsg){ if (!NetworkUtils.isConnected(context)) { - ToastUtils.showShort("网络异常，请稍后重试"); + ToastCharterUtils.showToastShort("网络异常，请稍后重试"); }else { - ToastUtils.showShort(failMsg); + ToastCharterUtils.showToastShort(failMsg); } } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt new file mode 100644 index 0000000000..8c903b4b0e --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterUtils.kt @@ -0,0 +1,91 @@ +package com.mogo.och.common.module.wigets.toast + +import android.view.Gravity +import android.view.View +import androidx.annotation.StringRes +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import me.jessyan.autosize.utils.AutoSizeUtils + +object ToastCharterUtils { + const val TAG = "ToastCharterUtils" + + private val toastUtils = ToastUtils().setGravity(Gravity.CENTER, 0, 0) + + @JvmStatic + fun showToastLong(toastText: String){ + if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) { + showCharterLongToast(toastText) + }else{ + ToastUtils.showLong(toastText) + } + } + + @JvmStatic + fun showToastShort(toastText: String?){ + toastText?.let { + if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) { + showCharterShortToast(toastText) + }else{ + ToastUtils.showShort(toastText) + } + } + } + + @JvmStatic + fun showToastShort(@StringRes resId: Int, vararg args: Any?) { + val string = StringUtils.getString(resId, args) + string?.let { + showToastShort(it) + } + } + @JvmStatic + fun showToastShort(@StringRes resId: Int) { + val string = StringUtils.getString(resId) + string?.let { + showToastShort(it) + } + } + + + fun showCharterLongToast(toastText: String) { + val context = ActivityUtils.getTopActivity() + val marker = ToastCharterView(context) + marker.setText(toastText) + marker.measure( + View.MeasureSpec.makeMeasureSpec( + AutoSizeUtils.dp2px(context, 145f), + View.MeasureSpec.UNSPECIFIED + ), + View.MeasureSpec.makeMeasureSpec( + AutoSizeUtils.dp2px(context, 34f), + View.MeasureSpec.EXACTLY + ) + ) + marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight) + ToastUtils.showLongWithmarker(marker, toastUtils) + } + + private fun showCharterShortToast(toastText: String?) { + toastText?.let { + val context = ActivityUtils.getTopActivity() + val marker = ToastCharterView(context) + marker.setText(toastText) + marker.measure( + View.MeasureSpec.makeMeasureSpec( + AutoSizeUtils.dp2px(context, 145f), + View.MeasureSpec.UNSPECIFIED + ), + View.MeasureSpec.makeMeasureSpec( + AutoSizeUtils.dp2px(context, 34f), + View.MeasureSpec.EXACTLY + ) + ) + marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight) + ToastUtils.showShortWithmarker(marker, toastUtils) + } + } +} \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/toast/ToastCharterView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterView.kt similarity index 87% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/toast/ToastCharterView.kt rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterView.kt index b566f20f10..27807b3950 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/toast/ToastCharterView.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/toast/ToastCharterView.kt @@ -1,10 +1,10 @@ -package com.mogo.och.bus.passenger.ui.toast +package com.mogo.och.common.module.wigets.toast import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.och.bus.passenger.R +import com.mogo.och.common.module.R import kotlinx.android.synthetic.main.charter_p_view_toast.view.* class ToastCharterView @JvmOverloads constructor( diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_toast_shape.xml b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_toast_shape.xml similarity index 77% rename from OCH/charter/passenger/src/main/res/drawable/charter_p_toast_shape.xml rename to OCH/mogo-och-common-module/src/main/res/drawable/charter_p_toast_shape.xml index bfa4b479b1..144a69aabe 100644 --- a/OCH/charter/passenger/src/main/res/drawable/charter_p_toast_shape.xml +++ b/OCH/mogo-och-common-module/src/main/res/drawable/charter_p_toast_shape.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_view_toast.xml b/OCH/mogo-och-common-module/src/main/res/layout/charter_p_view_toast.xml similarity index 89% rename from OCH/charter/passenger/src/main/res/layout/charter_p_view_toast.xml rename to OCH/mogo-och-common-module/src/main/res/layout/charter_p_view_toast.xml index 4dc65ef199..c917038edb 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_view_toast.xml +++ b/OCH/mogo-och-common-module/src/main/res/layout/charter_p_view_toast.xml @@ -17,9 +17,8 @@ android:paddingTop="@dimen/dp_16" android:paddingEnd="@dimen/dp_31" android:paddingBottom="@dimen/dp_16" - android:textColor="@color/bus_p_m1_203555" + android:textColor="@color/common_203555" android:textSize="25dp" - android:layout_marginBottom="@dimen/dp_76" tools:text="18" /> diff --git a/OCH/mogo-och-common-module/src/main/res/values/colors.xml b/OCH/mogo-och-common-module/src/main/res/values/colors.xml index b000f93cfe..0755fb7f2c 100644 --- a/OCH/mogo-och-common-module/src/main/res/values/colors.xml +++ b/OCH/mogo-och-common-module/src/main/res/values/colors.xml @@ -20,4 +20,6 @@ #E0EFFF #B8C2D7 #B8C2D8 + #203555 + #B3EFF6FF \ No newline at end of file diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt index 21feb6cae6..5cadfe79a4 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt @@ -32,6 +32,7 @@ object AppIdentityModeUtils { // 身份 private const val DRIVER = "Driver" private const val PASSENGER = "Passenger" + // 业务 private const val TAXI = "Taxi" private const val BUS = "Bus" @@ -45,7 +46,6 @@ object AppIdentityModeUtils { private const val JL = "JL" - private fun getInfo(appIdentityMode: String): Array { val split = appIdentityMode.split("_") if (split.size == 3) { @@ -56,7 +56,7 @@ object AppIdentityModeUtils { fun getBuildCarType(appIdentityMode: String): String { val (_, _, carType) = getInfo(appIdentityMode) - if(carType.isNotEmpty()){ + if (carType.isNotEmpty()) { return carType } return "" @@ -121,6 +121,7 @@ object AppIdentityModeUtils { } return false } + /** * 是否是 接驳车（这里不细分具体是：司机、乘客等类型） * @@ -131,6 +132,7 @@ object AppIdentityModeUtils { fun isShuttlePassenger(appIdentityMode: String): Boolean { return isShuttle(appIdentityMode) && isPassenger(appIdentityMode) } + @JvmStatic fun isM2(appIdentityMode: String): Boolean { val (_, _, model) = getInfo(appIdentityMode) @@ -241,6 +243,12 @@ object AppIdentityModeUtils { } return false } + + @JvmStatic + fun isCharterPassenger(appIdentityMode: String): Boolean { + return isCharter(appIdentityMode) && isPassenger(appIdentityMode) + } + @JvmStatic fun isM1(appIdentityMode: String): Boolean { val (_, _, model) = getInfo(appIdentityMode) @@ -262,8 +270,8 @@ object AppIdentityModeUtils { } } - enum class Product{ - BUS,TAXI,SWEEPER,SHUTTLE,CHARTER + enum class Product { + BUS, TAXI, SWEEPER, SHUTTLE, CHARTER } } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java index 400f3e021d..d054476dec 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ToastUtils.java @@ -464,6 +464,13 @@ public final class ToastUtils { } } + public static void showShortWithmarker(@Nullable final View view,@Nullable final ToastUtils marker) { + if(view!=null){ + show(view, Toast.LENGTH_SHORT, marker); + }else { + + } + } /** * Show the toast for a short period of time. * @@ -471,6 +478,9 @@ public final class ToastUtils { public static void showLong(@Nullable final View view) { show(view, Toast.LENGTH_LONG, DEFAULT_MAKER); } + public static void showLongWithmarker(@Nullable final View view,@Nullable final ToastUtils marker) { + show(view, Toast.LENGTH_LONG, marker); + } /** From 46dba71113e3cedbdc8506211d66b8f736f39847 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 24 Aug 2023 15:17:15 +0800 Subject: [PATCH 2/5] [6.0.0] [bugfix] [init AdasAbility in charter] --- .../magic/mogo/och/charter/presenter/DriverM1Presenter.kt | 3 +++ .../och/bus/passenger/presenter/BusPassengerPresenter.kt | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt index 085738af28..9350749c85 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt @@ -9,6 +9,7 @@ import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback import com.magic.mogo.och.charter.fragment.DriverM1Fragment import com.magic.mogo.och.charter.manager.CharterTrajectoryManager import com.magic.mogo.och.charter.model.DriverM1Model +import com.mogo.commons.AbsMogoApplication import com.mogo.commons.mvp.Presenter import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener @@ -21,6 +22,7 @@ import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean import com.mogo.och.common.module.biz.callback.ILoginCallback import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.OPERATION_ROAD_SIDE_TYPE import com.mogo.och.common.module.biz.constant.LoginStatusManager.isLogin +import com.mogo.och.common.module.manager.OCHAdasAbilityManager import com.mogo.och.common.module.manager.StopSideStatusManager import com.mogo.och.common.module.utils.DateTimeUtil import mogo.telematics.pad.MessagePad @@ -41,6 +43,7 @@ class DriverM1Presenter(view: DriverM1Fragment?) : init { DriverM1Model.get().init(context) + OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp()) registerListener() } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index 7909cfbd60..3eb1a6e49d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -6,6 +6,7 @@ import android.graphics.Canvas import android.view.View import androidx.lifecycle.LifecycleOwner import com.amap.api.maps.model.LatLng +import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager @@ -31,6 +32,7 @@ import com.mogo.och.bus.passenger.ui.MainFragment import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteName import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteNamewithCheck import com.mogo.och.common.module.biz.network.OchCommonServiceCallback +import com.mogo.och.common.module.manager.OCHAdasAbilityManager import com.mogo.och.common.module.manager.StopSideStatusManager import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil @@ -52,6 +54,10 @@ class BusPassengerPresenter(view: MainFragment?) : } + init { + OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp()) + } + override fun onCreate(owner: LifecycleOwner) { super.onCreate(owner) CharterPassengerModel.init() From 92ef7c1c371c01c97c0a65e8c38c92d58545885a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 24 Aug 2023 17:43:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[6.0.0]=20[charter]=20[=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=8C=85=E5=90=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/src/main/AndroidManifest.xml | 2 +- .../passenger/bean/event/EventLineSites.kt | 6 --- .../bus/passenger/ui/debugview/DebugEvent.kt | 3 -- .../passenger/MogoOCHBusPassenger.kt | 12 ++--- .../bean/TaxiPassengerVideoPlay.java | 2 +- .../passenger/bean/Temperature.kt | 2 +- .../passenger/bean/event/EventLineSites.kt | 6 +++ .../bean/request/ArriveDestRequest.kt | 2 +- .../request/BusPassengerQueryLineRequest.java | 2 +- .../passenger/bean/request/EndOrderRequest.kt | 2 +- .../bean/response/BusinessStatusResponse.kt | 2 +- .../bean/response/BusinessTimeResponse.kt | 2 +- .../bean/response/LineInfoListResponse.kt | 2 +- .../bean/response/LineInfoResponse.kt | 2 +- .../passenger/bean/response/LocusResponse.kt | 2 +- .../response/M1DriverLoginStatusResponse.kt | 2 +- .../bean/response/OrderInfoResponse.kt | 2 +- .../bean/response/SiteInfoResponse.kt | 2 +- .../bean/response/TrajectoriesResponse.kt | 2 +- ...IBusPassengerControllerStatusCallback.java | 2 +- ...harterPassengerAutoStatusChangeCallback.kt | 2 +- .../passenger/callback/IClearViewCallback.kt | 2 +- .../passenger/callback/IDistanceCallback.kt | 2 +- .../callback/IOrderChangeCallback.kt | 2 +- .../passenger/callback/ITimeCallback.kt | 2 +- .../constant/CharterPassengerConst.kt | 2 +- .../passenger/model/CharterPassengerModel.kt | 14 +++--- .../passenger/model/OrderStatusEnum.kt | 2 +- .../net/BusPassengerServiceManager.kt | 8 ++-- .../passenger/net/PassengerServiceApi.kt | 8 ++-- ...BusBasePassengerFunctionDevicePresenter.kt | 4 +- .../BusPassengerCarUseAndNoOrderPresenter.kt | 4 +- .../presenter/BusPassengerPresenter.kt | 28 +++++------ ...CharterPassengerNoviceGuidancePresenter.kt | 8 ++-- .../passenger/provider/StatusViewManager.java | 5 +- .../passenger/receive/DriverMessage.kt | 8 ++-- .../passenger/ui/MainFragment.kt | 20 ++++---- .../passenger/ui/bottom/BottomBar.kt | 4 +- .../passenger/ui/bottom/BottomCheckView.kt | 4 +- .../passenger/ui/bottom/BottomClickView.kt | 4 +- .../ui/bottom/BottomOrderInfoView.kt | 12 ++--- .../passenger/ui/bottom/impl/CloseDoorView.kt | 6 +-- .../ui/bottom/impl/GoViewWithArrive.kt | 10 ++-- .../passenger/ui/bottom/impl/OpenDoorView.kt | 6 +-- .../passenger/ui/bottom/impl/StopSiteView.kt | 6 +-- .../passenger/ui/debugview/DebugEvent.kt | 3 ++ .../passenger/ui/debugview/DebugView.kt | 12 ++--- .../M1CarUserNoOrderFragment.kt | 6 +-- .../dialogfragment/NoviceGuidanceFragment.kt | 12 ++--- .../passenger/ui/itinerary/ItineraryView.kt | 4 +- .../ui/itinerary/ItineraryViewModel.kt | 12 ++--- .../ui/lockview/LockAndUnlockView.kt | 4 +- .../passenger/ui/lockview/LockManager.kt | 2 +- .../ui/lockview/LockViewConstrainLayout.kt | 4 +- .../passenger/ui/lockview/UnlockView.kt | 4 +- .../passenger/ui/orderinfo/OrderInfoView.kt | 6 +-- .../ui/orderinfo/OrderInfoViewModel.kt | 6 +-- .../ui/overmapview/MakerWithSiteName.kt | 4 +- .../passenger/ui/selectline/SelectLineView.kt | 22 ++++----- .../ui/selectline/SelectLineViewModel.kt | 18 +++---- .../adapter/OrderLineItemAdapter.kt | 6 +-- .../adapter/OrderSiteItemAdapter.kt | 8 ++-- .../layoutmanage/BottomDecoration.java | 2 +- .../layoutmanage/PickerLayoutManager.java | 4 +- .../ui/softcontrol/SoftControlView.kt | 47 +++++++++++-------- .../ui/softcontrol/SoftControlViewModel.kt | 2 +- .../adapter/TemperatureAdapter.java | 7 +-- .../layoutmanage/CarouselLayoutManager.java | 2 +- .../CarouselZoomPostLayoutListener.java | 2 +- .../layoutmanage/CenterScrollListener.java | 2 +- .../layoutmanage/HorizontalDecoration.java | 5 +- .../layoutmanage/ItemTransformation.java | 2 +- .../layoutmanage/PagerCenterSnapHelper.kt | 2 +- .../ui/softcontrol/view/DrawBitmapView.kt | 4 +- .../ui/softcontrol/view/DrawableCheckBox.java | 2 +- .../passenger/ui/statusbar/M1BlueToothView.kt | 4 +- .../passenger/ui/statusbar/StatusBarView.kt | 6 +-- .../passenger/ui/video/ConsultVideoPlayer.kt | 6 +-- .../passenger/ui/video/VideoView.kt | 47 +++++++++++-------- .../adapter/RecyclerItemVideoHolder.java | 6 +-- .../video/adapter/RecyclerVideoAdapter.java | 6 +-- .../utils/BusPassengerMapAssetStyleUtil.java | 2 +- .../passenger/utils/FullVideoUtils.kt | 4 +- .../passenger/utils/VoiceFocusManager.kt | 2 +- .../passenger/utils/ZoomDrawable.kt | 2 +- .../src/main/res/layout/m1_bottom_bar.xml | 14 +++--- .../main/res/layout/m1_contain_fragment.xml | 2 +- .../src/main/res/layout/m1_main_fragment.xml | 22 ++++----- .../src/main/res/layout/m1_soft_fragment.xml | 4 +- .../res/layout/m1_statusview_datetime.xml | 2 +- .../src/main/res/layout/m1_video_item.xml | 2 +- .../main/res/layout/orderinfo_fragment.xml | 2 +- 92 files changed, 300 insertions(+), 281 deletions(-) delete mode 100644 OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt delete mode 100644 OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugEvent.kt rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/MogoOCHBusPassenger.kt (82%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/TaxiPassengerVideoPlay.java (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/Temperature.kt (62%) create mode 100644 OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/event/EventLineSites.kt rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/request/ArriveDestRequest.kt (61%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/request/BusPassengerQueryLineRequest.java (79%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/request/EndOrderRequest.kt (53%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/BusinessStatusResponse.kt (83%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/BusinessTimeResponse.kt (84%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/LineInfoListResponse.kt (73%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/LineInfoResponse.kt (83%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/LocusResponse.kt (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/M1DriverLoginStatusResponse.kt (90%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/OrderInfoResponse.kt (98%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/SiteInfoResponse.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/bean/response/TrajectoriesResponse.kt (90%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/callback/IBusPassengerControllerStatusCallback.java (87%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt (84%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/callback/IClearViewCallback.kt (53%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/callback/IDistanceCallback.kt (66%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/callback/IOrderChangeCallback.kt (84%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/callback/ITimeCallback.kt (61%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/constant/CharterPassengerConst.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/model/CharterPassengerModel.kt (99%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/model/OrderStatusEnum.kt (93%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/net/BusPassengerServiceManager.kt (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/net/PassengerServiceApi.kt (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt (86%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt (66%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/presenter/BusPassengerPresenter.kt (93%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt (88%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/provider/StatusViewManager.java (81%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/receive/DriverMessage.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/MainFragment.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/BottomBar.kt (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/BottomCheckView.kt (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/BottomClickView.kt (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/BottomOrderInfoView.kt (91%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/impl/CloseDoorView.kt (83%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/impl/GoViewWithArrive.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/impl/OpenDoorView.kt (83%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/bottom/impl/StopSiteView.kt (92%) create mode 100644 OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugEvent.kt rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/debugview/DebugView.kt (92%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/itinerary/ItineraryView.kt (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/itinerary/ItineraryViewModel.kt (90%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/lockview/LockAndUnlockView.kt (98%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/lockview/LockManager.kt (98%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/lockview/LockViewConstrainLayout.kt (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/lockview/UnlockView.kt (98%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/orderinfo/OrderInfoView.kt (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/orderinfo/OrderInfoViewModel.kt (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/overmapview/MakerWithSiteName.kt (90%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/selectline/SelectLineView.kt (92%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/selectline/SelectLineViewModel.kt (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/selectline/layoutmanage/BottomDecoration.java (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/SoftControlView.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/SoftControlViewModel.kt (99%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/adapter/TemperatureAdapter.java (92%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java (99%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java (95%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java (87%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/view/DrawBitmapView.kt (94%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/softcontrol/view/DrawableCheckBox.java (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/statusbar/M1BlueToothView.kt (91%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/statusbar/StatusBarView.kt (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/video/ConsultVideoPlayer.kt (99%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/video/VideoView.kt (75%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/video/adapter/RecyclerItemVideoHolder.java (80%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/ui/video/adapter/RecyclerVideoAdapter.java (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/utils/BusPassengerMapAssetStyleUtil.java (97%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/utils/FullVideoUtils.kt (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/utils/VoiceFocusManager.kt (96%) rename OCH/charter/passenger/src/main/java/com/mogo/och/{bus => charter}/passenger/utils/ZoomDrawable.kt (94%) diff --git a/OCH/charter/passenger/src/main/AndroidManifest.xml b/OCH/charter/passenger/src/main/AndroidManifest.xml index e0687231c1..e40c8b4775 100644 --- a/OCH/charter/passenger/src/main/AndroidManifest.xml +++ b/OCH/charter/passenger/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.och.charter.passenger"> \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt deleted file mode 100644 index beb65c2882..0000000000 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/event/EventLineSites.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.mogo.och.bus.passenger.bean.event - -import com.mogo.och.bus.passenger.bean.response.LineInfoResponse -import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse - -data class EventLineSites(val lineInfo: LineInfoResponse.LineInfo?, val sites: List?, val clear:Boolean=false) \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugEvent.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugEvent.kt deleted file mode 100644 index 4a48f3dc2e..0000000000 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.mogo.och.bus.passenger.ui.debugview - -data class DebugEvent(val type: String) \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt similarity index 82% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt index b61064656a..c42743199f 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/MogoOCHBusPassenger.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger +package com.mogo.och.charter.passenger import android.content.Context import androidx.fragment.app.Fragment @@ -10,8 +10,8 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIC import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.bus.passenger.constant.CharterPassengerConst -import com.mogo.och.bus.passenger.ui.MainFragment +import com.mogo.och.charter.passenger.constant.CharterPassengerConst +import com.mogo.och.charter.passenger.ui.MainFragment /** * 网约车-Bus-乘客端 @@ -46,7 +46,7 @@ class MogoOCHBusPassenger : IMoGoFunctionProvider { val supportFragmentManager: FragmentManager? = mActivity?.supportFragmentManager if (mPassengerFragment == null) { - d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======") + d(SceneConstant.M_TAXI_P + com.mogo.och.charter.passenger.MogoOCHBusPassenger.Companion.TAG, "准备add fragment======") var fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(MainFragment.TAG) mPassengerFragment = if (fragmentByTag is MainFragment){ fragmentByTag @@ -60,7 +60,7 @@ class MogoOCHBusPassenger : IMoGoFunctionProvider { } return } - d(SceneConstant.M_TAXI_P + TAG, "准备show fragment") + d(SceneConstant.M_TAXI_P + com.mogo.och.charter.passenger.MogoOCHBusPassenger.Companion.TAG, "准备show fragment") supportFragmentManager?.beginTransaction()?.show(mPassengerFragment!!) ?.commitAllowingStateLoss() } @@ -73,6 +73,6 @@ class MogoOCHBusPassenger : IMoGoFunctionProvider { } companion object { - private val TAG = MogoOCHBusPassenger::class.java.simpleName + private val TAG = com.mogo.och.charter.passenger.MogoOCHBusPassenger::class.java.simpleName } } \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/TaxiPassengerVideoPlay.java similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/TaxiPassengerVideoPlay.java index 72bbd8e3de..dafc61f873 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/TaxiPassengerVideoPlay.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/TaxiPassengerVideoPlay.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean; +package com.mogo.och.charter.passenger.bean; public class TaxiPassengerVideoPlay { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/Temperature.kt similarity index 62% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/Temperature.kt index 84ea0e4ab8..2b866ac90b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/Temperature.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/Temperature.kt @@ -1,3 +1,3 @@ -package com.mogo.och.bus.passenger.bean +package com.mogo.och.charter.passenger.bean data class Temperature(val index:Int,val value:Int,val showTitle:String) \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/event/EventLineSites.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/event/EventLineSites.kt new file mode 100644 index 0000000000..7a09daf04e --- /dev/null +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/event/EventLineSites.kt @@ -0,0 +1,6 @@ +package com.mogo.och.charter.passenger.bean.event + +import com.mogo.och.charter.passenger.bean.response.LineInfoResponse +import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse + +data class EventLineSites(val lineInfo: LineInfoResponse.LineInfo?, val sites: List?, val clear:Boolean=false) \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/ArriveDestRequest.kt similarity index 61% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/ArriveDestRequest.kt index 60f5e971ad..d6721b2eac 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/ArriveDestRequest.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/ArriveDestRequest.kt @@ -1,3 +1,3 @@ -package com.mogo.och.bus.passenger.bean.request +package com.mogo.och.charter.passenger.bean.request data class ArriveDestRequest(val sn:String, val lineId:Long,val writeVersion:Long) \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/BusPassengerQueryLineRequest.java similarity index 79% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/BusPassengerQueryLineRequest.java index bfa44d6d49..3f725073ce 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/BusPassengerQueryLineRequest.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/BusPassengerQueryLineRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.request; +package com.mogo.och.charter.passenger.bean.request; public /** diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/EndOrderRequest.kt similarity index 53% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/EndOrderRequest.kt index 6df6ccc92f..ac0fc54838 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/request/EndOrderRequest.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/request/EndOrderRequest.kt @@ -1,3 +1,3 @@ -package com.mogo.och.bus.passenger.bean.request +package com.mogo.och.charter.passenger.bean.request data class EndOrderRequest(val sn:String,val orderNo:String) \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessStatusResponse.kt similarity index 83% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessStatusResponse.kt index ea11db3386..2cc798b3cb 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessStatusResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessStatusResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.eagle.core.data.BaseData import java.util.* diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessTimeResponse.kt similarity index 84% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessTimeResponse.kt index 9e9af83926..6d28ff1427 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/BusinessTimeResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/BusinessTimeResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.eagle.core.data.BaseData diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoListResponse.kt similarity index 73% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoListResponse.kt index 4bbdccf061..91a577b10a 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoListResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoListResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.eagle.core.data.BaseData diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoResponse.kt similarity index 83% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoResponse.kt index 366bc70641..e015e420ab 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LineInfoResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LineInfoResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.eagle.core.data.BaseData diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LocusResponse.kt similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LocusResponse.kt index 3068118b1b..0addc40d3f 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/LocusResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/LocusResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.eagle.core.data.BaseData diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/M1DriverLoginStatusResponse.kt similarity index 90% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/M1DriverLoginStatusResponse.kt index 326d180289..69b4916311 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/M1DriverLoginStatusResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/M1DriverLoginStatusResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.eagle.core.data.BaseData diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt similarity index 98% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt index ee15d54372..6e88928e9b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.BaseData diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/SiteInfoResponse.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/SiteInfoResponse.kt index 3ba52d8156..51e39a0a2d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/SiteInfoResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/SiteInfoResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.mogo.eagle.core.data.BaseData import com.mogo.och.common.module.bean.dpmsg.LineSite diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt similarity index 90% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt index 499ec9d66e..488b0e456c 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/bean/response/TrajectoriesResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/TrajectoriesResponse.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.bean.response +package com.mogo.och.charter.passenger.bean.response import com.amap.api.maps.model.LatLng import com.mogo.eagle.core.data.BaseData diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IBusPassengerControllerStatusCallback.java similarity index 87% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IBusPassengerControllerStatusCallback.java index 879b502e20..da29bd8560 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IBusPassengerControllerStatusCallback.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback; +package com.mogo.och.charter.passenger.callback; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt similarity index 84% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt index 6adf63cc21..7ee83cd636 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ICharterPassengerAutoStatusChangeCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.charter.passenger.callback /** * Created on 2022/3/31 diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IClearViewCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IClearViewCallback.kt similarity index 53% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IClearViewCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IClearViewCallback.kt index e53f0f4e2c..e7a6c46def 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IClearViewCallback.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IClearViewCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.charter.passenger.callback interface IClearViewCallback { fun goneAllView() diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IDistanceCallback.kt similarity index 66% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IDistanceCallback.kt index c0d1a574fb..6f68eab6a8 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IDistanceCallback.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IDistanceCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.charter.passenger.callback interface IDistanceCallback { fun setDistancecAndTime(meters:Long , timeInSecond:Long ) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IOrderChangeCallback.kt similarity index 84% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IOrderChangeCallback.kt index 188a87ed79..80057e1293 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/IOrderChangeCallback.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/IOrderChangeCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.charter.passenger.callback interface IOrderChangeCallback { /** diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ITimeCallback.kt similarity index 61% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ITimeCallback.kt index a7283742a2..24c96a72df 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/callback/ITimeCallback.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/callback/ITimeCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.callback +package com.mogo.och.charter.passenger.callback interface ITimeCallback { fun setOrderTimeCallBack(timeInSecond: Long) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/constant/CharterPassengerConst.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/constant/CharterPassengerConst.kt index 09d15e054f..749964b9f5 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/constant/CharterPassengerConst.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/constant/CharterPassengerConst.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.constant +package com.mogo.och.charter.passenger.constant /** * Created on 2021/12/6 diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt similarity index 99% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index 48e2d99355..cac9ae42df 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.charter.passenger.model import android.annotation.SuppressLint import android.content.Context @@ -23,15 +23,15 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.* -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import com.mogo.och.common.module.manager.loopmanager.LoopInfo -import com.mogo.och.bus.passenger.bean.response.* -import com.mogo.och.bus.passenger.callback.* -import com.mogo.och.bus.passenger.constant.CharterPassengerConst +import com.mogo.och.charter.passenger.bean.response.* +import com.mogo.och.charter.passenger.callback.* +import com.mogo.och.charter.passenger.constant.CharterPassengerConst import com.mogo.och.common.module.manager.loopmanager.BizLoopManager -import com.mogo.och.bus.passenger.net.BusPassengerServiceManager +import com.mogo.och.charter.passenger.net.BusPassengerServiceManager import com.mogo.och.common.module.wigets.toast.ToastCharterUtils -import com.mogo.och.bus.passenger.utils.VoiceFocusManager +import com.mogo.och.charter.passenger.utils.VoiceFocusManager import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/OrderStatusEnum.kt similarity index 93% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/OrderStatusEnum.kt index cda47e3c88..7eaf77f7a5 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderStatusEnum.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/OrderStatusEnum.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.model +package com.mogo.och.charter.passenger.model /** * Created on 2022/08/19 diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt index 41245d7a80..0b0a223687 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt @@ -1,12 +1,12 @@ -package com.mogo.och.bus.passenger.net +package com.mogo.och.charter.passenger.net import android.content.Context import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.network.MoGoRetrofitFactory -import com.mogo.och.bus.passenger.bean.request.ArriveDestRequest -import com.mogo.och.bus.passenger.bean.request.EndOrderRequest -import com.mogo.och.bus.passenger.bean.response.* +import com.mogo.och.charter.passenger.bean.request.ArriveDestRequest +import com.mogo.och.charter.passenger.bean.request.EndOrderRequest +import com.mogo.och.charter.passenger.bean.response.* import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt index aafd120e7c..e0d4dd686d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/PassengerServiceApi.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.net +package com.mogo.och.charter.passenger.net import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager -import com.mogo.och.bus.passenger.bean.request.ArriveDestRequest -import com.mogo.och.bus.passenger.bean.request.EndOrderRequest -import com.mogo.och.bus.passenger.bean.response.* +import com.mogo.och.charter.passenger.bean.request.ArriveDestRequest +import com.mogo.och.charter.passenger.bean.request.EndOrderRequest +import com.mogo.och.charter.passenger.bean.response.* import io.reactivex.Observable import retrofit2.http.* diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt similarity index 86% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt index 1596ef34b0..0447f1a61b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusBasePassengerFunctionDevicePresenter.kt @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.charter.passenger.presenter import androidx.lifecycle.LifecycleOwner import com.mogo.commons.mvp.IView import com.mogo.commons.mvp.Presenter -import com.mogo.och.bus.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.model.CharterPassengerModel import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt similarity index 66% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt index 66e05e80b9..26dad18d17 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerCarUseAndNoOrderPresenter.kt @@ -1,6 +1,6 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.charter.passenger.presenter -import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment +import com.mogo.och.charter.passenger.ui.dialogfragment.M1CarUserNoOrderFragment class BusPassengerCarUseAndNoOrderPresenter(view: M1CarUserNoOrderFragment?) : BusBasePassengerFunctionDevicePresenter(view){ diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt similarity index 93% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt index 3eb1a6e49d..f8bb0969a5 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.charter.passenger.presenter import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -18,19 +18,19 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.SharedPrefs import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.response.LineInfoResponse -import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse -import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse -import com.mogo.och.bus.passenger.bean.response.TrajectoriesResponse -import com.mogo.och.bus.passenger.callback.IOrderChangeCallback -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener -import com.mogo.och.bus.passenger.model.OrderStatusEnum -import com.mogo.och.bus.passenger.receive.DriverMessage -import com.mogo.och.bus.passenger.ui.MainFragment -import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteName -import com.mogo.och.bus.passenger.ui.overmapview.MakerWithSiteNamewithCheck +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.response.LineInfoResponse +import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse +import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse +import com.mogo.och.charter.passenger.bean.response.TrajectoriesResponse +import com.mogo.och.charter.passenger.callback.IOrderChangeCallback +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener +import com.mogo.och.charter.passenger.model.OrderStatusEnum +import com.mogo.och.charter.passenger.receive.DriverMessage +import com.mogo.och.charter.passenger.ui.MainFragment +import com.mogo.och.charter.passenger.ui.overmapview.MakerWithSiteName +import com.mogo.och.charter.passenger.ui.overmapview.MakerWithSiteNamewithCheck import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.OCHAdasAbilityManager import com.mogo.och.common.module.manager.StopSideStatusManager diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt similarity index 88% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt index da3e5d9d26..92d0e7807f 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/CharterPassengerNoviceGuidancePresenter.kt @@ -1,9 +1,9 @@ -package com.mogo.och.bus.passenger.presenter +package com.mogo.och.charter.passenger.presenter import androidx.lifecycle.LifecycleOwner -import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment +import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/provider/StatusViewManager.java similarity index 81% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/provider/StatusViewManager.java index 90f569d3af..aae72e7b38 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/provider/StatusViewManager.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/provider/StatusViewManager.java @@ -1,15 +1,16 @@ -package com.mogo.och.bus.passenger.provider; +package com.mogo.och.charter.passenger.provider; import android.content.Context; import android.view.View; -import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView; +import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout; +import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView; /** * @author congtaowang diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt index 3ef66cc329..d2cce6cfe2 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/receive/DriverMessage.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.receive +package com.mogo.och.charter.passenger.receive import com.mogo.commons.AbsMogoApplication import com.mogo.commons.voice.AIAssist @@ -8,9 +8,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse -import com.mogo.och.bus.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse +import com.mogo.och.charter.passenger.model.CharterPassengerModel import com.mogo.och.common.module.bean.dpmsg.* import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager import com.mogo.och.common.module.biz.constant.OchCommonConst diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt index 0419ab9a6d..384dd8ed58 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui +package com.mogo.och.charter.passenger.ui import android.graphics.BitmapFactory import android.os.Bundle @@ -21,15 +21,15 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.map.listener.MogoMapListenerHandler import com.mogo.map.uicontroller.VisualAngleMode -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.event.EventLineSites -import com.mogo.och.bus.passenger.callback.IClearViewCallback -import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter -import com.mogo.och.bus.passenger.ui.bottom.BottomBar -import com.mogo.och.bus.passenger.ui.bottom.BottomClickView -import com.mogo.och.bus.passenger.ui.dialogfragment.M1CarUserNoOrderFragment -import com.mogo.och.bus.passenger.ui.dialogfragment.NoviceGuidanceFragment -import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.event.EventLineSites +import com.mogo.och.charter.passenger.callback.IClearViewCallback +import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter +import com.mogo.och.charter.passenger.ui.bottom.BottomBar +import com.mogo.och.charter.passenger.ui.bottom.BottomClickView +import com.mogo.och.charter.passenger.ui.dialogfragment.M1CarUserNoOrderFragment +import com.mogo.och.charter.passenger.ui.dialogfragment.NoviceGuidanceFragment +import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.biz.constant.LoginStatusManager import kotlinx.android.synthetic.main.m1_main_fragment.* diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt index e868f5fde6..55fab27613 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomBar.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomBar.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.ui.bottom +package com.mogo.och.charter.passenger.ui.bottom import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.m1_bottom_bar.view.* class BottomBar @JvmOverloads constructor( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomCheckView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomCheckView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt index f3cedfde3e..b8bfe7cb68 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomCheckView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomCheckView.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.ui.bottom +package com.mogo.och.charter.passenger.ui.bottom import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.* open class BottomCheckView @JvmOverloads constructor( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomClickView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomClickView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt index 4109b128a9..aa092889cb 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomClickView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomClickView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.bottom +package com.mogo.och.charter.passenger.ui.bottom import android.annotation.SuppressLint import android.content.Context @@ -9,7 +9,7 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.m1_bottom_stop_site.view.* open class BottomClickView @JvmOverloads constructor( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt similarity index 91% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt index 7133025081..c48dedc79a 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/BottomOrderInfoView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/BottomOrderInfoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.bottom +package com.mogo.och.charter.passenger.ui.bottom import android.content.Context import android.util.AttributeSet @@ -8,11 +8,11 @@ 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.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.callback.ITimeCallback -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener -import com.mogo.och.bus.passenger.model.OrderStatusEnum +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.callback.ITimeCallback +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener +import com.mogo.och.charter.passenger.model.OrderStatusEnum import com.mogo.och.common.module.utils.DateTimeUtil import kotlinx.android.synthetic.main.m1_bottom_orderinfo.view.* import java.util.UUID diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/CloseDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt similarity index 83% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/CloseDoorView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt index dd4533437a..cd53c836b8 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/CloseDoorView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/CloseDoorView.kt @@ -1,10 +1,10 @@ -package com.mogo.och.bus.passenger.ui.bottom.impl +package com.mogo.och.charter.passenger.ui.bottom.impl import android.content.Context import android.util.AttributeSet import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.ui.bottom.BottomClickView +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.ui.bottom.BottomClickView import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager import com.mogo.och.common.module.utils.SoundPoolHelper diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt index bdc10bfdfb..a9860cd670 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/GoViewWithArrive.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/GoViewWithArrive.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.bottom.impl +package com.mogo.och.charter.passenger.ui.bottom.impl import android.annotation.SuppressLint import android.content.Context @@ -16,10 +16,10 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.och.common.module.wigets.toast.ToastCharterUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.callback.ICharterPassengerAutoStatusChangeCallback -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.ui.bottom.BottomClickView +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.callback.ICharterPassengerAutoStatusChangeCallback +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.ui.bottom.BottomClickView import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorStatusManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.utils.SoundPoolHelper diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/OpenDoorView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt similarity index 83% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/OpenDoorView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt index 1a220ec336..a3c5e86f9a 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/OpenDoorView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/OpenDoorView.kt @@ -1,10 +1,10 @@ -package com.mogo.och.bus.passenger.ui.bottom.impl +package com.mogo.och.charter.passenger.ui.bottom.impl import android.content.Context import android.util.AttributeSet import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.ui.bottom.BottomClickView +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.ui.bottom.BottomClickView import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager import com.mogo.och.common.module.utils.SoundPoolHelper diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt similarity index 92% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt index 1b2fae3cf6..2233376fff 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/bottom/impl/StopSiteView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/bottom/impl/StopSiteView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.bottom.impl +package com.mogo.och.charter.passenger.ui.bottom.impl import android.content.Context import android.util.AttributeSet @@ -7,8 +7,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.common.module.wigets.toast.ToastCharterUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.ui.bottom.BottomClickView +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.ui.bottom.BottomClickView import com.mogo.och.common.module.utils.SoundPoolHelper class StopSiteView @JvmOverloads constructor( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugEvent.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugEvent.kt new file mode 100644 index 0000000000..9b36e29774 --- /dev/null +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugEvent.kt @@ -0,0 +1,3 @@ +package com.mogo.och.charter.passenger.ui.debugview + +data class DebugEvent(val type: String) \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt similarity index 92% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt index e7db47ab07..067a3804bb 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/debugview/DebugView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/debugview/DebugView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.debugview +package com.mogo.och.charter.passenger.ui.debugview import android.content.Context import android.util.AttributeSet @@ -10,11 +10,11 @@ import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.response.OrderInfoResponse -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.ui.MainFragment -import com.mogo.och.bus.passenger.ui.statusbar.StatusBarView +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.response.OrderInfoResponse +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.ui.MainFragment +import com.mogo.och.charter.passenger.ui.statusbar.StatusBarView import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment import kotlinx.android.synthetic.main.m1_p_debug.view.debug_arrive_dest diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt index 16da2dddcd..5cafa0b340 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/M1CarUserNoOrderFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.dialogfragment +package com.mogo.och.charter.passenger.ui.dialogfragment import android.os.Bundle import android.util.Log @@ -15,8 +15,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.AppStateManager import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.ClickUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.presenter.BusPassengerCarUseAndNoOrderPresenter import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorManager import com.mogo.och.common.module.voice.VoiceManager import kotlinx.android.synthetic.main.m1_order_end.* diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt index face4be037..a7dfbfed3f 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.dialogfragment +package com.mogo.och.charter.passenger.ui.dialogfragment import android.content.DialogInterface import android.os.Bundle @@ -15,11 +15,11 @@ import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.* -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.presenter.BusPassengerPresenter -import com.mogo.och.bus.passenger.presenter.CharterPassengerNoviceGuidancePresenter -import com.mogo.och.bus.passenger.ui.MainFragment +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter +import com.mogo.och.charter.passenger.presenter.CharterPassengerNoviceGuidancePresenter +import com.mogo.och.charter.passenger.ui.MainFragment import com.mogo.och.common.module.voice.VoiceNotice import kotlinx.android.synthetic.main.m1_novice_guidance_fragment.* import kotlinx.android.synthetic.main.m1_novice_guidance_welcome_1_fragment.* diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt index f02829b5c1..26238e72e9 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.itinerary +package com.mogo.och.charter.passenger.ui.itinerary import android.content.Context import android.util.AttributeSet @@ -6,7 +6,7 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_arrive_time import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_surplus_time diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt similarity index 90% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryViewModel.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt index 1c773f0624..d55e708e3b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/itinerary/ItineraryViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.itinerary +package com.mogo.och.charter.passenger.ui.itinerary import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication @@ -6,11 +6,11 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.callback.IDistanceCallback -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener -import com.mogo.och.bus.passenger.model.OrderStatusEnum +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.callback.IDistanceCallback +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener +import com.mogo.och.charter.passenger.model.OrderStatusEnum import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil import kotlin.math.abs diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt similarity index 98% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt index 67a2b90900..7a429a9365 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockAndUnlockView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.lockview +package com.mogo.och.charter.passenger.ui.lockview import android.content.Context import android.os.Handler @@ -10,7 +10,7 @@ import android.view.MotionEvent import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import com.mogo.och.common.module.utils.FrameAnimatorContainer import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock import kotlinx.android.synthetic.main.m1_devices_lock_unlock.view.aciv_screen_lock_bg diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockManager.kt similarity index 98% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockManager.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockManager.kt index a9a1a7d7ea..8bdc7da105 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockManager.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.lockview +package com.mogo.och.charter.passenger.ui.lockview import android.os.Handler import android.os.HandlerThread diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockViewConstrainLayout.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockViewConstrainLayout.kt similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockViewConstrainLayout.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockViewConstrainLayout.kt index bbb57cd9f8..e32003b66b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/LockViewConstrainLayout.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockViewConstrainLayout.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.lockview +package com.mogo.och.charter.passenger.ui.lockview import android.content.Context import android.util.AttributeSet @@ -7,7 +7,7 @@ import android.view.View import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R class LockViewConstrainLayout : ConstraintLayout { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt similarity index 98% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt index aa7d0cbe6a..e52a0896ac 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/lockview/UnlockView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/UnlockView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.lockview +package com.mogo.och.charter.passenger.ui.lockview import android.content.Context import android.os.Handler @@ -11,7 +11,7 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.m1_devices_unlock.view.aciv_only_unlock import kotlinx.android.synthetic.main.m1_devices_unlock.view.actv_lock_status diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt index 9dd947ecbf..78b4af73ff 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.orderinfo +package com.mogo.och.charter.passenger.ui.orderinfo import android.content.Context import android.util.AttributeSet @@ -8,8 +8,8 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.callback.IClearViewCallback +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.callback.IClearViewCallback import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_contain_order import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_end_order_submit diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt index b81809d67e..224351d5a6 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.orderinfo +package com.mogo.och.charter.passenger.ui.orderinfo import androidx.lifecycle.ViewModel import com.mogo.eagle.core.data.BaseData @@ -7,8 +7,8 @@ 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.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.callback.ITimeCallback -import com.mogo.och.bus.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.callback.ITimeCallback +import com.mogo.och.charter.passenger.model.CharterPassengerModel import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.EndOrderMsg diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/overmapview/MakerWithSiteName.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt similarity index 90% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/overmapview/MakerWithSiteName.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt index b11ee93faf..a2afbfe06f 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/overmapview/MakerWithSiteName.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/overmapview/MakerWithSiteName.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.ui.overmapview +package com.mogo.och.charter.passenger.ui.overmapview import android.content.Context import android.graphics.Bitmap import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.view_maker_sitename.view.* /** diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt similarity index 92% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt index 5608cd7df0..d9fa7178c1 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.selectline +package com.mogo.och.charter.passenger.ui.selectline import android.animation.ObjectAnimator import android.content.Context @@ -13,14 +13,14 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import androidx.recyclerview.widget.LinearLayoutManager import com.elegant.utils.UiThreadHandler import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.event.EventLineSites -import com.mogo.och.bus.passenger.bean.response.LineInfoResponse -import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse -import com.mogo.och.bus.passenger.callback.IClearViewCallback -import com.mogo.och.bus.passenger.ui.selectline.adapter.OrderLineItemAdapter -import com.mogo.och.bus.passenger.ui.selectline.adapter.OrderSiteItemAdapter -import com.mogo.och.bus.passenger.ui.selectline.layoutmanage.BottomDecoration +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.event.EventLineSites +import com.mogo.och.charter.passenger.bean.response.LineInfoResponse +import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse +import com.mogo.och.charter.passenger.callback.IClearViewCallback +import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderLineItemAdapter +import com.mogo.och.charter.passenger.ui.selectline.adapter.OrderSiteItemAdapter +import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.m1_order_fragment.view.aciv_driver_refuse_group @@ -98,7 +98,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb rlv_line_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) rlv_line_list.addItemDecoration( - BottomDecoration( + com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration( AutoSizeUtils.dp2px(context, 60f) ) ) @@ -107,7 +107,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb rv_site_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) rv_site_list.addItemDecoration( - BottomDecoration( + com.mogo.och.charter.passenger.ui.selectline.layoutmanage.BottomDecoration( AutoSizeUtils.dp2px(context, 90f) ) ) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt index a8599877a8..1d89dc4089 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/SelectLineViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.selectline +package com.mogo.och.charter.passenger.ui.selectline import androidx.lifecycle.ViewModel import com.elegant.utils.UiThreadHandler @@ -12,14 +12,14 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager 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.GsonUtils -import com.mogo.och.bus.passenger.bean.event.EventLineSites -import com.mogo.och.bus.passenger.bean.response.LineInfoListResponse -import com.mogo.och.bus.passenger.bean.response.LineInfoResponse -import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse -import com.mogo.och.bus.passenger.model.CharterPassengerModel -import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener -import com.mogo.och.bus.passenger.model.OrderStatusEnum -import com.mogo.och.bus.passenger.net.BusPassengerServiceManager +import com.mogo.och.charter.passenger.bean.event.EventLineSites +import com.mogo.och.charter.passenger.bean.response.LineInfoListResponse +import com.mogo.och.charter.passenger.bean.response.LineInfoResponse +import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse +import com.mogo.och.charter.passenger.model.CharterPassengerModel +import com.mogo.och.charter.passenger.model.IOrderStatusChangeListener +import com.mogo.och.charter.passenger.model.OrderStatusEnum +import com.mogo.och.charter.passenger.net.BusPassengerServiceManager import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt index bac61fde81..b5304ca398 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderLineItemAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.selectline.adapter +package com.mogo.och.charter.passenger.ui.selectline.adapter import android.content.Context import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.response.LineInfoResponse +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.response.LineInfoResponse /** * Created by adityagohad on 06/06/17. diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt index 8db2811dd9..23d37f4c80 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/adapter/OrderSiteItemAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.selectline.adapter +package com.mogo.och.charter.passenger.ui.selectline.adapter import android.content.Context import android.view.LayoutInflater @@ -9,9 +9,9 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.och.common.module.wigets.toast.ToastCharterUtils -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.event.EventLineSites -import com.mogo.och.bus.passenger.bean.response.SiteInfoResponse +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.event.EventLineSites +import com.mogo.och.charter.passenger.bean.response.SiteInfoResponse import org.greenrobot.eventbus.EventBus /** diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/BottomDecoration.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/BottomDecoration.java similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/BottomDecoration.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/BottomDecoration.java index 803bf98a69..edd8137789 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/BottomDecoration.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/BottomDecoration.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.selectline.layoutmanage; +package com.mogo.och.charter.passenger.ui.selectline.layoutmanage; import android.graphics.Rect; import android.view.View; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java index ae81c22d68..86b446bce6 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/layoutmanage/PickerLayoutManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.selectline.layoutmanage; +package com.mogo.och.charter.passenger.ui.selectline.layoutmanage; import android.content.Context; import android.util.DisplayMetrics; @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearSmoothScroller; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.och.bus.passenger.R; +import com.mogo.och.charter.passenger.R; public class PickerLayoutManager extends LinearLayoutManager { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt index 52c5c9bdbf..c071ba0680 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol +package com.mogo.och.charter.passenger.ui.softcontrol import android.animation.ObjectAnimator import android.animation.ValueAnimator @@ -26,13 +26,13 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.Temperature -import com.mogo.och.bus.passenger.callback.IClearViewCallback -import com.mogo.och.bus.passenger.ui.selectline.layoutmanage.PickerLayoutManager -import com.mogo.och.bus.passenger.ui.softcontrol.adapter.TemperatureAdapter -import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration -import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.PagerCenterSnapHelper +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.Temperature +import com.mogo.och.charter.passenger.callback.IClearViewCallback +import com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager +import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter +import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration +import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.PagerCenterSnapHelper import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.utils.SoundPoolHelper @@ -188,10 +188,10 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba tv_temperature_title.isEnabled = enable rv_aircondition_temperature.isEnabled = enable val layoutManager = rv_aircondition_temperature.layoutManager - if (layoutManager is PickerLayoutManager) { + if (layoutManager is com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager) { layoutManager.setHorizontallyScroll(enable) } - val adapter = rv_aircondition_temperature.adapter as TemperatureAdapter + val adapter = rv_aircondition_temperature.adapter as com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter if (enable) { adapter.setEnable(true) if (tv_setting_aircondition.isChecked) { @@ -322,7 +322,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba viewModel?.openAndSetAircondition(modeCmd, windSpeedCmd, temperatureCmd) } - private fun setCheckAir(adapter: TemperatureAdapter, tag: Temperature) { + private fun setCheckAir(adapter: com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter, tag: Temperature) { adapter.setCheckIndex(tag.index) currentTemperature = tag if (rv_aircondition_temperature.tag == touchTag) { @@ -629,25 +629,32 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba openAircondition() } } - val pickerLayoutManager = PickerLayoutManager( - context, PickerLayoutManager.HORIZONTAL, false - ) + val pickerLayoutManager = + com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager( + context, + com.mogo.och.charter.passenger.ui.selectline.layoutmanage.PickerLayoutManager.HORIZONTAL, + false + ) pickerLayoutManager.isChangeAlpha = true pickerLayoutManager.scaleDownBy = 0.29f pickerLayoutManager.scaleDownDistance = 0.8f val data = getData() - val adapter = TemperatureAdapter(context, data, rv_aircondition_temperature) + val adapter = com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter( + context, + data, + rv_aircondition_temperature + ) val snapHelper = PagerCenterSnapHelper() snapHelper.attachToRecyclerView(rv_aircondition_temperature) rv_aircondition_temperature.layoutManager = pickerLayoutManager rv_aircondition_temperature.adapter = adapter - HorizontalDecoration.distance = SharedPrefsMgr.getInstance(context).getInt( - HorizontalDecoration.distancekey, 0 + com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distance = SharedPrefsMgr.getInstance(context).getInt( + com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distancekey, 0 ) val space = AutoSizeUtils.dp2px(context, 15f) rv_aircondition_temperature.addItemDecoration( - HorizontalDecoration( + com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration( space, data.size - 1 ) ) @@ -673,7 +680,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba } } - if (HorizontalDecoration.distance != 0) { + if (com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.HorizontalDecoration.distance != 0) { rv_aircondition_temperature.scrollToPosition(data.size - 1) adapter.setCheckIndex(data.size - 1) } @@ -722,7 +729,7 @@ class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallba } if (airIsOpen) { val adapter = rv_aircondition_temperature.adapter - if (adapter is TemperatureAdapter) { + if (adapter is com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter) { adapter.data.forEach { if (it.value == temperatureCmd) { rv_aircondition_temperature.tag = touchTag diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt similarity index 99% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt index 8a27bf082d..af30004679 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/SoftControlViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol +package com.mogo.och.charter.passenger.ui.softcontrol import androidx.lifecycle.ViewModel import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/adapter/TemperatureAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java similarity index 92% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/adapter/TemperatureAdapter.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java index dc969d07ed..05bfb80f09 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/adapter/TemperatureAdapter.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/adapter/TemperatureAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.adapter; +package com.mogo.och.charter.passenger.ui.softcontrol.adapter; import android.content.Context; import android.graphics.Color; @@ -10,8 +10,9 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.och.bus.passenger.R; -import com.mogo.och.bus.passenger.bean.Temperature; +import com.mogo.och.charter.passenger.R; +import com.mogo.och.charter.passenger.bean.Temperature; +import com.mogo.och.charter.passenger.bean.Temperature; import java.util.List; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java similarity index 99% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java index a3b734dddd..0fcf2d61f5 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselLayoutManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage; +package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage; import android.graphics.PointF; import android.os.Build; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java index 0e7475e192..c1de86ed79 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CarouselZoomPostLayoutListener.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage; +package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage; import android.view.View; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java index 30b4eaa280..2ff5515969 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/CenterScrollListener.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage; +package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java similarity index 95% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java index 913c47c9e2..09f4c44241 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/HorizontalDecoration.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage; +package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage; import android.graphics.Rect; import android.view.View; @@ -8,7 +8,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; -import com.mogo.och.bus.passenger.ui.softcontrol.adapter.TemperatureAdapter; +import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter; +import com.mogo.och.charter.passenger.ui.softcontrol.adapter.TemperatureAdapter; public class HorizontalDecoration extends RecyclerView.ItemDecoration { private int space = 0; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java similarity index 87% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java index b77e0fa8f2..9994307061 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/ItemTransformation.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage; +package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage; public class ItemTransformation { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt index 537586bb54..9051b98a65 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/layoutmanage/PagerCenterSnapHelper.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage +package com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage import android.view.View import androidx.recyclerview.widget.OrientationHelper diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt index a369c95154..11aa2f0fe2 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawBitmapView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawBitmapView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.view +package com.mogo.och.charter.passenger.ui.softcontrol.view import android.content.Context import android.graphics.Bitmap @@ -7,7 +7,7 @@ import android.graphics.Canvas import android.graphics.Paint import android.util.AttributeSet import android.view.View -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R class DrawBitmapView @JvmOverloads constructor( diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawableCheckBox.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawableCheckBox.java similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawableCheckBox.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawableCheckBox.java index 21fe0abb8a..b6121440da 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/softcontrol/view/DrawableCheckBox.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/view/DrawableCheckBox.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.softcontrol.view; +package com.mogo.och.charter.passenger.ui.softcontrol.view; import android.content.Context; import android.graphics.Bitmap; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/M1BlueToothView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt similarity index 91% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/M1BlueToothView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt index 7a28fb5cc1..cc8df22d64 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/M1BlueToothView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/M1BlueToothView.kt @@ -1,11 +1,11 @@ -package com.mogo.och.bus.passenger.ui.statusbar +package com.mogo.och.charter.passenger.ui.statusbar import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView -import com.mogo.och.bus.passenger.R +import com.mogo.och.charter.passenger.R import kotlinx.android.synthetic.main.m1_statusview_blue_tooth.view.* /** diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt index 171dbad766..5f71592fbe 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/statusbar/StatusBarView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/statusbar/StatusBarView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.statusbar +package com.mogo.och.charter.passenger.ui.statusbar import android.annotation.SuppressLint import android.content.Context @@ -27,8 +27,8 @@ import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.ui.debugview.DebugEvent +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.ui.debugview.DebugEvent import com.mogo.och.common.module.manager.loopmanager.BizLoopManager import com.mogo.och.common.module.manager.loopmanager.LoopInfo import kotlinx.android.synthetic.main.m1_statusview_datetime.view.* diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt similarity index 99% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt index bb8dae89a9..a6d86d0e1d 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.video +package com.mogo.och.charter.passenger.ui.video import android.app.Activity import android.content.Context @@ -20,8 +20,8 @@ import androidx.core.app.ActivityCompat import com.mogo.eagle.core.utilcode.util.TimeTransformUtils import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.utils.FullVideoUtils +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.utils.FullVideoUtils import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt similarity index 75% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt index 098bb93864..150ca3b0b8 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/VideoView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/VideoView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.video +package com.mogo.och.charter.passenger.ui.video import android.content.Context import android.util.AttributeSet @@ -8,13 +8,13 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay -import com.mogo.och.bus.passenger.callback.IClearViewCallback -import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager -import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener -import com.mogo.och.bus.passenger.ui.softcontrol.layoutmanage.CenterScrollListener -import com.mogo.och.bus.passenger.ui.video.adapter.RecyclerVideoAdapter +import com.mogo.och.charter.passenger.R +import com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay +import com.mogo.och.charter.passenger.callback.IClearViewCallback +import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager +import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener +import com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CenterScrollListener +import com.mogo.och.charter.passenger.ui.video.adapter.RecyclerVideoAdapter import com.shuyu.gsyvideoplayer.video.base.GSYVideoView import kotlinx.android.synthetic.main.m1_video_fragment.view.rvVideoPlaylist import kotlin.math.floor @@ -29,7 +29,7 @@ class VideoView @JvmOverloads constructor( const val TAG = "DebugView" } - private val arrayListOf = ArrayList() + private val arrayListOf = ArrayList() var goneViewListener: IClearViewCallback? = null @@ -39,10 +39,14 @@ class VideoView @JvmOverloads constructor( goneViewListener?.goneAllView() } initConsultData() - val carouselLayoutManager = CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL, true) - carouselLayoutManager.setPostLayoutListener(CarouselZoomPostLayoutListener()) + val carouselLayoutManager = + com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager( + CarouselLayoutManager.HORIZONTAL, + true + ) + carouselLayoutManager.setPostLayoutListener(com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselZoomPostLayoutListener()) carouselLayoutManager.maxVisibleItems = 1 - rvVideoPlaylist.addOnScrollListener(object : CenterScrollListener() { + rvVideoPlaylist.addOnScrollListener(object : com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CenterScrollListener() { var prePlayerPosition = 0 override fun pageSelect(recyclerView: RecyclerView?, newState: Int) { //播放视频 @@ -83,7 +87,12 @@ class VideoView @JvmOverloads constructor( } } } - val recyclerVideoAdapter = RecyclerVideoAdapter(context, arrayListOf, rvVideoPlaylist) + val recyclerVideoAdapter = + com.mogo.och.charter.passenger.ui.video.adapter.RecyclerVideoAdapter( + context, + arrayListOf, + rvVideoPlaylist + ) recyclerVideoAdapter.setOnThumbImageClilckListener { val (_, player) = getPlayer(carouselLayoutManager) if (player is ConsultVideoPlayer) { @@ -102,7 +111,7 @@ class VideoView @JvmOverloads constructor( } - private fun getPlayer(carouselLayoutManager: CarouselLayoutManager): Pair { + private fun getPlayer(carouselLayoutManager: com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager): Pair { val centerItemPosition: Int = carouselLayoutManager.centerItemPosition val playerHolder = carouselLayoutManager.findViewByPosition(centerItemPosition) val player = playerHolder?.findViewById(R.id.video_item_player) @@ -118,7 +127,7 @@ class VideoView @JvmOverloads constructor( if (changedView != this) { return } - val carouselLayoutManager = rvVideoPlaylist?.layoutManager as CarouselLayoutManager + val carouselLayoutManager = rvVideoPlaylist?.layoutManager as com.mogo.och.charter.passenger.ui.softcontrol.layoutmanage.CarouselLayoutManager val (_, player) = getPlayer(carouselLayoutManager) when (visibility) { View.VISIBLE -> {} @@ -135,28 +144,28 @@ class VideoView @JvmOverloads constructor( private fun initConsultData() { arrayListOf.clear() arrayListOf.add( - TaxiPassengerVideoPlay( + com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay( "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708596763/全车型混剪增加红旗车队.m4v", "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969511280/车队.png", "蘑菇车联覆盖生活的方方面面" ) ) arrayListOf.add( - TaxiPassengerVideoPlay( + com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay( "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708554279/红旗车队.m4v", "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969553174/红旗重新排版.png", "蘑菇车联之红旗车队" ) ) arrayListOf.add( - TaxiPassengerVideoPlay( + com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay( "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708499497/大运会合作解说版.m4v", "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969536177/大运会.png", "蘑菇车联牵手成都大运会" ) ) arrayListOf.add( - TaxiPassengerVideoPlay( + com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay( "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655708409810/20210610重新排版3屏.m4v", "https://img.zhidaohulian.com/fileServer/online_car_hailing/1655969579713/三屏.png", "多视角体验蘑菇车联自动驾驶" diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerItemVideoHolder.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerItemVideoHolder.java similarity index 80% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerItemVideoHolder.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerItemVideoHolder.java index 784e57ec53..a113e336af 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerItemVideoHolder.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerItemVideoHolder.java @@ -1,12 +1,12 @@ -package com.mogo.och.bus.passenger.ui.video.adapter; +package com.mogo.och.charter.passenger.ui.video.adapter; import android.content.Context; import android.view.View; import androidx.recyclerview.widget.RecyclerView; -import com.mogo.och.bus.passenger.R; -import com.mogo.och.bus.passenger.ui.video.ConsultVideoPlayer; +import com.mogo.och.charter.passenger.R; +import com.mogo.och.charter.passenger.ui.video.ConsultVideoPlayer; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; public class RecyclerItemVideoHolder extends RecyclerView.ViewHolder { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java index fd7710714a..707a8bc74e 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/adapter/RecyclerVideoAdapter.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/adapter/RecyclerVideoAdapter.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.ui.video.adapter; +package com.mogo.och.charter.passenger.ui.video.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -11,8 +11,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.mogo.och.common.module.wigets.toast.ToastCharterUtils; -import com.mogo.och.bus.passenger.R; -import com.mogo.och.bus.passenger.bean.TaxiPassengerVideoPlay; +import com.mogo.och.charter.passenger.R; +import com.mogo.och.charter.passenger.bean.TaxiPassengerVideoPlay; import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack; import java.util.List; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/BusPassengerMapAssetStyleUtil.java similarity index 97% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/BusPassengerMapAssetStyleUtil.java index edab28cb78..09807fa2b8 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/BusPassengerMapAssetStyleUtil.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.utils; +package com.mogo.och.charter.passenger.utils; import android.content.Context; diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/FullVideoUtils.kt similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/FullVideoUtils.kt index 0202dabf41..0e8ca48fc2 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/FullVideoUtils.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/FullVideoUtils.kt @@ -1,10 +1,10 @@ -package com.mogo.och.bus.passenger.utils +package com.mogo.och.charter.passenger.utils import android.annotation.SuppressLint import android.app.Activity import android.view.View import android.view.WindowManager -import com.mogo.och.bus.passenger.ui.video.ConsultVideoPlayer +import com.mogo.och.charter.passenger.ui.video.ConsultVideoPlayer import com.shuyu.gsyvideoplayer.GSYVideoManager import java.lang.Exception diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/VoiceFocusManager.kt similarity index 96% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/VoiceFocusManager.kt index 5e1dad8231..2b8d8dad8b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/VoiceFocusManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.utils +package com.mogo.och.charter.passenger.utils import android.os.Build import androidx.annotation.RequiresApi diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/ZoomDrawable.kt similarity index 94% rename from OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt rename to OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/ZoomDrawable.kt index 1811e3b1fd..ea8c41bdaa 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/utils/ZoomDrawable.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/ZoomDrawable.kt @@ -1,4 +1,4 @@ -package com.mogo.och.bus.passenger.utils +package com.mogo.och.charter.passenger.utils import android.content.Context import android.graphics.* diff --git a/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml index 73237c41d1..0de1e420ce 100644 --- a/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml +++ b/OCH/charter/passenger/src/main/res/layout/m1_bottom_bar.xml @@ -8,7 +8,7 @@ tools:ignore="MissingDefaultResource"> - - - - - - - - - @@ -91,13 +91,13 @@ app:layout_constraintEnd_toEndOf="@+id/viewBusPM1MsgBoxButton" app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" /> - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml b/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml index 66d7eea319..16ca18765c 100644 --- a/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml +++ b/OCH/charter/passenger/src/main/res/layout/m1_soft_fragment.xml @@ -84,7 +84,7 @@ app:layout_constraintStart_toStartOf="@+id/gl_left" app:layout_constraintTop_toTopOf="parent" /> - - - - - Date: Thu, 24 Aug 2023 18:11:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[6.0.0][Opt]=E9=AB=98=E7=B2=BE=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E9=87=87=E9=9B=86=E7=9B=B8=E5=85=B3=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E6=8F=92=E6=A1=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/matrixTrace/blackMethodList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/matrixTrace/blackMethodList.txt b/app/matrixTrace/blackMethodList.txt index 880f2aa415..b1cfcf574c 100644 --- a/app/matrixTrace/blackMethodList.txt +++ b/app/matrixTrace/blackMethodList.txt @@ -9,6 +9,7 @@ -keeppackage org/slf4j/ -keeppackage kotlin/ -keeppackage androidx/ +-keeppackage a/a/a/a/a -keepclass com.mogo.eagle.core.function.main.MainMoGoApplication -keepclass com.mogo.commons.AbsMogoApplication -keepclass com.bytedance.apm.agent.v2.instrumentation.AppAgent From e32f2c5f0aeaefe0872996d8f39275b4f1175691 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 24 Aug 2023 19:59:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[6.0.0]=201=E3=80=81=E9=A2=84=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E8=BD=A8=E8=BF=B9=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?= =?UTF-8?q?=202=E3=80=81=E5=8E=BB=E9=99=A4=E8=B5=B7=E7=82=B9=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/model/TaxiModel.kt | 5 +++-- .../och/taxi/utils/TaxiTrajectoryManager.java | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt index 7d1d909059..d013c8e749 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt @@ -591,8 +591,8 @@ object TaxiModel { judgeUntruthStation(mUntruthTask, mogoLocation) } - if (checkCurrentTask()) { - judgeTaskStartStation(mogoLocation) + if (checkCurrentTask() && mCurrentTaskAndOrder?.currentStatus == TaskStatusEnum.StartTask.code) { +// judgeTaskStartStation(mogoLocation) judgeTaskEndSiteStation(mogoLocation) } @@ -662,6 +662,7 @@ object TaxiModel { } private fun judgeTaskEndSiteStation(currentLocation: MogoLocation) { + i(SceneConstant.M_TAXI + TAG, "judgeEndStation() judgeTaskEndSiteStation") if (!checkCurrentTask()) { return } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index 92370e4f24..34d7c687d8 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -158,19 +158,28 @@ public class TaxiTrajectoryManager { final OrderDetail orderDetail = taskAndOrder.getOrder(); ContrailListRespBean.Result preloadContrail = null; //预加载的轨迹 + int preLoadIndex = -1; + + //包含接驾任务和送驾任务的轨迹, 且集合是有顺序的 , 最后一个是送驾任务轨迹 final List orderContrails = TaxiModel.INSTANCE.getCurOrderContrails(); if (orderDetail != null && orderContrails != null && orderContrails.size() != 0 ){ for (int i = 0; i< orderContrails.size() ; i++){ if (orderContrails.get(i).getLineId() == curLineId){ //预加载轨迹是curLineId索引的下一个 int index = i + 1; - if (orderContrails.size()-1 >= index){ + if (orderContrails.size() == index){ + //说明找到的是集合最后一个, 最后一个为送驾轨迹,即送驾轨迹和当前的任务轨迹是一样的,不再预加载 + preLoadIndex = index; + break; + }else if (orderContrails.size()-1 >= index){ preloadContrail = orderContrails.get(index); + preLoadIndex = index; + break; } } } - if (preloadContrail == null){ - //不包含预加载轨迹直接是集合第一个 + + if (preLoadIndex == -1){ //说明当前任务轨迹在接驾/送驾轨迹集合里没有, 直接加载轨迹集合第一个 preloadContrail = orderContrails.get(0); } }