From dee42759350a3a1a9fa75852b0bc1c410ce6affb Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 25 Aug 2023 14:37:05 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20[charter]=20[=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=A1=A5=E4=B8=81=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BA=95=E7=9B=98=E6=8E=89=E5=A4=B4=E6=8F=90=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/CharterTrajectoryManager.kt | 12 +--------- .../passenger/model/CharterPassengerModel.kt | 23 +++++++++++-------- .../presenter/BusPassengerPresenter.kt | 5 ++++ .../och/charter/passenger/ui/MainFragment.kt | 1 + 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt index 8a87dae3aa..0d13cced28 100644 --- a/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt +++ b/OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt @@ -87,17 +87,7 @@ object CharterTrajectoryManager { // 5. 轨迹管理_轨迹下载超时 d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载超时") // ToastUtils.showShort("轨迹下载超时"); - } else if ("IMAP_TRA_LOADED" == guardianInfo.getCode()) { - CallerMsgBoxManager.saveMsgBox( - MsgBoxBean( - MsgBoxType.OPERATION, - OperationMsg( - System.currentTimeMillis(), "请尽快操作车辆至适当位置掉头！", -1 - ) - ) - ) - SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getTopActivity(), R.raw.startautopilot) - } else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) { + } else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) { // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载") syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!, diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index cac9ae42df..753f9410eb 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -45,6 +45,7 @@ import com.mogo.och.common.module.manager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.PinYinUtil +import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceManager import com.mogo.och.common.module.voice.VoiceNotice import io.reactivex.Observable @@ -191,15 +192,6 @@ object CharterPassengerModel { } } - override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { - super.onAutopilotGuardian(guardianInfo) - guardianInfo?.let { - if (it.code=="IMAP_TRA_LOADED") { - ToastCharterUtils.showToastShort("请等待车辆完成掉头后再出发吧～") - } - } - } - override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) { d(M_BUS_P + TAG, "底盘给到站信息") arriveDest() @@ -293,7 +285,18 @@ object CharterPassengerModel { LoginStatusManager.setLoginStatus(data.data.driverStatus) } - override fun onFail(code: Int, msg: String) {} + override fun onFail(code: Int, msg: String) { + RxUtils.createSubscribe { + queryLoginStatus() + } + } + + override fun onError() { + super.onError() + RxUtils.createSubscribe { + queryLoginStatus() + } + } }) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt index d5d88e3300..02f05ba21b 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt @@ -344,4 +344,9 @@ class BusPassengerPresenter(view: MainFragment?) : } } + + fun querLogin() { + CharterPassengerModel.queryLoginStatus() + } + } \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt index 384dd8ed58..4fd5699571 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt @@ -119,6 +119,7 @@ class MainFragment : MvpFragment(), IMogo return true } } else { + mPresenter?.querLogin() ToastCharterUtils.showToastShort(requireContext().getString(R.string.m1_please_login_driver)) return true }