diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageAdapter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageAdapter.kt index 7a4c34d086..70757e8612 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageAdapter.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageAdapter.kt @@ -19,11 +19,11 @@ class AIMessageAdapter : ListAdapter(MessageDiffCa override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MessageViewHolder { val inflater = LayoutInflater.from(parent.context) return when (viewType) { - AIMessage.TYPE_PNC_ACTION -> PNCActionViewHolder(inflater.inflate(R.layout.item_ai_pnc_action,parent,false)) - AIMessage.TYPE_ROAD_V2N -> RoadV2NEventViewHolder(inflater.inflate(R.layout.item_ai_road_v2n_event,parent,false)) - AIMessage.TYPE_ROAD_CROSS -> RoadCrossRoamViewHolder(inflater.inflate(R.layout.item_ai_road_cross_roam,parent,false))// 全息路口 - AIMessage.TYPE_AUTOMATIC_EXPLORATION -> AutomaticExplorationViewHolder(inflater.inflate(R.layout.item_ai_automatic_exploration,parent,false))// 探查 - AIMessage.TYPE_NDE -> NDEViewHolder(inflater.inflate(R.layout.item_ai_nde_event,parent,false))// 车龙 + AIMessage.TYPE_PNC_ACTION -> PNCActionViewHolder(inflater.inflate(R.layout.b2_item_ai_pnc_action,parent,false)) + AIMessage.TYPE_ROAD_V2N -> RoadV2NEventViewHolder(inflater.inflate(R.layout.b2_item_ai_road_v2n_event,parent,false)) + AIMessage.TYPE_ROAD_CROSS -> RoadCrossRoamViewHolder(inflater.inflate(R.layout.b2_item_ai_road_cross_roam,parent,false))// 全息路口 + AIMessage.TYPE_AUTOMATIC_EXPLORATION -> AutomaticExplorationViewHolder(inflater.inflate(R.layout.b2_item_ai_automatic_exploration,parent,false))// 探查 + AIMessage.TYPE_NDE -> NDEViewHolder(inflater.inflate(R.layout.b2_item_ai_nde_event,parent,false))// 车龙 else -> throw IllegalArgumentException("Invalid view type") } } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageViewHolder.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageViewHolder.kt index 816c674552..11bd35ccf8 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageViewHolder.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageViewHolder.kt @@ -144,17 +144,6 @@ class RoadCrossRoamViewHolder(binding: View) : MessageViewHolder(binding){ override fun bind(item: AIMessage, onItemClickListener: OnItemClickListener?) { if(item is AIMessage.RoadCrossRoam){ lvRoadCrossRoamTip.layoutManager = NoScrollLayoutManager(itemView.context) -// lvRoadCrossRoamTip.addItemDecoration(object : RecyclerView.ItemDecoration() { -// override fun getItemOffsets( -// outRect: Rect, -// view: View, -// parent: RecyclerView, -// state: RecyclerView.State -// ) { -// super.getItemOffsets(outRect, view, parent, state) -// outRect.bottom = 24 -// } -// }) lvRoadCrossRoamTip.adapter = RoadCrossRoamListB2Adapter(itemView.context) tvRoadRoamTitle.setTextColor(itemView.context.getColor(R.color.color_131415)) diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_automatic_exploration.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_automatic_exploration.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_automatic_exploration.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_automatic_exploration.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_nde_event.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_event.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_nde_event.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_event.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_pnc_action.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_pnc_action.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_pnc_action.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_pnc_action.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_road_cross_roam.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_cross_roam.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_road_cross_roam.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_cross_roam.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_road_v2n_event.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_v2n_event.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_ai_road_v2n_event.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_v2n_event.xml