[3.2.0] charter 司机端增加核销传递给乘客屏

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/WriteOffPassenger.java

@@ -0,0 +1,14 @@
+package com.magic.mogo.och.charter.bean;
+
+import java.io.Serializable;
+
+/**
+ * @author: wangmingjun
+ * @date: 2022/9/23
+ */
+public class WriteOffPassenger implements Serializable {
+    public String phone;
+    public String orderNo;
+    public int passengerSize;
+    public long writeOffTime;
+}

OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -7,10 +7,7 @@ import com.alibaba.android.arouter.utils.TextUtils
 import com.amap.api.maps.model.LatLng
 import com.elegant.network.utils.GsonUtil
 import com.magic.mogo.och.charter.R
-import com.magic.mogo.och.charter.bean.CheckOrderCountDownResponse
-import com.magic.mogo.och.charter.bean.QueryBusinessStatusResponse
-import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse
-import com.magic.mogo.och.charter.bean.QueryRoutesResponse
+import com.magic.mogo.och.charter.bean.*
 import com.magic.mogo.och.charter.callback.ChangeDestCallback
 import com.magic.mogo.och.charter.callback.DriverM1OrderCallback
 import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback
@@ -33,11 +30,13 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToAllClients
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.*
 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.common.socketmessage.OCHSocketMessageManager.pushAppOperationalMsgBox
+import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.registerSocketMessageListener
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.releaseSocketMessageListener
 import com.mogo.och.common.module.biz.common.socketmessage.data.*
 import com.mogo.och.common.module.biz.constant.OchCommonConst
@@ -114,18 +113,24 @@ class DriverM1Model {
         OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener)
 
         // 监听运营信息
-        OCHSocketMessageManager.registerSocketMessageListener(
+        registerSocketMessageListener(
             OCHSocketMessageManager.msgMonitorType,
             mOnSystemMessageListener)
         //监听开门
-        OCHSocketMessageManager.registerSocketMessageListener(
+        registerSocketMessageListener(
             OCHSocketMessageManager.msgOperateDoorType,
             mOnDoorMessageListener)
         //监听订单结束
-        OCHSocketMessageManager.registerSocketMessageListener(
+        registerSocketMessageListener(
             OCHSocketMessageManager.msgOrderClosedType,
             mOnOrderClosedMessageListener)
 
+        //监听核销乘客
+        registerSocketMessageListener<WriteOffPassenger>( //监听核销乘客
+            OCHSocketMessageManager.msgWriteOffPassengerType,
+            mWriteOffPassengerOnMessageListener
+        )
+
         //监听乘客屏发来的消息
         CallerTelematicListenerManager.addListener(TAG,mReceivedMsgListener)
 
@@ -301,6 +306,21 @@ class DriverM1Model {
             }
         }
 
+    private val mWriteOffPassengerOnMessageListener: IMogoOnMessageListener<WriteOffPassenger> =
+        object : IMogoOnMessageListener<WriteOffPassenger> {
+            override fun target(): Class<WriteOffPassenger> {
+                return WriteOffPassenger::class.java
+            }
+
+            override fun onMsgReceived(passenger: WriteOffPassenger?) {
+                //进行播报
+                i(SceneConstant.M_BUS + TAG, "passenger = " + GsonUtil.jsonFromObject(passenger))
+                if (passenger != null && passenger.passengerSize == 0) return
+                val appMsg = AppConnectMsg(false,true,"核销成功，${passenger?.passengerSize}人乘车")
+                sendMsgToClient(appMsg)
+            }
+        }
+
     fun pushOperationalToMsgBox(time : Long,content : String,type: Int = -1){
         playDI()
         pushAppOperationalMsgBox(time, content,type)
@@ -462,7 +482,7 @@ class DriverM1Model {
      * 将业务订单信息保存，鹰眼可取用
      */
     fun updateAutopilotControlParameters() {
-        // TODO: 业务信息保存
+        // 业务信息保存
         val parameters = initAutopilotControlParameters()
         if (null == parameters) {
             d(SceneConstant.M_CHARTER_D + TAG, "AutopilotControlParameters is empty.")