From 6da7093e5e81f3d10df980d41d36e15b3e832875 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 22 Dec 2022 11:35:40 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.0]=20=E9=95=BF=E9=93=BE=E6=8E=A5=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E9=81=93=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?const?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/bus/model/BusOrderModel.java   | 8 ++++----
 .../biz/common/socketmessage/OCHSocketMessageManager.kt   | 4 ++--
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index f034d76c6b..148aa350ca 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -162,11 +162,11 @@ public class BusOrderModel {
         OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener);
 
         OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(//监听运营消息
-                OCHSocketMessageManager.INSTANCE.getMsgMonitorType(),
+                OCHSocketMessageManager.msgMonitorType,
                 mMogoOnMessageListener);
 
         OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(//监听核销乘客
-                OCHSocketMessageManager.INSTANCE.getMsgWriteOffPassengerType(),
+                OCHSocketMessageManager.msgWriteOffPassengerType,
                 mWriteOffPassengeOnMessageListener);
 
         AbnormalFactorsLoopManager.INSTANCE.startLoopAbnormalFactors(mContext);
@@ -345,9 +345,9 @@ public class BusOrderModel {
         OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(null);
 
         OCHSocketMessageManager.INSTANCE.releaseSocketMessageListener(
-                OCHSocketMessageManager.INSTANCE.getMsgMonitorType());
+                OCHSocketMessageManager.msgMonitorType);
         OCHSocketMessageManager.INSTANCE.releaseSocketMessageListener(
-                OCHSocketMessageManager.INSTANCE.getMsgWriteOffPassengerType());
+                OCHSocketMessageManager.msgWriteOffPassengerType);
 
         AbnormalFactorsLoopManager.INSTANCE.stopLoopAbnormalFactors();
     }
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt
index dbeb35054e..0439ca7842 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt
@@ -12,8 +12,8 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
  * 统一管理业务长链消息推送
  */
 object OCHSocketMessageManager {
-    public val msgMonitorType:Int = 6295553
-    public val msgWriteOffPassengerType:Int = 6295554
+    const val msgMonitorType:Int = 6295553
+    const val msgWriteOffPassengerType:Int = 6295554
 
     fun <T> registerSocketMessageListener(msgType:Int,
                                           mogoOnMessageListener :IMogoOnMessageListener<T>){
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 384020964e..6b2e56777e 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -232,7 +232,7 @@ public class TaxiModel {
         OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener);
 
         OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(
-                OCHSocketMessageManager.INSTANCE.getMsgMonitorType(),
+                OCHSocketMessageManager.msgMonitorType,
                 mMogoOnMessageListener);
 
         AbnormalFactorsLoopManager.INSTANCE.startLoopAbnormalFactors(mContext);
@@ -264,7 +264,7 @@ public class TaxiModel {
         // 注销地图监听
         CallerMapLocationListenerManager.INSTANCE.removeListener(TAG,false);
 
-        OCHSocketMessageManager.INSTANCE.releaseSocketMessageListener(OCHSocketMessageManager.INSTANCE.getMsgMonitorType());
+        OCHSocketMessageManager.INSTANCE.releaseSocketMessageListener(OCHSocketMessageManager.msgMonitorType);
 
         CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(mGoAutopilotStatusListener);
         CallerAutopilotPlanningListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener);