Merge branch 'kk' into qa_1.1.8

This commit is contained in:
liujing
2020-11-27 10:47:33 +08:00

View File

@@ -10,34 +10,32 @@
<View
android:id="@+id/viewLinStart"
android:layout_width="wrap_content"
android:layout_width="@dimen/dp_22"
android:layout_height="1px"
android:layout_marginRight="16px"
android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toStartOf="@+id/tvNoMoreDataTrip"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvNoMoreDataTrip" />
<TextView
android:id="@+id/tvNoMoreDataTrip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_32"
android:text="没有更多记录了"
android:textColor="@color/share_event_no_more_color"
android:textSize="@dimen/dp_26"
app:layout_constraintEnd_toStartOf="@+id/viewLinEnd"
app:layout_constraintStart_toEndOf="@+id/viewLinStart"
app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintStart_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/viewLinEnd"
android:layout_width="wrap_content"
android:layout_width="12px"
android:layout_height="1px"
android:layout_marginLeft="16px"
android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvNoMoreDataTrip"
app:layout_constraintTop_toTopOf="@+id/tvNoMoreDataTrip" />