diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index dc18c66228..6b438f7a6c 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -48,6 +48,7 @@ import com.mogo.och.bus.util.BusVoiceManager; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager; import com.mogo.och.common.module.manager.autopilot.line.LineManager; import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener; +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction2; import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg; @@ -152,7 +153,7 @@ public class OrderModel { OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(//监听运营消息 OCHSocketMessageManager.msgMonitorType, - mMogoOnMessageListener); + new OperateAction2()); OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(//监听核销乘客 OCHSocketMessageManager.msgWriteOffPassengerType, @@ -279,25 +280,6 @@ public class OrderModel { GsonUtils.toJson(data)); } - private final IOchOnMessageListener mMogoOnMessageListener = - new IOchOnMessageListener() { - @Override - public Class target() { - return OCHOperationalMessage.class; - } - - @Override - public void onMsgReceived(OCHOperationalMessage obj) { - if (obj == null){ - CallerLogger.d(M_BUS + TAG, "onMsgReceived = null"); - return; - } - CallerLogger.i(M_BUS + TAG,"onMsgReceived = "+obj.getMessage()); - OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(), - obj.getMessage(),OCHSocketMessageManager.OPERATION_SYSTEM); - } - }; - private final IOchOnMessageListener mWriteOffPassengerOnMessageListener = new IOchOnMessageListener() { @Override diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index e457f38d63..045aecf0dd 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -57,9 +57,9 @@ import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.registerSocketMessageListener import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.releaseSocketMessageListener +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction import com.mogo.och.common.module.manager.socket.cloud.data.OperateDoorMsg import com.mogo.och.common.module.manager.socket.cloud.data.OrderCloseMsg -import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg @@ -126,7 +126,7 @@ class DriverM1Model { // 监听运营信息 registerSocketMessageListener( OCHSocketMessageManager.msgMonitorType, - mOnSystemMessageListener + OperateAction(true) ) //监听开门 registerSocketMessageListener( @@ -251,28 +251,6 @@ class DriverM1Model { } } - private val mOnSystemMessageListener = - object : IOchOnMessageListener { - override fun onMsgReceived(obj: SystemMsg) { - - d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.context) - - val list = obj.screenList - d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + GsonUtils.toJson(list)) - if (list != null && list.contains(1)){ // 司机端 - pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), obj.context) - } - if (list != null && list.contains(2)){ //发送乘客屏 - sendMsgToClient(AppConnectMsg(msg = obj.context)) - } - - } - - override fun target(): Class { - return SystemMsg::class.java - } - } - private val mOnDoorMessageListener = object : IOchOnMessageListener { override fun onMsgReceived(obj: OperateDoorMsg) { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/action/OperateAction.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/action/OperateAction.kt new file mode 100644 index 0000000000..543b86639a --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/action/OperateAction.kt @@ -0,0 +1,39 @@ +package com.mogo.och.common.module.manager.socket.cloud.action + +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener +import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager +import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg +import com.mogo.och.common.module.manager.socket.lan.LanSocketManager.sendMsgToClient +import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg +import com.mogo.och.common.module.utils.DateTimeUtil + +class OperateAction(private val relayPassenger: Boolean = false) : + IOchOnMessageListener { + + private val tag = "OperateAction" + + override fun target(): Class { + + return SystemMsg::class.java + } + + override fun onMsgReceived(obj: SystemMsg?) { + i(M_BUS + tag, "onMsgReceived = $obj") + obj?.apply { + if (isSend2Driver()) { + OCHSocketMessageManager.pushAppOperationalMsgBox( + DateTimeUtil.getCurrentTimeStamp(), + context, + OCHSocketMessageManager.OPERATION_SYSTEM + ) + } + if(relayPassenger){ + if(isSend2Passenger()){ + sendMsgToClient(AppConnectMsg(msg = context)) + } + } + } + } +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/action/OperateAction2.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/action/OperateAction2.kt new file mode 100644 index 0000000000..5405c04582 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/action/OperateAction2.kt @@ -0,0 +1,29 @@ +package com.mogo.och.common.module.manager.socket.cloud.action + +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener +import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager +import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage +import com.mogo.och.common.module.utils.DateTimeUtil + +class OperateAction2 : IOchOnMessageListener { + + private val tag = "OperateAction" + + override fun target(): Class { + + return OCHOperationalMessage::class.java + } + + override fun onMsgReceived(obj: OCHOperationalMessage?) { + i(M_BUS + tag, "onMsgReceived = $obj") + obj?.apply { + OCHSocketMessageManager.pushAppOperationalMsgBox( + DateTimeUtil.getCurrentTimeStamp(), + message, + OCHSocketMessageManager.OPERATION_SYSTEM + ) + } + } +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/data/SystemMsg.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/data/SystemMsg.kt index 7379b89c76..0f3a5b3b4b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/data/SystemMsg.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/data/SystemMsg.kt @@ -5,7 +5,28 @@ package com.mogo.och.common.module.manager.socket.cloud.data */ data class SystemMsg( var context: String, - var screenList: MutableList,//1:司机屏 2:乘客屏 + var screenList: MutableList?,//1:司机屏 2:乘客屏 var pushTimeStamp: Long = System.currentTimeMillis() // 消息下发时间戳 -) +){ + companion object{ + const val isDriver = 1 + const val isPassenger = 2 + } + + fun isSend2Driver() :Boolean{ + if (screenList != null && screenList!!.contains(isDriver)) { + return true + } + return false + } + + fun isSend2Passenger():Boolean{ + if (screenList != null && screenList!!.contains(isPassenger)) { + return true + } + return false + } + + +} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java index e6e513cc32..3f7a042cef 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java @@ -23,7 +23,7 @@ import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager; import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager; -import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener; +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType; import com.mogo.och.common.module.voice.VoiceNotice; @@ -136,7 +136,7 @@ public class OrderModel { OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(//监听运营消息 OCHSocketMessageManager.msgMonitorType, - mMogoOnMessageListener); + new OperateAction(true)); AbnormalFactorsLoopManager.INSTANCE.startLoopAbnormalFactors(mContext); @@ -207,36 +207,6 @@ public class OrderModel { } }; - private final IOchOnMessageListener mMogoOnMessageListener = - new IOchOnMessageListener() { - @Override - public Class target() { - return SystemMsg.class; - } - - @Override - public void onMsgReceived(SystemMsg obj) { - if (obj == null) { - CallerLogger.d(M_BUS + TAG, "onMsgReceived = null"); - return; - } - CallerLogger.i(M_BUS + TAG, "onMsgReceived = " + obj.getContext()); - List list = obj.getScreenList(); - CallerLogger.i(M_BUS + TAG, "onMsgReceived = " + GsonUtils.toJson(list)); - - if (list != null && list.contains(1)) { // 1司机端 - OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(), - obj.getContext(), OCHSocketMessageManager.OPERATION_SYSTEM); - } - - if (list != null && list.contains(2)) { //乘客屏 - AppConnectMsg msg = new AppConnectMsg(true, false, obj.getContext(), -1); - LanSocketManager.sendMsgToClient(msg); - } - - } - }; - public void setAdasStatusCallback(IBusADASStatusCallback callback) { this.mADASStatusCallback = callback; } diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java index 07e26c9ce7..c808bb3d8d 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java @@ -38,9 +38,8 @@ import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager; import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager; import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager; -import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener; import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager; -import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg; +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg; import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg; @@ -138,7 +137,7 @@ public class OrderModel { OCHSocketMessageManager.INSTANCE.registerSocketMessageListener(//监听运营消息 OCHSocketMessageManager.msgMonitorType, - mMogoOnMessageListener); + new OperateAction(true)); TicketModel.INSTANCE.load(); @@ -211,36 +210,6 @@ public class OrderModel { } }; - private final IOchOnMessageListener mMogoOnMessageListener = - new IOchOnMessageListener() { - @Override - public Class target() { - return SystemMsg.class; - } - - @Override - public void onMsgReceived(SystemMsg obj) { - if (obj == null){ - CallerLogger.d(M_BUS + TAG, "onMsgReceived = null"); - return; - } - CallerLogger.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext()); - List list = obj.getScreenList(); - CallerLogger.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); - - if (list != null && list.contains(1)){ // 1司机端 - OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(), - obj.getContext(),OCHSocketMessageManager.OPERATION_SYSTEM); - } - - if (list != null && list.contains(2)){ //乘客屏 - AppConnectMsg msg = new AppConnectMsg(true,false,obj.getContext(),-1); - LanSocketManager.sendMsgToClient(msg); - } - - } - }; - public void setAdasStatusCallback(IBusADASStatusCallback callback){ this.mADASStatusCallback = callback; } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt index a67a5911ea..0e315e33cc 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt @@ -112,9 +112,7 @@ object BusLineModel { } override fun onNext(data: List) { - if (mBusLinesCallback != null) { - mBusLinesCallback!!.onBusLinesChange(data) - } + mBusLinesCallback?.onBusLinesChange(data) } }) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index 4efcf48220..95a1acb518 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -23,8 +23,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e -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.mogo.logger.scene.SceneConstant.Companion.M_BUS import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils @@ -40,19 +40,14 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.canStartAutoPilotSSM import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.startAutoPilot import com.mogo.och.common.module.manager.autopilot.line.LineManager.setLineId -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager.addGCJ02Listener -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager.removeGCJ02Listener +import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager.setStationPoint import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.stopLoopAbnormalFactors -import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager -import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox -import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.registerSocketMessageListener -import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.releaseSocketMessageListener -import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction import com.mogo.och.common.module.manager.socket.lan.LanSocketManager.sendMsgToClient import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg @@ -140,14 +135,14 @@ object OrderModel { fun init() { mContext = AbsMogoApplication.getApp() // 定位监听 - addGCJ02Listener(TAG, 5, mMapLocationListener) + OchLocationManager.addGCJ02Listener(TAG, 5, mMapLocationListener) //开启自驾后 异常信息返回 OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener) - registerSocketMessageListener( //监听运营消息 + OCHSocketMessageManager.registerSocketMessageListener( //监听运营消息 OCHSocketMessageManager.msgMonitorType, - mMogoOnMessageListener + OperateAction(true) ) load() @@ -184,36 +179,6 @@ object OrderModel { } } - private val mMogoOnMessageListener = object : IOchOnMessageListener { - override fun target(): Class { - return SystemMsg::class.java - } - - override fun onMsgReceived(obj: SystemMsg?) { - if (obj == null) { - d(SceneConstant.M_BUS + TAG, "onMsgReceived = null") - return - } - i(SceneConstant.M_BUS + TAG, "onMsgReceived = " + obj.context) - val list: List = obj.screenList - i(SceneConstant.M_BUS + TAG, "onMsgReceived = " + GsonUtils.toJson(list)) - - if (list != null && list.contains(1)) { // 1司机端 - pushAppOperationalMsgBox( - DateTimeUtil.getCurrentTimeStamp(), - obj.context, OCHSocketMessageManager.OPERATION_SYSTEM - ) - } - - if (list != null && list.contains(2)) { //乘客屏 - val msg = AppConnectMsg(true, false, obj.context, -1) - sendMsgToClient(msg) - } - } - - - } - @JvmStatic fun setAdasStatusCallback(callback: IBusADASStatusCallback?) { this.mADASStatusCallback = callback @@ -238,16 +203,12 @@ object OrderModel { fun release() { // 注销定位监听 - removeGCJ02Listener(TAG) + OchLocationManager.removeGCJ02Listener(TAG) OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(null) - releaseSocketMessageListener( - OCHSocketMessageManager.msgMonitorType - ) - releaseSocketMessageListener( - OCHSocketMessageManager.msgWriteOffPassengerType - ) + OCHSocketMessageManager.releaseSocketMessageListener(OCHSocketMessageManager.msgMonitorType) + OCHSocketMessageManager.releaseSocketMessageListener(OCHSocketMessageManager.msgWriteOffPassengerType) stopLoopAbnormalFactors() //监听乘客屏发来的消息 @@ -276,15 +237,13 @@ object OrderModel { } // 自车定位 - private val mMapLocationListener: IMoGoChassisLocationGCJ02Listener = - object : IMoGoChassisLocationGCJ02Listener { + private val mMapLocationListener = object : IMoGoChassisLocationGCJ02Listener { override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { if (null == mogoLocation) return //是否到站的围栏判断 离站状态并且自动驾驶还未触发到站 if (isGoingToNextStation && !isArrivedStation) { - OCHThreadPoolManager.getsInstance() - .locationExecute { judgeArrivedStation(mogoLocation) } + OCHThreadPoolManager.getsInstance().locationExecute { judgeArrivedStation(mogoLocation) } } } } @@ -1035,7 +994,7 @@ object OrderModel { private fun tipStartTask(s: String) { val tips = ResourcesUtils.getString(R.string.bus_before_tips_s,s) //展示在运营消息 - pushAppOperationalMsgBox( + OCHSocketMessageManager.pushAppOperationalMsgBox( DateTimeUtil.getCurrentTimeStamp(), tips, OCHSocketMessageManager.OPERATION_SYSTEM ) @@ -1170,10 +1129,7 @@ object OrderModel { if (isArrivedStation) return - d( - SceneConstant.M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" - + currentStationIndex - ) + d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=${currentStationIndex}") arriveSiteStation(type) } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt index 5f268b78ab..bcf7bb3cbc 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusLinePresenter.kt @@ -39,9 +39,7 @@ class BusLinePresenter(view: BusSwitchLineView?) : Presenter } override fun onBusLinesChange(data: List) { - if (mView != null) { - mView!!.onBusLinesChange(data) - } + mView?.onBusLinesChange(data) } override fun onChangeLineIdSuccess() { diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java index acc406ae98..b95e85fa96 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java @@ -35,9 +35,8 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager; import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager; -import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener; import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager; -import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage; +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction2; import com.mogo.och.common.module.network.OchCommonServiceCallback; import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; @@ -143,7 +142,7 @@ public class SweeperOperateTaskModel { OCHSocketMessageManager.INSTANCE.registerSocketMessageListener( OCHSocketMessageManager.msgMonitorType, - mMogoOnMessageListener); + new OperateAction2()); IntentManager.getInstance() .registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener); @@ -267,25 +266,6 @@ public class SweeperOperateTaskModel { return sInstance; } - private final IOchOnMessageListener mMogoOnMessageListener = - new IOchOnMessageListener() { - @Override - public Class target() { - return OCHOperationalMessage.class; - } - - @Override - public void onMsgReceived(OCHOperationalMessage obj) { - if (obj == null) { - CallerLogger.d(M_SWEEPER + TAG, "onMsgReceived = null"); - return; - } - CallerLogger.d(M_SWEEPER + TAG, "onMsgReceived = " + obj.getMessage()); - OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), - obj.getMessage(), OCHSocketMessageManager.OPERATION_SYSTEM); - } - }; - //监听网络变化，避免启动机器时无网导致无法更新信息 private final IMogoIntentListener mNetWorkIntentListener = new IMogoIntentListener() { diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index dfa83dd17a..2aa7e4278a 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -44,9 +44,8 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager; import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager; import com.mogo.och.common.module.manager.autopilot.line.LineManager; -import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener; import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager; -import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage; +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction2; import com.mogo.och.common.module.biz.login.LoginStatusManager; import com.mogo.och.common.module.network.OchCommonServiceCallback; import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; @@ -226,7 +225,7 @@ public class TaxiModel { OCHSocketMessageManager.INSTANCE.registerSocketMessageListener( OCHSocketMessageManager.msgMonitorType, - mMogoOnMessageListener); + new OperateAction2()); AbnormalFactorsLoopManager.INSTANCE.startLoopAbnormalFactors(mContext); @@ -235,25 +234,6 @@ public class TaxiModel { } - private final IOchOnMessageListener mMogoOnMessageListener = - new IOchOnMessageListener() { - @Override - public Class target() { - return OCHOperationalMessage.class; - } - - @Override - public void onMsgReceived(OCHOperationalMessage obj) { - if (obj == null) { - CallerLogger.d(M_TAXI + TAG, "onMsgReceived = null"); - return; - } - CallerLogger.d(M_TAXI + TAG, "onMsgReceived = " + obj.getMessage()); - OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), - obj.getMessage(), OCHSocketMessageManager.OPERATION_SYSTEM); - } - }; - private void releaseListeners() { // 注销地图监听 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index 27afc9e8cd..531821da17 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -51,9 +51,8 @@ import com.mogo.och.common.module.manager.distance.IDistanceListener import com.mogo.och.common.module.manager.distance.ITrajectoryListener import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager -import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager -import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage +import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction2 import com.mogo.och.common.module.map.AmapNaviToDestinationModel import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjLocations @@ -223,7 +222,7 @@ object TaxiTaskModel { .setAdasStartFailureCallback(mAdasStartAutopilotFailureListener) OCHSocketMessageManager.registerSocketMessageListener( OCHSocketMessageManager.msgMonitorType, - mMogoOnSocketMessageListener + OperateAction2() ) MogoStatusManager.getInstance().registerStatusChangedListener( TAG, @@ -492,25 +491,6 @@ object TaxiTaskModel { } } - private val mMogoOnSocketMessageListener = - object : IOchOnMessageListener { - override fun target(): Class { - return OCHOperationalMessage::class.java - } - - override fun onMsgReceived(obj: OCHOperationalMessage?) { - if (obj == null) { - d(TAG, "onMsgReceived = null") - return - } - d(TAG, "onMsgReceived = $obj.message") - OCHSocketMessageManager.pushAppOperationalMsgBox( - obj.pushTimeStamp, - obj.message, OCHSocketMessageManager.OPERATION_SYSTEM - ) - } - } - //监听网络变化，避免启动机器时无网导致无法更新订单信息 private val mNetWorkIntentListener: IMogoIntentListener = IMogoIntentListener { intentStr, _ ->