From 52e06ded885445840c2c3d5157f542a2c688467f Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 20 Jul 2023 13:53:54 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0]Taxi=E4=B9=98=E5=AE=A2=E5=B1=8F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9B=92=E5=AD=90=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/taxi_p_base_fragment.xml | 9 ++ .../adapter/PassengerMsgBoxBubbleAdapter.kt | 24 +---- .../layout/item_passenger_msg_box_notice.xml | 99 ++++++------------- .../layout/item_passenger_msg_box_summary.xml | 15 ++- .../res/layout/item_passenger_msg_box_v2x.xml | 93 +++++++++-------- .../layout_passenger_msg_box_bubble.xml | 2 +- 6 files changed, 94 insertions(+), 148 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 975ae40446..4f703a7322 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -116,4 +116,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt index 8121a915f9..bfc791cbce 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt @@ -68,13 +68,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView val noticeNormalData = noticeFrCloudMsg.noticeNormalData holder.tvPassengerNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvPassengerNoticeContent.text = noticeNormalData?.content - GlideApp.with(activity).load(noticeNormalData?.imageUrl).optionalTransform( - GlideRoundedCornersTransform( - 20f, - GlideRoundedCornersTransform.CornerType.ALL - ) - ).into(holder.ivPassengerNoticeImage) - holder.tvPassengerNoticeCheck.setOnClickListener { + holder.clPassengerLayout.setOnClickListener { //云公告 noticeNormalData?.let { it1 -> CallerHmiManager.showNoticeNormalData(it1) } } @@ -82,13 +76,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView val noticeTrafficStylePushData = noticeFrCloudMsg.trafficPushData holder.tvPassengerNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvPassengerNoticeContent.text = noticeTrafficStylePushData?.content - GlideApp.with(activity).load(noticeTrafficStylePushData?.poiImgUrl).optionalTransform( - GlideRoundedCornersTransform( - 20f, - GlideRoundedCornersTransform.CornerType.ALL - ) - ).into(holder.ivPassengerNoticeImage) - holder.tvPassengerNoticeCheck.setOnClickListener { + holder.clPassengerLayout.setOnClickListener { //云公告 noticeTrafficStylePushData?.let { it1 -> CallerHmiManager.showTrafficBanner(it1) } } @@ -100,14 +88,12 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView data?.let { val msgBoxBean = it[position].msgBoxBean val v2XMsg = msgBoxBean.bean as V2XMsg - holder.tvPassengerV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat()) holder.tvPassengerV2XContent.text = v2XMsg.content holder.ivPassengerV2XImage.setImageDrawable(activity.resources.getDrawable( EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) holder.clPassengerVeXLayout.setOnClickListener { CallerMsgBoxEventListenerManager.invokeBubbleV2XListener(msgBoxBean) } - holder.tvPassengerV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) } } is BubbleSummaryHolder -> { @@ -155,20 +141,16 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView //Notice class BubbleNoticeHolder(itemView: View): RecyclerView.ViewHolder(itemView){ - var ivPassengerNoticeImage: ImageView = itemView.findViewById(R.id.ivPassengerNoticeImage) - var tvPassengerNoticeTitle: TextView = itemView.findViewById(R.id.tvPassengerNoticeTitle) var tvPassengerNoticeContent: TextView = itemView.findViewById(R.id.tvPassengerNoticeContent) - var tvPassengerNoticeCheck: TextView = itemView.findViewById(R.id.tvPassengerNoticeCheck) var tvPassengerNoticeTime: TextView = itemView.findViewById(R.id.tvPassengerNoticeTime) + var clPassengerLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clPassengerLayout) } //OBU、V2X class BubbleV2XHolder(itemView: View): RecyclerView.ViewHolder(itemView){ var ivPassengerV2XImage: ImageView = itemView.findViewById(R.id.ivPassengerV2XImage) - var tvPassengerV2XTime: TextView = itemView.findViewById(R.id.tvPassengerV2XTime) var tvPassengerV2XContent: TextView = itemView.findViewById(R.id.tvPassengerV2XContent) var clPassengerVeXLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clPassengerVeXLayout) - var tvPassengerV2XTitle: TextView = itemView.findViewById(R.id.tvPassengerV2XTitle) } //汇总消息 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml index 30d71f2364..af7303e9c6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml @@ -1,82 +1,26 @@ - - - - - - - - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml index 3c58b979c0..971b7cddd1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_summary.xml @@ -1,9 +1,9 @@ - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml index 3aae086477..d521d54f62 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml @@ -1,61 +1,56 @@ + android:layout_marginBottom="16dp" + android:paddingStart="@dimen/dp_20" + android:paddingEnd="@dimen/dp_20" + > - - - - - + > - + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml index 542619f7ea..c09a44db68 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml @@ -1,7 +1,7 @@