From 457dadde1770012b6af3fb8f6354601abc1718f2 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 24 May 2023 17:35:23 +0800 Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E9=9D=A0=E8=BE=B9?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=90=8E=E9=87=8D=E6=96=B0=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=81=9C=E6=AD=A2=E8=87=AA=E9=A9=BE=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E8=B7=AF=E8=B7=9D=E8=AE=A1=E7=AE=97=E3=80=81connectms?= =?UTF-8?q?g=20=E6=B7=BB=E5=8A=A0type]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/CharterPassengerModel.kt | 30 +++++--- .../BusPassengerFunctionOrderPresenter.kt | 3 - .../fragment/M1OrderLineFragment.kt | 74 ++++++++++--------- .../mogo/och/charter/model/DriverM1Model.kt | 6 +- .../och/common/module/bean/dpmsg/DataBean.kt | 5 +- .../LightAirconditionDoorManager.kt | 3 +- .../utils/CoordinateCalculateRouteUtil.java | 2 +- 7 files changed, 70 insertions(+), 53 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 92b24c8b47..75f6f3cbc4 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/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 @@ -521,11 +522,7 @@ object CharterPassengerModel { orderInfo = null locusInfo = null if (data.businessStatus == 2) {// 订单结束 没有还车 - switchLine5minWait?.let { - if (!it.isDisposed) { - it.dispose() - } - } + RxUtils.disposeSubscribe(switchLine5minWait) setOrderStatus(OrderStatusEnum.NoOrderUse) } else { // 车辆空闲 订单结束已经还车 @@ -897,6 +894,12 @@ object CharterPassengerModel { needSendDriver:Boolean ) { val (order, lineId, siteId) = getOrderInfo() + val requestSuccessSign = "${siteId}$endKey" + + if (!isSuccess(requestSuccessSign)){ + return + } + if(order!=null&&lineId!=null&&siteId!=null){ VoiceManager.arrivedStation( order.siteName!!, @@ -904,7 +907,7 @@ object CharterPassengerModel { VoiceFocusManager.getVoiceCmdCallBack() ) // 请求成功了 - broadcastList["${siteId}$endKey"] = true + broadcastList[requestSuccessSign] = true // 给司机端 if (needSendDriver) { val msg = ChangeDestMsg( @@ -926,11 +929,7 @@ object CharterPassengerModel { CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "到站发送数据${msg}") } - switchLine5minWait?.let { - if (!it.isDisposed) { - it.dispose() - } - } + RxUtils.disposeSubscribe(switchLine5minWait) // 到站结束自驾 CallerAutoPilotControlManager.cancelAutoPilot() @@ -971,7 +970,16 @@ object CharterPassengerModel { broadcastList[requestSuccessSign] == null || broadcastList[requestSuccessSign] == false fun cleanbroadcastListInfo(){ + switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) { + CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了") + } broadcastList.clear() + // 到站结束自驾 + CallerAutoPilotControlManager.cancelAutoPilot() + // 停止路距计算 + endCalculateDistanceLoop() + // 到站置距离位0 + invokeStationDistanceListener(-1, -1) } fun leaveStation() { diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index ce59b6f8b3..1c8b269e14 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -221,9 +221,6 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : mView?.lineAdapterSubmit(it) } mView?.hideDataDriverAgree() - CharterPassengerModel.switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) { - CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了") - } CharterPassengerModel.queryOrder() CharterPassengerModel.cleanbroadcastListInfo() } else { diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt index 3a2f6b65f9..ad304f5f73 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt @@ -134,17 +134,19 @@ class M1OrderLineFragment : */ fun setEnableSiteStatus(cancleAndSubmit: Boolean) { if (cancleAndSubmit) { - g_side_cancle_submit_group.visibility = View.VISIBLE + g_side_cancle_submit_group?.visibility = View.VISIBLE } else { - g_side_cancle_submit_group.visibility = View.GONE + g_side_cancle_submit_group?.visibility = View.GONE } } fun hideDataWaitDriverMsg() { - g_lines_sites_data.visibility = View.GONE - g_loading_group.visibility = View.VISIBLE - val animationDrawable = iv_loading_wait_driver.drawable as AnimationDrawable - animationDrawable.start() + g_lines_sites_data?.visibility = View.GONE + g_loading_group?.visibility = View.VISIBLE + iv_loading_wait_driver?.let { + val animationDrawable = it.drawable as AnimationDrawable + animationDrawable.start() + } } fun showSelectData() { @@ -157,21 +159,25 @@ class M1OrderLineFragment : } fun hideDataDriverAgree(){ - group_driver_agrenn_line.visibility = View.VISIBLE - aciv_driver_refuse_group.visibility = View.GONE - g_loading_group.visibility = View.GONE - g_lines_sites_data.visibility = View.GONE - subscribeDirverAgree = RxUtils.createSubscribe(3_000) { - dismiss?.closeDialog() + group_driver_agrenn_line?.visibility = View.VISIBLE + aciv_driver_refuse_group?.visibility = View.GONE + g_loading_group?.visibility = View.GONE + g_lines_sites_data?.let { + it.visibility = View.GONE + subscribeDirverAgree = RxUtils.createSubscribe(3_000) { + dismiss?.closeDialog() + } } } fun hideDataDriverRefuse(){ - group_driver_agrenn_line.visibility = View.GONE - aciv_driver_refuse_group.visibility = View.VISIBLE - g_loading_group.visibility = View.GONE - g_lines_sites_data.visibility = View.GONE - subscribeDirverRefuse = RxUtils.createSubscribe(3_000) { - showSelectData() + group_driver_agrenn_line?.visibility = View.GONE + aciv_driver_refuse_group?.visibility = View.VISIBLE + g_loading_group?.visibility = View.GONE + g_lines_sites_data?.let { + it.visibility = View.GONE + subscribeDirverRefuse = RxUtils.createSubscribe(3_000) { + showSelectData() + } } } @@ -183,31 +189,31 @@ class M1OrderLineFragment : ) { if(showBiz){ // 选择线路页面 - m1_order_noorder.visibility = View.GONE - m1_order_neterror.visibility = View.GONE - lsv_line_site.visibility = View.VISIBLE - m1_order_loading.visibility = View.GONE + m1_order_noorder?.visibility = View.GONE + m1_order_neterror?.visibility = View.GONE + lsv_line_site?.visibility = View.VISIBLE + m1_order_loading?.visibility = View.GONE return } if(showNetError){ - m1_order_noorder.visibility = View.GONE - m1_order_neterror.visibility = View.VISIBLE - lsv_line_site.visibility = View.GONE - m1_order_loading.visibility = View.GONE + m1_order_noorder?.visibility = View.GONE + m1_order_neterror?.visibility = View.VISIBLE + lsv_line_site?.visibility = View.GONE + m1_order_loading?.visibility = View.GONE return } if(showNorOrder){ - m1_order_noorder.visibility = View.VISIBLE - m1_order_neterror.visibility = View.GONE - lsv_line_site.visibility = View.GONE - m1_order_loading.visibility = View.GONE + m1_order_noorder?.visibility = View.VISIBLE + m1_order_neterror?.visibility = View.GONE + lsv_line_site?.visibility = View.GONE + m1_order_loading?.visibility = View.GONE return } if(showLoading){ - m1_order_noorder.visibility = View.GONE - m1_order_neterror.visibility = View.GONE - lsv_line_site.visibility = View.GONE - m1_order_loading.visibility = View.VISIBLE + m1_order_noorder?.visibility = View.GONE + m1_order_neterror?.visibility = View.GONE + lsv_line_site?.visibility = View.GONE + m1_order_loading?.visibility = View.VISIBLE if (!loadingAni.isRunning) { loadingAni.start() } diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index 3aed6f1ba3..3384d1b3ff 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -247,7 +247,11 @@ class DriverM1Model { ) as AppConnectMsg CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "收到数据：常规数据:$msg") if (msg.isViewShow) { //消息盒子显示内容 - pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), msg.msg) + pushOperationalToMsgBox( + DateTimeUtil.getCurrentTimeStamp(), + msg.msg, + msg.boxType + ) } if(msg.isPlay){ VoiceNotice.showNotice(msg.msg, AIAssist.LEVEL1) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt index 7811310639..a8a65b3dfb 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt @@ -76,8 +76,9 @@ data class DPOrderClosedMsg( var closed: Boolean = true // true: 结束 ): BaseDPMsg(DPMsgType.TYPE_ORDER_CLOSED.type) -data class AppConnectMsg(var isViewShow: Boolean = true, var isPlay: Boolean= false, var msg: String, -): BaseDPMsg(DPMsgType.TYPE_COMMON.type) +data class AppConnectMsg( + var isViewShow: Boolean = true, var isPlay: Boolean = false, var msg: String,var boxType:Int=-1 +) : BaseDPMsg(DPMsgType.TYPE_COMMON.type) data class TaskDetailsMsg( var msg: String?, 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 7d226a5f95..01262dba66 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 @@ -59,7 +59,8 @@ object LightAirconditionDoorManager { val appConnectMsg = AppConnectMsg( isViewShow = true, isPlay = false, - msg = msg + msg = msg, + boxType = 3 ) LanSocketManager.sendMsgToServer(appConnectMsg) } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java index 75c29aee47..c4c38034c1 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java @@ -79,7 +79,7 @@ public class CoordinateCalculateRouteUtil { int currentRouteIndex = getArrivedPointIndexNew( 0, mRoutePoints, location.getLongitude(), location.getLatitude() ); - // 距离当前位置轨迹中最近的轨迹点 + // 距离当前位置轨迹中最近的轨迹点坐标 MogoLocation currentPoint = mRoutePoints.get(currentRouteIndex); // 当前位置距离最近的点的距离 float calculateCurrentdex = CoordinateUtils.calculateLineDistance(