diff --git a/OCH/common/common/src/main/res/xiaozhi/layout/common_xiaozhi.xml b/OCH/common/common/src/main/res/xiaozhi/layout/common_xiaozhi.xml index c2062785e1..7dfc9425d4 100644 --- a/OCH/common/common/src/main/res/xiaozhi/layout/common_xiaozhi.xml +++ b/OCH/common/common/src/main/res/xiaozhi/layout/common_xiaozhi.xml @@ -20,6 +20,6 @@ android:alpha="0" app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="@dimen/dp_40" - android:layout_width="@dimen/dp_64" - android:layout_height="@dimen/dp_64"/> + android:layout_width="@dimen/dp_55" + android:layout_height="@dimen/dp_55"/> \ 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 6b0bc87b1d..8207016a7e 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 @@ -108,6 +108,13 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView val v2XMsg = msgBoxBean.bean as V2XMsg holder.tvPassengerV2XContent.text = v2XMsg.content holder.ivPassengerV2XImage.setImageDrawable(ResourcesCompat.getDrawable(activity.resources,EventTypeEnumNew.getUpdateIconRes(v2XMsg.type),null)) + if (EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.poiType == v2XMsg.type + || EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType == v2XMsg.type + ) { + holder.ivPassengerV2XImage.visibility = View.GONE + } else { + holder.ivPassengerV2XImage.visibility = View.VISIBLE + } holder.clPassengerVeXLayout.setOnClickListener { CallerMsgBoxEventListenerManager.invokeBubbleV2XListener(msgBoxBean) } 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 be936c2d1c..c7a32e19de 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 @@ -4,7 +4,7 @@ android:layout_width="@dimen/dp_600" android:layout_height="@dimen/dp_138" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="#8CF5FAFF" + android:background="#B3F5FAFF" app:roundLayoutRadius="24dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" @@ -47,6 +47,7 @@ android:textColor="#FF243959" android:textSize="@dimen/dp_34" android:layout_marginStart="@dimen/dp_20" + app:layout_goneMarginStart="0dp" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_bias="0" />