From be671fb47199fdb79854bea51b5dd4338bbd392b Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 1 Dec 2022 12:25:10 +0800 Subject: [PATCH 1/5] [2.13.0] taxi/bus add log --- .../src/main/java/com/mogo/och/bus/model/BusOrderModel.java | 5 +++-- .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 1 + 2 files changed, 4 insertions(+), 2 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 2ecb253a13..3bc75d9739 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 @@ -1,7 +1,6 @@ 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; @@ -215,9 +214,10 @@ public class BusOrderModel { @Override public void onMsgReceived(OCHOperationalMessage obj) { if (obj == null){ - CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = null"); + CallerLogger.INSTANCE.d(M_BUS + TAG, "onMsgReceived = null"); return; } + CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getMessage()); OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), obj.getMessage()); } @@ -233,6 +233,7 @@ public class BusOrderModel { @Override public void onMsgReceived(WriteOffPassenger passenger) { //进行播报 + CallerLogger.INSTANCE.i(M_BUS + TAG,"passenger = "+ GsonUtil.jsonFromObject(passenger)); if (passenger != null && passenger.passengerSize == 0) return; if (mPassengerCallback != null){ mPassengerCallback.playPassenger(passenger); 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 96e581d318..07579d98ca 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 @@ -248,6 +248,7 @@ public class TaxiModel { CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = null"); return; } + CallerLogger.INSTANCE.d(M_TAXI + TAG, "onMsgReceived = "+obj.getMessage()); OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(), obj.getMessage()); } From 38096e1a2a79ab82b102248b976a19c9e086450d Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 1 Dec 2022 14:14:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[2.13.0][fix]=E8=A7=A3=E5=86=B3=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/DriverMsgBoxBubbleAdapter.kt | 26 ++++++++++--------- .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 26 ++++++++++--------- .../eagle/core/function/msgbox/DataManager.kt | 22 ++++++++-------- .../eagle/core/data/msgbox/OperationMsg.kt | 4 ++- .../eagle/core/data/msgbox/RecordBagMsg.kt | 4 ++- .../com/mogo/eagle/core/data/msgbox/V2XMsg.kt | 4 ++- .../core/data/notice/NoticeNormalData.kt | 5 ++-- .../eagle/core/data/report/ReportEntity.kt | 4 ++- 8 files changed, 54 insertions(+), 41 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt index ab1f579879..e56436f1b8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt @@ -84,18 +84,20 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A } }else if(holder is BubbleNoticeHolder){ data?.let { - val noticeNormalData = it[position].bean as NoticeNormalData - holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) - holder.tvNoticeContent.text = noticeNormalData.content - GlideApp.with(activity).load(noticeNormalData.imageUrl).optionalTransform( - GlideRoundedCornersTransform( - 20f, - GlideRoundedCornersTransform.CornerType.ALL - ) - ).into(holder.ivNoticeImage) - holder.tvNoticeCheck.setOnClickListener { - //云公告 - CallerHmiManager.showNoticeNormalData(noticeNormalData) + val noticeNormalData = it[position].bean + if (noticeNormalData is NoticeNormalData) { + holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) + holder.tvNoticeContent.text = noticeNormalData.content + GlideApp.with(activity).load(noticeNormalData.imageUrl).optionalTransform( + GlideRoundedCornersTransform( + 20f, + GlideRoundedCornersTransform.CornerType.ALL + ) + ).into(holder.ivNoticeImage) + holder.tvNoticeCheck.setOnClickListener { + //云公告 + CallerHmiManager.showNoticeNormalData(noticeNormalData) + } } } }else if(holder is BubbleV2XHolder){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index ac49088a0c..1be2f9e83d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -172,18 +172,20 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada } }else if(holder is MsgBoxNotice){ data?.let { - val noticeNormalData = it[position].bean as NoticeNormalData - holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) - holder.tvNoticeContent.text = noticeNormalData.content - GlideApp.with(activity).load(noticeNormalData.imageUrl).optionalTransform( - GlideRoundedCornersTransform( - 20f, - GlideRoundedCornersTransform.CornerType.ALL - ) - ).into(holder.ivNoticeImage) - holder.tvNoticeCheck.setOnClickListener { - //云公告 - CallerHmiManager.showNoticeNormalData(noticeNormalData) + val noticeNormalData = it[position].bean + if (noticeNormalData is NoticeNormalData) { + holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) + holder.tvNoticeContent.text = noticeNormalData.content + GlideApp.with(activity).load(noticeNormalData.imageUrl).optionalTransform( + GlideRoundedCornersTransform( + 20f, + GlideRoundedCornersTransform.CornerType.ALL + ) + ).into(holder.ivNoticeImage) + holder.tvNoticeCheck.setOnClickListener { + //云公告 + CallerHmiManager.showNoticeNormalData(noticeNormalData) + } } } }else if(holder is MsgBoxV2X){ diff --git a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt index ad45a7adcf..db61dcfcf3 100644 --- a/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt +++ b/core/function-impl/mogo-core-function-msgbox/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt @@ -81,28 +81,28 @@ object DataManager { } } - private fun realSaveMsg(bean: MsgBoxBean) { - val type = bean.type - bean.timestamp = System.currentTimeMillis() - bean.bean2Json = GsonUtils.toJson(bean) + private fun realSaveMsg(msg: MsgBoxBean) { + val type = msg.type + msg.timestamp = System.currentTimeMillis() + msg.bean2Json = GsonUtils.toJson(msg.bean) when (type) { MsgBoxType.V2X, MsgBoxType.OBU, MsgBoxType.NOTICE, MsgBoxType.OPERATION -> { synchronized(this) { - notifyList.add(bean) + notifyList.add(msg) } - CallerMsgBoxListenerManager.invokeListener(MsgCategory.NOTICE, bean) + CallerMsgBoxListenerManager.invokeListener(MsgCategory.NOTICE, msg) } MsgBoxType.REPORT -> { synchronized(this) { - sysInfoList.add(bean) + sysInfoList.add(msg) } - CallerMsgBoxListenerManager.invokeListener(MsgCategory.SYS_INFO, bean) + CallerMsgBoxListenerManager.invokeListener(MsgCategory.SYS_INFO, msg) } MsgBoxType.RECORD -> { synchronized(this) { - recordBagList.add(bean) + recordBagList.add(msg) } - CallerMsgBoxListenerManager.invokeListener(MsgCategory.RECORD_BAG, bean) + CallerMsgBoxListenerManager.invokeListener(MsgCategory.RECORD_BAG, msg) } else -> {} } @@ -215,7 +215,7 @@ object DataManager { MsgBoxType.NOTICE.ordinal -> { return@map MsgBoxBean( MsgBoxType.NOTICE, - GsonUtils.fromJson(json, NoticeNormalData::class.java) + GsonUtils.fromJson(json, NoticeFrCloudMsg::class.java) ).apply { withContext(Dispatchers.Main) { cacheNotifyList.add(this@apply) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt index b3aa9469ff..230e98dca5 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt @@ -1,6 +1,8 @@ package com.mogo.eagle.core.data.msgbox +import java.io.Serializable + /** * 运营消息:-1表示初始值 */ -data class OperationMsg(val timestamp : Long, val content: String, val type: Int = -1) +data class OperationMsg(val timestamp : Long, val content: String, val type: Int = -1): Serializable diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt index 370d46ed4d..350d489bb7 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt @@ -1,3 +1,5 @@ package com.mogo.eagle.core.data.msgbox -data class RecordBagMsg(var key: Long, var stat: Int, var id: Int, var type: Int, var fileName: String, var note: String) \ No newline at end of file +import java.io.Serializable + +data class RecordBagMsg(var key: Long, var stat: Int, var id: Int, var type: Int, var fileName: String, var note: String): Serializable \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt index cd92ae18cd..26a9e8e811 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt @@ -1,3 +1,5 @@ package com.mogo.eagle.core.data.msgbox -data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = "") \ No newline at end of file +import java.io.Serializable + +data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = ""): Serializable \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalData.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalData.kt index 9c8b94a339..3a3f419180 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalData.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalData.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.data.notice import androidx.annotation.Keep +import java.io.Serializable /** * @description 普通公告数据类型 @@ -27,10 +28,10 @@ data class NoticeNormalData( val cancelVoiceCmd: List? = null, //隐藏当前push命令词 val buttons: List