diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java index 2da020805c..ed99977aa1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java @@ -32,7 +32,7 @@ import com.mogo.module.v2x.voice.V2XVoiceManager; public class V2XFatigueDrivingVH extends V2XBaseViewHolder { private TextView mTvAddress, mTvAddressDistance; - private ImageView mIvToNav; + private ImageView mIvToNav, mIvClose; private MarkerExploreWay mNoveltyInfo; private V2XPushMessageEntity mV2XPushMessageEntity; @@ -45,7 +45,9 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { mTvAddress = itemView.findViewById(R.id.tvAddress); mTvAddressDistance = itemView.findViewById(R.id.tvAddressDistance); mIvToNav = itemView.findViewById(R.id.ivToNav); + mIvClose = itemView.findViewById(R.id.ivClose); mIvToNav.setOnClickListener(v -> triggerStartNavi(mNoveltyInfo)); + mIvClose.setOnClickListener(v -> V2XFatigueDrivingScenario.getInstance().close()); // 设置视图状态监听 itemView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerEventView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerEventView.java new file mode 100644 index 0000000000..902676fce3 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerEventView.java @@ -0,0 +1,30 @@ +package com.mogo.module.v2x.marker; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.LinearLayout; + +import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; + +public class V2XMarkerEventView extends LinearLayout { + + + public V2XMarkerEventView(Context context) { + this(context,null); + } + + public V2XMarkerEventView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs,0); + } + + public V2XMarkerEventView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + initView(); + } + + private void initView() { + + } + +} diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml index 728d647def..f7e603cf78 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml @@ -69,8 +69,18 @@ android:id="@+id/ivToNav" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" + android:layout_marginEnd="@dimen/dp_40" android:src="@drawable/selector_nav_btn" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ivClose" + app:layout_constraintTop_toTopOf="parent" /> + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index cad8477a05..b586ad3610 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -10,67 +10,76 @@ android:paddingEnd="@dimen/dp_62" android:paddingBottom="@dimen/dp_42"> - + app:layout_constraintTop_toTopOf="parent"> - + - + - + + + + +