[2.13.0] 运营消息push调通

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java

@@ -1,10 +1,12 @@
 package com.mogo.och.bus.bean;
 
+import java.io.Serializable;
+
 /**
  * @author: wangmingjun
  * @date: 2022/9/23
  */
-public class WriteOffPassenger {
+public class WriteOffPassenger implements Serializable {
     public String phone;
     public String orderNo;
     public int passengerSize;

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java

@@ -1,6 +1,7 @@
 package com.mogo.och.bus.model;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 import static com.mogo.och.bus.constant.BusConst.DELAY_10S;
 import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_ARRIVING;
 import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_STOPPED;
@@ -22,7 +23,6 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.module.status.StatusDescriptor;
-import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.BaseData;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -34,11 +34,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListen
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.R;
-import com.mogo.och.bus.bean.BusQueryWriteOffPassengersResponse;
 import com.mogo.och.bus.bean.BusRoutePlanningUpdateReqBean;
 import com.mogo.och.bus.bean.BusRoutesResponse;
 import com.mogo.och.bus.bean.BusRoutesResult;
@@ -66,7 +64,6 @@ import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.DateTimeUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;
-import com.mogo.och.common.module.utils.SoundPoolHelper;
 import com.mogo.och.common.module.utils.ToastUtilsOch;
 import com.mogo.och.common.module.voice.VoiceNotice;
 
@@ -223,7 +220,12 @@ public class BusOrderModel {
 
                 @Override
                 public void onMsgReceived(OCHOperationalMessage obj) {
-                    //todo 塞入消息盒子
+                    if (obj == null){
+                        CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = null");
+                        return;
+                    }
+                    OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),
+                            obj.getMessage());
                 }
             };
 

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt

@@ -1,10 +1,12 @@
 package com.mogo.och.common.module.biz.common.socketmessage
 
-import android.icu.lang.UCharacter.GraphemeClusterBreak.T
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxType
+import com.mogo.eagle.core.data.msgbox.OperationMsg
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 
 /**
  * 统一管理业务长链消息推送
@@ -23,4 +25,9 @@ object OCHSocketMessageManager {
         MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext)
                 .unregisterLifecycleListener(msgType)
     }
+
+    fun pushAppOperationalMsgBox(time : Long,content : String){
+        CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.OPERATION,
+                OperationMsg(time,content)));
+    }
 }

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt

@@ -1,10 +1,10 @@
 package com.mogo.och.common.module.biz.common.socketmessage.data
 
-/**
- * 运营消息data类
- */
-data class OCHOperationalMessage (
-        var message: String = "" ,//运营消息
+import java.io.Serializable
+
+data class OCHOperationalMessage(
+        var message: String = "",//运营消息
         var messageType: Int = 0, // 运营消息类型，目前没有用处，后台也没返回
+        // 运营消息类型，目前没有用处，后台也没返回
         var pushTimeStamp: Long = System.currentTimeMillis() // 消息下发时间戳
-)
+): Serializable

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java

@@ -243,7 +243,12 @@ public class TaxiModel {
 
                 @Override
                 public void onMsgReceived(OCHOperationalMessage obj) {
-                    //todo 塞入消息盒子
+                    if (obj == null){
+                        CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = null");
+                        return;
+                    }
+                    OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),
+                            obj.getMessage());
                 }
             };