From 3645f73b4a83d434ead593fea3fe22570bf04847 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 28 Feb 2023 21:16:24 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charter/callback/DriverM1OrderCallback.kt | 2 +- .../och/charter/fragment/DriverM1Fragment.kt | 30 +++--- .../mogo/och/charter/model/DriverM1Model.kt | 97 +++++++++++-------- .../charter/presenter/DriverM1Presenter.kt | 2 +- 4 files changed, 72 insertions(+), 59 deletions(-) diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt index 3e4edd3453..ac199b8ed6 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt @@ -8,6 +8,6 @@ import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse */ interface DriverM1OrderCallback { fun updateOrderUI(orderStatus: QueryCurrentOrderResponse.Result) // 到达站 - fun updateOverCountDown(minutes: Int) //倒计时 分钟 + fun updateOverCountDown(minutes: Long) //倒计时ms fun updateReturnCarStatus(returnSuccess: Boolean) } \ No newline at end of file diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index 831a2d1b72..e19618b23b 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -2,13 +2,13 @@ package com.magic.mogo.och.charter.fragment import android.os.Bundle import android.os.CountDownTimer -import android.view.View import android.view.View.GONE import android.view.View.VISIBLE import com.alibaba.android.arouter.launcher.ARouter import com.magic.mogo.och.charter.R import com.magic.mogo.och.charter.base.CharterBaseFragment import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse +import com.magic.mogo.och.charter.constant.CharterConst.Companion.LOOP_PERIOD_60S import com.magic.mogo.och.charter.net.login.LoginDriverM1Impl import com.magic.mogo.och.charter.presenter.DriverM1Presenter import com.magic.mogo.och.charter.view.SlidePanelView @@ -47,12 +47,7 @@ class DriverM1Fragment : CharterBaseFragment { - override fun onMsgReceived(obj: DataBaseMsg) { - if (obj == null) { - d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = null") - return - } - d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.msgType) + private val mOnSystemMessageListener = + object : IMogoOnMessageListener { + override fun onMsgReceived(obj: SystemMsg) { - when(obj.msgType){ - OCHSocketMessageManager.msgMonitorType ->{ //运营消息 - val msg = obj as SystemMsg - pushOperationalToMsgBox(obj.pushTimeStamp, msg.context) - val list = msg.screenList - if (list.size > 1){ //发送乘客屏 - sendMsgToClient(DPCommonOperationMsg(msg.context)) - } - } - OCHSocketMessageManager.msgOperateDoorType ->{ - sendMsgToClient(DPOperateDoorMsg(true)) - } - OCHSocketMessageManager.msgOrderClosedType ->{ //订单结束 - val msg = obj as OrderCloseMsg - pushOperationalToMsgBox(obj.pushTimeStamp, msg.message - ,OCHSocketMessageManager.OPERATION_ORDER_TYPE) - sendMsgToClient(DPOrderClosedMsg()) - } + d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.context) + + pushOperationalToMsgBox(obj.pushTimeStamp, obj.context) + val list = obj.screenList + if (list.size > 1){ //发送乘客屏 + sendMsgToClient(DPCommonOperationMsg(obj.context)) } } - override fun target(): Class { - return DataBaseMsg::class.java + override fun target(): Class { + return SystemMsg::class.java + } + } + + private val mOnDoorMessageListener = + object : IMogoOnMessageListener { + override fun onMsgReceived(obj: OperateDoorMsg) { + d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.message) + + sendMsgToClient(DPOperateDoorMsg(true)) + + } + + override fun target(): Class { + return OperateDoorMsg::class.java + } + } + + private val mOnOrderClosedMessageListener = + object : IMogoOnMessageListener { + override fun onMsgReceived(obj: OrderCloseMsg) { + //订单结束 + pushOperationalToMsgBox(obj.pushTimeStamp, obj.message + ,OCHSocketMessageManager.OPERATION_ORDER_TYPE) + sendMsgToClient(DPOrderClosedMsg()) + } + + override fun target(): Class { + return OrderCloseMsg::class.java } } @@ -579,9 +590,10 @@ class DriverM1Model { GsonUtils.toJson(data.data)) mCurrentOrder = data.data mOrderCallback?.updateOrderUI(data.data) - // 倒计时校验开始 + //给工控机发轨迹 checkoutContrail() - checkOrderCountDown() + // 倒计时校验开始 + startOrStopCheckCountDown(true) } override fun onFail(code: Int, msg: String?) { @@ -591,11 +603,11 @@ class DriverM1Model { } private fun startOrStopCheckCountDown(start: Boolean) { -// if (start){ -// DriverM1LooperManager.starCountDownLoop() -// }else{ -// DriverM1LooperManager.stopCountDownLoop() -// } + if (start){ + DriverM1LooperManager.starCountDownLoop() + }else{ + DriverM1LooperManager.stopCountDownLoop() + } } fun checkOrderCountDown() { @@ -608,12 +620,12 @@ class DriverM1Model { d(SceneConstant.M_CHARTER_D,"checkOrderCountDown = "+ GsonUtils.toJson(data.data)) val gap = data.data.endTime - data.data.currentTime if (gap >= 0){ - mOrderCallback?.updateOverCountDown((gap/1000/60).toInt()) + mOrderCallback?.updateOverCountDown(gap) } } override fun onFail(code: Int, msg: String?) { - TODO("Not yet implemented") + d(SceneConstant.M_CHARTER_D + TAG, "checkOrderCountDown-onFail== $msg .") } }) @@ -639,11 +651,14 @@ class DriverM1Model { } override fun onFail(code: Int, msg: String?) { - TODO("Not yet implemented") + d(SceneConstant.M_CHARTER_D + TAG, "changeDest-onFail== $msg .") } }) } + /** + * 后台配置的轨迹路线信息 + */ fun checkoutContrail(){ if (mCurrentOrder == null) return DriverM1ServiceManager.checkoutContrail(mContext,mCurrentOrder!!.lineId, diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt index 8b47fbbf37..1c1e48ab2b 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt @@ -95,7 +95,7 @@ class DriverM1Presenter(view: DriverM1Fragment?) : mView?.updateOrderUI(orderStatus) } - override fun updateOverCountDown(minutes: Int) { + override fun updateOverCountDown(minutes: Long) { mView?.updateCountDown(minutes) }