From 7e141480b6a559783519711fa19fcf05bc1de247 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 27 Jul 2023 11:24:09 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0]=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AB=AFV2X=E6=B6=88=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90=E6=A0=87?= =?UTF-8?q?=E8=AF=86V2I=E3=80=81V2V=E3=80=81V2N?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/v2x/obu/V2xObuEventManager.kt | 3 +- .../redlightwarning/RedLightWarningManager.kt | 6 ++- .../function/biz/v2x/v2n/V2XEventManager.kt | 2 +- .../function/biz/v2x/v2n/V2XPoiLoader.kt | 2 +- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 4 +- .../scene/road/V2XRoadEventScenario.java | 2 +- .../warning/V2XFrontWarningScenario.java | 2 +- .../function/biz/v2x/vip/VipCarManager.kt | 7 ++- .../BusPassengerMsgBoxBubbleAdapter.kt | 5 +- .../adapter/DriverMsgBoxBubbleAdapter.kt | 42 ++++++++++------ .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 49 +++++++++++-------- .../ui/msgbox/adapter/MBoxBubbleAdapter.kt | 24 +++++---- .../ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt | 6 +-- .../ui/msgbox/adapter/MMsgBoxListAdapter.kt | 6 +-- .../adapter/PassengerMsgBoxBubbleAdapter.kt | 4 +- .../adapter/PassengerMsgBoxListAdapter.kt | 6 +-- .../src/main/res/values/strings.xml | 2 + .../core/data/config/FunctionBuildConfig.kt | 2 +- .../com/mogo/eagle/core/data/msgbox/V2XMsg.kt | 8 ++- 19 files changed, 111 insertions(+), 71 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/obu/V2xObuEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/obu/V2xObuEventManager.kt index b325d3d7e6..7ceb44179f 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/obu/V2xObuEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/obu/V2xObuEventManager.kt @@ -58,7 +58,8 @@ object V2xObuEventManager : IMoGoObuSaveMessageListener { V2XMsg( type, content, - tts + tts, + communicationType.name ) ).apply { this.sourceType = sourceType diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt index 981d2d87d4..20d157fa0a 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt @@ -211,7 +211,8 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, V2XMsg( EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType, EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.content, - EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts + EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.tts, + "" ) ) ) @@ -243,7 +244,8 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, V2XMsg( EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType, content, - tts + tts, + "" ) ) ) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index 90a037c6c9..cefe41b9a8 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -297,7 +297,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, private fun sendToMsgBox(count: Int) { val msgBoxBean = - MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${count}个事件", "")) + MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${count}个事件", "",CommunicationType.V2N.name)) msgBoxBean.sourceType = DataSourceType.SUMMARY CallerMsgBoxManager.saveMsgBox(msgBoxBean) //消息埋点 diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt index 028d34cecc..f1b96ff6f1 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt @@ -158,7 +158,7 @@ class V2XPoiLoader private constructor() { val size = it?.size ?: 0 if (size > 0) { val msgBoxBean = - MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${size}个事件", "")) + MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${size}个事件", "",CommunicationType.V2N.name)) msgBoxBean.sourceType = DataSourceType.SUMMARY CallerMsgBoxManager.saveMsgBox(msgBoxBean) //消息埋点 diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index 338a912126..3e75ed1e2d 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -79,7 +79,7 @@ internal object V2NIdentifyDrawer { val alertContent = getAlertContent(poiType, distance.toDouble()) val ttsContent = getTtsContent(poiType, distance.toDouble()) V2XBizTrace.onAck("V2NIdentifyDrawer","绘制poi事件:$poiType") - saveMsgBox(MsgBoxBean(V2X, V2XMsg(poiType, alertContent, ttsContent))) + saveMsgBox(MsgBoxBean(V2X, V2XMsg(poiType, alertContent, ttsContent,CommunicationType.V2N.name))) CallerHmiManager.warningV2X(poiType, alertContent, ttsContent, object : IMoGoWarningStatusListener { override fun onShow() { super.onShow() @@ -137,7 +137,7 @@ internal object V2NIdentifyDrawer { val distance = CoordinateUtils.calculateLineDistance(lon, lat, car.longitude, car.latitude) val alertContent = getAlertContent(poiType, distance.toDouble()) val ttsContent = getTtsContent(poiType, distance.toDouble()) - saveMsgBox(MsgBoxBean(V2X, V2XMsg(poiType, alertContent, ttsContent))) + saveMsgBox(MsgBoxBean(V2X, V2XMsg(poiType, alertContent, ttsContent,CommunicationType.V2N.name))) CallerHmiManager.warningV2X(poiType, alertContent, ttsContent, object : IMoGoWarningStatusListener { override fun onShow() { super.onShow() diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java index c19ae38fe7..283bc5baed 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java @@ -128,7 +128,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp MsgBoxType.V2X, new V2XMsg(poiType, alarmText, - ttsText) + ttsText,CommunicationType.V2N.name()) ) ); CallerHmiManager.INSTANCE.warningV2X(poiType, alarmText, diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java index 9703733a1e..c1fe08de93 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java @@ -80,7 +80,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas MsgBoxType.V2X, new V2XMsg(v2xType + "", getAlertContentForFrontWarning(mMarkerEntity).toString(), - mMarkerEntity.getTts()) + mMarkerEntity.getTts(),CommunicationType.V2N.name()) ) ); CallerHmiManager.INSTANCE.warningV2X(v2xType + "", diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt index 8aef9cd6de..00425f7ffb 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt @@ -13,6 +13,8 @@ import com.mogo.eagle.core.data.biz.trafficlight.currentRoadTrafficLight import com.mogo.eagle.core.data.biz.trafficlight.isGreen import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VIP import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2N +import com.mogo.eagle.core.data.enums.CommunicationType +import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType @@ -29,6 +31,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.eagle.function.biz.v2x.V2XBizTrace import com.mogo.eagle.function.biz.v2x.trafficlight.core.MogoTrafficLightManager +import com.mogo.eagle.function.biz.v2x.v2n.utils.V2XEventAnalyticsManager import com.mogo.eagle.function.biz.v2x.vip.network.VipNetWorkModel import com.zhjt.service_biz.BizConfig @@ -268,9 +271,11 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe Log.d("MsgBox-VipCarManager", "alertContent或ttsContent为空!") } CallerMsgBoxManager.saveMsgBox( - MsgBoxBean(MsgBoxType.V2X, V2XMsg(v2xType, alertContent.toString(), ttsContent)) + MsgBoxBean(MsgBoxType.V2X, V2XMsg(v2xType, alertContent.toString(), ttsContent,CommunicationType.V2N.name)) ) CallerHmiManager.warningV2X(v2xType, alertContent, ttsContent, isFromObu = false) + V2XEventAnalyticsManager.triggerV2XEvent(v2xType, alertContent.toString(), + ttsContent,DataSourceType.AICLOUD,CommunicationType.V2N) } fun destroy() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt index 196baac151..d39ac2adae 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt @@ -7,6 +7,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.* @@ -78,8 +79,8 @@ class BusPassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerV val v2XMsg = msgBoxBean.msgBoxBean.bean as V2XMsg holder.tvBusPV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvBusPV2XContent.text = v2XMsg.content - holder.ivBusPV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) + holder.ivBusPV2XImage.setImageDrawable( + ResourcesCompat.getDrawable(activity.resources,EventTypeEnumNew.getUpdateIconRes(v2XMsg.type),null)) holder.tvBusPV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) } } 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 675e865d9d..bb9245f5ca 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 @@ -8,6 +8,7 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.EventTypeEnumNew @@ -193,12 +194,16 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A val v2XMsg = msgBoxBean.bean as V2XMsg holder.tvV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvV2XContent.text = v2XMsg.content - holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) + holder.ivV2XImage.setImageDrawable(ResourcesCompat.getDrawable(activity.resources,EventTypeEnumNew.getUpdateIconRes(v2XMsg.type),null)) holder.clV2XLayout.setOnClickListener { CallerMsgBoxEventListenerManager.invokeBubbleV2XListener(msgBoxBean) } - holder.tvV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) + if(v2XMsg.communicationType.isNullOrEmpty()){ + holder.tvV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) + }else{ + holder.tvV2XTitle.text = String.format(activity.resources.getString(R.string.v2x_title_content), + v2XMsg.communicationType,EventTypeEnumNew.getEventTitle(v2XMsg.type)) + } } } is BubbleSummaryHolder -> { @@ -231,18 +236,23 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A override fun getItemViewType(position: Int): Int { return if(data!![position].msgBoxBean.type == MsgBoxType.OPERATION){ - if((data!![position].msgBoxBean.bean as OperationMsg).type == 0){ - //运营平台还车通知 - operationReturn - }else if((data!![position].msgBoxBean.bean as OperationMsg).type == 1){ - //运营平台靠边停车 - operationStop - }else if((data!![position].msgBoxBean.bean as OperationMsg).type == 3){ - //车门开启关闭失败 - operationDoorSwitchFail - } else{ - //普通运营平台 - operation + when ((data!![position].msgBoxBean.bean as OperationMsg).type) { + 0 -> { + //运营平台还车通知 + operationReturn + } + 1 -> { + //运营平台靠边停车 + operationStop + } + 3 -> { + //车门开启关闭失败 + operationDoorSwitchFail + } + else -> { + //普通运营平台 + operation + } } }else if(data!![position].msgBoxBean.type == MsgBoxType.REPORT){ report @@ -289,7 +299,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A //Notice class BubbleNoticeHolder(itemView: View): RecyclerView.ViewHolder(itemView){ var ivNoticeImage: ImageView = itemView.findViewById(R.id.ivNoticeImage) - var tvNoticeTitle: TextView = itemView.findViewById(R.id.tvNoticeTitle) +// var tvNoticeTitle: TextView = itemView.findViewById(R.id.tvNoticeTitle) var tvNoticeTime: TextView = itemView.findViewById(R.id.tvNoticeTime) var tvNoticeCheck: TextView = itemView.findViewById(R.id.tvNoticeCheck) var tvNoticeContent: TextView = itemView.findViewById(R.id.tvNoticeContent) 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 c749c87656..d015352286 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 @@ -7,6 +7,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.core.content.res.ResourcesCompat import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.DataSourceType @@ -45,9 +46,9 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : private val summary: Int = 8 //Error - val RESULT_AUTOPILOT_DISABLE = "RESULT_AUTOPILOT_DISABLE" - val RESULT_AUTOPILOT_SYSTEM_UNSTARTED = "RESULT_AUTOPILOT_SYSTEM_UNSTARTED" - val RESULT_REMOTEPILOT_DISABLE = "RESULT_REMOTEPILOT_DISABLE" + private val RESULT_AUTOPILOT_DISABLE = "RESULT_AUTOPILOT_DISABLE" + private val RESULT_AUTOPILOT_SYSTEM_UNSTARTED = "RESULT_AUTOPILOT_SYSTEM_UNSTARTED" + private val RESULT_REMOTEPILOT_DISABLE = "RESULT_REMOTEPILOT_DISABLE" fun setData(data: List) { this.data = data @@ -382,10 +383,13 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.tvV2XTime.text = TimeUtils.millis2String(it[position].timestamp, getHourMinFormat()) holder.tvV2XContent.text = v2XMsg.content - holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)) - ) - holder.tvV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) + holder.ivV2XImage.setImageDrawable(ResourcesCompat.getDrawable(activity.resources,EventTypeEnumNew.getUpdateIconRes(v2XMsg.type),null)) + if(v2XMsg.communicationType.isNullOrEmpty()){ + holder.tvV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) + }else{ + holder.tvV2XTitle.text = String.format(activity.resources.getString(R.string.v2x_title_content), + v2XMsg.communicationType,EventTypeEnumNew.getEventTitle(v2XMsg.type)) + } } } is MsgBoxSummary -> { @@ -404,18 +408,23 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : override fun getItemViewType(position: Int): Int { return if (data!![position].type == MsgBoxType.OPERATION) { - if((data!![position].bean as OperationMsg).type == 0){ - //运营平台还车通知 - operationReturn - }else if((data!![position].bean as OperationMsg).type == 1){ - //运营平台靠边停车 - operationStop - }else if((data!![position].bean as OperationMsg).type == 3){ - //开关门失败 - operationDoorSwitchFail - } else{ - //普通运营平台 - operation + when ((data!![position].bean as OperationMsg).type) { + 0 -> { + //运营平台还车通知 + operationReturn + } + 1 -> { + //运营平台靠边停车 + operationStop + } + 3 -> { + //开关门失败 + operationDoorSwitchFail + } + else -> { + //普通运营平台 + operation + } } } else if (data!![position].type == MsgBoxType.NOTICE) { notice @@ -486,7 +495,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : //Notice class MsgBoxNotice(itemView: View) : RecyclerView.ViewHolder(itemView) { var ivNoticeImage: ImageView = itemView.findViewById(R.id.ivNoticeImage) - var tvNoticeTitle: TextView = itemView.findViewById(R.id.tvNoticeTitle) +// var tvNoticeTitle: TextView = itemView.findViewById(R.id.tvNoticeTitle) var tvNoticeTime: TextView = itemView.findViewById(R.id.tvNoticeTime) var tvNoticeCheck: TextView = itemView.findViewById(R.id.tvNoticeCheck) var tvNoticeContent: TextView = itemView.findViewById(R.id.tvNoticeContent) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt index ef6669cb99..57f1c7afe1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt @@ -7,6 +7,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.* @@ -80,8 +81,7 @@ class MBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter { + notice + } + MsgBoxType.OPERATION -> { + operation + } + else -> { + v2x + } } } //Notice class BubbleNoticeHolder(itemView: View): RecyclerView.ViewHolder(itemView){ - var ivMNoticeImage: ImageView = itemView.findViewById(R.id.ivMNoticeImage) - var tvMNoticeTitle: TextView = itemView.findViewById(R.id.tvMNoticeTitle) +// var ivMNoticeImage: ImageView = itemView.findViewById(R.id.ivMNoticeImage) +// var tvMNoticeTitle: TextView = itemView.findViewById(R.id.tvMNoticeTitle) var tvMNoticeContent: TextView = itemView.findViewById(R.id.tvMNoticeContent) var tvMNoticeTime: TextView = itemView.findViewById(R.id.tvMNoticeTime) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt index f34bac6b79..6a0a4dd3c0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt @@ -7,6 +7,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.EventTypeEnumNew @@ -105,8 +106,7 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter val v2XMsg = msgBoxBean.bean as V2XMsg holder.tvMV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvMV2XContent.text = v2XMsg.content - holder.ivMV2XImage.setImageDrawable(activity.resources.getDrawable( - EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) + holder.ivMV2XImage.setImageDrawable(ResourcesCompat.getDrawable(activity.resources,EventTypeEnumNew.getUpdateIconRes(v2XMsg.type),null)) holder.clMVeXLayout.setOnClickListener { CallerMsgBoxEventListenerManager.invokeBubbleV2XListener(msgBoxBean) } @@ -168,7 +168,7 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter //Notice class BubbleNoticeHolder(itemView: View): RecyclerView.ViewHolder(itemView){ var ivMNoticeImage: ImageView = itemView.findViewById(R.id.ivMNoticeImage) - var tvMNoticeTitle: TextView = itemView.findViewById(R.id.tvMNoticeTitle) +// var tvMNoticeTitle: TextView = itemView.findViewById(R.id.tvMNoticeTitle) var tvMNoticeContent: TextView = itemView.findViewById(R.id.tvMNoticeContent) var tvMNoticeCheck: TextView = itemView.findViewById(R.id.tvMNoticeCheck) var tvMNoticeTime: TextView = itemView.findViewById(R.id.tvMNoticeTime) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt index aa1ef8a854..ac948a48ae 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt @@ -6,6 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.EventTypeEnumNew @@ -98,8 +99,7 @@ class MMsgBoxListAdapter(private val activity: Activity): RecyclerView.Adapter确定 重试 再按一次退出应用 + + %s-%s diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index c5fdd6d0f7..2b9eec2a14 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -262,7 +262,7 @@ object FunctionBuildConfig { var isWeakNetSlowDown = true /** - *检测到故障停车测罗，默认打开，演示时手动关闭 + *检测到故障停车策略，默认打开，演示时手动关闭 */ @Volatile @JvmField 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 b4f98777f5..b0b8756d56 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 @@ -4,7 +4,13 @@ import android.util.Log import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import java.io.Serializable -data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = ""): Serializable { +/** + * @param type POIType + * @param content 消息内容 + * @param tts 语音内容 + * @param communicationType V2X消息通信类型 + */ +data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = "",var communicationType: String? = ""): Serializable { // 临时解决该问题：V2XMsg->json作为主键，如果主键一样数据条目不会新增 private var timeStamp: Long = 0