diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java index 11ac15e305..74f0d90ed0 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/WriteOffPassenger.java @@ -11,4 +11,14 @@ public class WriteOffPassenger implements Serializable { public String orderNo; public int passengerSize; public long writeOffTime; + + @Override + public String toString() { + return "WriteOffPassenger{" + + "phone='" + phone + '\'' + + ", orderNo='" + orderNo + '\'' + + ", passengerSize=" + passengerSize + + ", writeOffTime=" + writeOffTime + + '}'; + } } 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 0c1e4f6e40..dc18c66228 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 @@ -47,6 +47,7 @@ import com.mogo.och.bus.util.BusTrajectoryManager; 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.lan.ILanMessageListener; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg; @@ -278,8 +279,8 @@ public class OrderModel { GsonUtils.toJson(data)); } - private final IMogoOnMessageListener mMogoOnMessageListener = - new IMogoOnMessageListener() { + private final IOchOnMessageListener mMogoOnMessageListener = + new IOchOnMessageListener() { @Override public Class target() { return OCHOperationalMessage.class; @@ -297,8 +298,8 @@ public class OrderModel { } }; - private final IMogoOnMessageListener mWriteOffPassengerOnMessageListener = - new IMogoOnMessageListener() { + private final IOchOnMessageListener mWriteOffPassengerOnMessageListener = + new IOchOnMessageListener() { @Override public Class target() { return WriteOffPassenger.class; 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 0323fc8f35..e457f38d63 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 @@ -52,6 +52,7 @@ import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusMana import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.startLoopAbnormalFactors 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 @@ -251,7 +252,7 @@ class DriverM1Model { } private val mOnSystemMessageListener = - object : IMogoOnMessageListener { + object : IOchOnMessageListener { override fun onMsgReceived(obj: SystemMsg) { d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.context) @@ -273,7 +274,7 @@ class DriverM1Model { } private val mOnDoorMessageListener = - object : IMogoOnMessageListener { + object : IOchOnMessageListener { override fun onMsgReceived(obj: OperateDoorMsg) { d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.message) val doorStatus = LightAirconditionDoorStatusManager.doorStatus @@ -290,7 +291,7 @@ class DriverM1Model { } private val mOnOrderClosedMessageListener = - object : IMogoOnMessageListener { + object : IOchOnMessageListener { override fun onMsgReceived(obj: OrderCloseMsg) { //订单结束 pushOperationalToMsgBox(DateTimeUtil.getCurrentTimeStamp(), obj.message @@ -304,8 +305,8 @@ class DriverM1Model { } } - private val mWriteOffPassengerOnMessageListener: IMogoOnMessageListener = - object : IMogoOnMessageListener { + private val mWriteOffPassengerOnMessageListener = + object : IOchOnMessageListener { override fun target(): Class { return WriteOffPassenger::class.java } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/IOchOnMessageListener.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/IOchOnMessageListener.java new file mode 100644 index 0000000000..9182ccd564 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/IOchOnMessageListener.java @@ -0,0 +1,14 @@ +package com.mogo.och.common.module.manager.socket.cloud; + +/** + * @author congtaowang + * @since 2019-12-31 + *

+ * 消息回调 + */ +public interface IOchOnMessageListener< T > { + + Class< T > target(); + + void onMsgReceived( T obj ); +} diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/OCHSocketMessageManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/OCHSocketMessageManager.kt index 6b92440565..deed51c9a3 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/OCHSocketMessageManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/cloud/OCHSocketMessageManager.kt @@ -7,6 +7,7 @@ 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 +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager /** * 统一管理业务长链消息推送 @@ -22,9 +23,18 @@ object OCHSocketMessageManager { const val OPERATION_ROAD_SIDE_TYPE: Int = 1 //靠边停车通知 fun registerSocketMessageListener(msgType:Int, - mogoOnMessageListener :IMogoOnMessageListener){ + mogoOnMessageListener :IOchOnMessageListener){ MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext) - .registerOnMessageListener(msgType,mogoOnMessageListener) + .registerOnMessageListener(msgType,object :IMogoOnMessageListener{ + override fun target(): Class { + return mogoOnMessageListener.target() + } + + override fun onMsgReceived(obj: T) { + OchChainLogManager.writeChainLogLanSocket("收到服务端数据","obj:${obj}}","receive"); + mogoOnMessageListener.onMsgReceived(obj) + } + }) } fun releaseSocketMessageListener(msgType:Int){ 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 9ce4171536..e6e513cc32 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,6 +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.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType; import com.mogo.och.common.module.voice.VoiceNotice; @@ -206,8 +207,8 @@ public class OrderModel { } }; - private final IMogoOnMessageListener mMogoOnMessageListener = - new IMogoOnMessageListener() { + private final IOchOnMessageListener mMogoOnMessageListener = + new IOchOnMessageListener() { @Override public Class target() { return SystemMsg.class; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java index 624c296d9f..cdedc26acb 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java @@ -12,4 +12,15 @@ public class WriteOffPassenger implements Serializable { public String ticketName; public int passengerSize; public long writeOffTime; + + @Override + public String toString() { + return "WriteOffPassenger{" + + "phone='" + phone + '\'' + + ", orderNo='" + orderNo + '\'' + + ", ticketName='" + ticketName + '\'' + + ", passengerSize=" + passengerSize + + ", writeOffTime=" + writeOffTime + + '}'; + } } 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 c16e418b48..63514041c1 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 @@ -27,6 +27,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage 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.distance.TrajectoryAndDistanceManager; +import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener; 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; @@ -215,8 +216,8 @@ public class OrderModel { } }; - private final IMogoOnMessageListener mMogoOnMessageListener = - new IMogoOnMessageListener() { + private final IOchOnMessageListener mMogoOnMessageListener = + new IOchOnMessageListener() { @Override public Class target() { return SystemMsg.class; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt index 53194a5363..921e44a85a 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt @@ -27,12 +27,13 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo +import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe import io.reactivex.schedulers.Schedulers -object TicketModel : IReceivedMsgListener, IMogoOnMessageListener { +object TicketModel : IReceivedMsgListener, IOchOnMessageListener { private val TAG = "TicketModel" diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java b/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java index 624c296d9f..cdedc26acb 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java +++ b/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/bean/WriteOffPassenger.java @@ -12,4 +12,15 @@ public class WriteOffPassenger implements Serializable { public String ticketName; public int passengerSize; public long writeOffTime; + + @Override + public String toString() { + return "WriteOffPassenger{" + + "phone='" + phone + '\'' + + ", orderNo='" + orderNo + '\'' + + ", ticketName='" + ticketName + '\'' + + ", passengerSize=" + passengerSize + + ", writeOffTime=" + writeOffTime + + '}'; + } } diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java index c16e418b48..63514041c1 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java +++ b/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java @@ -27,6 +27,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage 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.distance.TrajectoryAndDistanceManager; +import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener; 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; @@ -215,8 +216,8 @@ public class OrderModel { } }; - private final IMogoOnMessageListener mMogoOnMessageListener = - new IMogoOnMessageListener() { + private final IOchOnMessageListener mMogoOnMessageListener = + new IOchOnMessageListener() { @Override public Class target() { return SystemMsg.class; diff --git a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt b/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt index 53194a5363..921e44a85a 100644 --- a/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt +++ b/OCH/shuttle_weaknet/driver/src/main/java/com/mogo/och/shuttle/model/TicketModel.kt @@ -27,12 +27,13 @@ import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo +import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener import io.reactivex.Observable import io.reactivex.ObservableEmitter import io.reactivex.ObservableOnSubscribe import io.reactivex.schedulers.Schedulers -object TicketModel : IReceivedMsgListener, IMogoOnMessageListener { +object TicketModel : IReceivedMsgListener, IOchOnMessageListener { private val TAG = "TicketModel" 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 859f47d0fe..acc406ae98 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,6 +35,7 @@ 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.network.OchCommonServiceCallback; @@ -266,8 +267,8 @@ public class SweeperOperateTaskModel { return sInstance; } - private final IMogoOnMessageListener mMogoOnMessageListener = - new IMogoOnMessageListener() { + private final IOchOnMessageListener mMogoOnMessageListener = + new IOchOnMessageListener() { @Override public Class target() { return OCHOperationalMessage.class; 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 4a588a6c16..dfa83dd17a 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,6 +44,7 @@ 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.biz.login.LoginStatusManager; @@ -234,8 +235,8 @@ public class TaxiModel { } - private final IMogoOnMessageListener mMogoOnMessageListener = - new IMogoOnMessageListener() { + private final IOchOnMessageListener mMogoOnMessageListener = + new IOchOnMessageListener() { @Override public Class target() { return OCHOperationalMessage.class; 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 59815e4eb1..27afc9e8cd 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,6 +51,7 @@ 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.map.AmapNaviToDestinationModel @@ -492,7 +493,7 @@ object TaxiTaskModel { } private val mMogoOnSocketMessageListener = - object : IMogoOnMessageListener { + object : IOchOnMessageListener { override fun target(): Class { return OCHOperationalMessage::class.java }