[charter]

[3.2.0] [靠边停车后重新选择线路停止自驾停止路距计算、connectmsg 添加type]
2023-05-24 17:35:23 +08:00
parent 5db0a7ab12
commit 457dadde17
7 changed files with 70 additions and 53 deletions
--- 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() {
--- 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 {
--- 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()
            }
--- 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)
--- 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?,
--- 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)
    }
--- 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(