Merge branch 'ml' into dev_merge_shunyi_vr_map

This commit is contained in:
liujing
2020-12-21 16:29:38 +08:00

View File

@@ -2,24 +2,26 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_120"
android:background="@drawable/v2x_bg_pop_up"
android:paddingEnd="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_28"
android:layout_width="@dimen/dp_822"
android:layout_height="@dimen/dp_182"
android:layout_marginTop="@dimen/dp_8"
android:background="@drawable/v2x_tip_bg"
tools:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_34"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivFaultHelpHead"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_31"
@@ -27,6 +29,7 @@
app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:miv_failureHolder="@drawable/icon_default_user_head"
app:miv_overlayImageId="@drawable/icon_default_user_head"
app:miv_placeHolder="@drawable/icon_default_user_head" />
@@ -34,11 +37,11 @@
<TextView
android:id="@+id/tvImgTextContent"
android:layout_width="@dimen/dp_120"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_40"
android:layout_marginTop="15dp"
android:background="@drawable/bg_v2x_event_type_orange_vr"
android:gravity="center"
android:paddingStart="@dimen/dp_23"
android:paddingStart="@dimen/dp_27"
android:paddingTop="@dimen/dp_5"
android:paddingEnd="@dimen/dp_23"
android:paddingBottom="@dimen/dp_5"
@@ -46,7 +49,8 @@
android:textColor="@android:color/white"
android:textSize="@dimen/module_v2x_event_type_title_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ivFaultHelpHead"
app:layout_constraintStart_toStartOf="@id/ivFaultHelpHead"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
@@ -81,7 +85,7 @@
android:id="@+id/tvFaultHelpDistance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_40"
android:layout_marginEnd="@dimen/dp_42"
android:gravity="center_vertical"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_70"
@@ -89,18 +93,20 @@
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
app:layout_constraintVertical_bias="0.466"
tools:text="300M" />
<ImageView
android:id="@+id/ivFaultHelpEventCall"
android:layout_width="@dimen/module_v2x_event_button_size_vr"
android:layout_height="@dimen/module_v2x_event_button_size_vr"
android:layout_marginEnd="@dimen/dp_42"
android:layout_marginEnd="28dp"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.385"
tools:visibility="visible" />
<ImageView