Merge branch 'll' into dev

This commit is contained in:
liujing
2020-09-17 21:28:29 +08:00
4 changed files with 9 additions and 8 deletions

View File

@@ -67,6 +67,7 @@
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_36"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tvEventTypeTitle"
app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle"
@@ -100,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_30"
android:alpha="0.6"
android:textColor="@color/v2x_FFF_666"
android:textColor="@color/v2x_FFF_999"
android:textSize="@dimen/dp_28"
app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo"
app:layout_constraintStart_toEndOf="@+id/tvEventDistance"

View File

@@ -31,6 +31,7 @@
android:text="违章停车"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_24"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tvAddress"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
app:layout_constraintTop_toTopOf="@+id/ivIconP" />
@@ -39,7 +40,7 @@
android:id="@+id/tvAddress"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="1"
@@ -55,12 +56,11 @@
android:id="@+id/tvIllegalNum"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:alpha="0.6"
android:gravity="center_vertical"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_30"
android:textSize="@dimen/dp_26"
app:layout_constraintEnd_toEndOf="@+id/tvAddress"
app:layout_constraintStart_toStartOf="@+id/tagEventType"
app:layout_constraintTop_toBottomOf="@+id/tvAddress"

View File

@@ -68,6 +68,7 @@
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_34"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
app:layout_constraintTop_toBottomOf="@+id/tagEventType"
@@ -77,12 +78,11 @@
android:id="@+id/tvIllegalNum"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_24"
android:alpha="0.6"
android:gravity="center_vertical"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_30"
android:textSize="@dimen/dp_26"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tvAddress"
app:layout_constraintStart_toStartOf="@+id/tvAddress"

View File

@@ -87,8 +87,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:alpha="0.59"
android:textColor="@color/v2x_FFF_999"
android:textSize="@dimen/dp_29"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_26"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_24"
app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"