Merge branch 'qa_yingyan_custom' into qa_och_bus2

# Conflicts:
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
This commit is contained in:
董宏宇
2021-04-26 20:44:04 +08:00
5 changed files with 537 additions and 525 deletions

View File

@@ -33,7 +33,7 @@
android:paddingLeft="@dimen/dp_40"
android:paddingRight="@dimen/dp_40"
android:text="正在为您发起求助"
android:textColor="@color/v2x_white"
android:textColor="@color/v2x_white_color"
android:textSize="@dimen/dp_32"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_event"