From 5d2ff266eba55772efe0c49be5888734176f1927 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Wed, 8 Mar 2023 14:32:21 +0800
Subject: [PATCH] =?UTF-8?q?[V1.1.0]=E5=A2=9E=E5=8A=A0Mis=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/sweeper/model/SweeperTaskModel.java   | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
index d00c951124..850291bc96 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
@@ -1,7 +1,5 @@
 package com.mogo.och.sweeper.model;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER;
-
 import android.content.Context;
 import android.util.Log;
 
@@ -10,6 +8,7 @@ import androidx.annotation.Nullable;
 
 import com.amap.api.maps.model.LatLng;
 import com.elegant.network.utils.GsonUtil;
+import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
 import com.mogo.commons.module.status.MogoStatusManager;
@@ -28,6 +27,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
+import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager;
+import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage;
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
@@ -63,6 +64,8 @@ import io.reactivex.functions.Consumer;
 import io.reactivex.plugins.RxJavaPlugins;
 import mogo.telematics.pad.MessagePad;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER;
+
 /**
  * @author congtaowang
  * @since 2021/3/23
@@ -126,6 +129,10 @@ public class SweeperTaskModel {
         //开启自驾后 异常信息返回
         OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener);
 
+        OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(
+                OCHSocketMessageManager.msgMonitorType,
+                mMogoOnMessageListener);
+
         //2022.1.28
         // 调用Disposable.dispose() 时候会出现InterruptedException 导致出现崩溃
         // The exception could not be delivered to the consumer because it has already canceled/disposed
@@ -228,6 +235,25 @@ public class SweeperTaskModel {
         return sInstance;
     }
 
+    private final IMogoOnMessageListener<OCHOperationalMessage> mMogoOnMessageListener =
+            new IMogoOnMessageListener<OCHOperationalMessage>() {
+                @Override
+                public Class<OCHOperationalMessage> target() {
+                    return OCHOperationalMessage.class;
+                }
+
+                @Override
+                public void onMsgReceived(OCHOperationalMessage obj) {
+                    if (obj == null){
+                        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onMsgReceived = null");
+                        return;
+                    }
+                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onMsgReceived = "+obj.getMessage());
+                    OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),
+                            obj.getMessage());
+                }
+            };
+
     private final IMogoStatusChangedListener mMogoStatusChangedListener = new IMogoStatusChangedListener() {
         // VR mode变更回调
         @Override