Merge remote-tracking branch 'origin/qa_light' into qa_light
# Conflicts: # modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml # modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml # skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml
董宏宇
|
Before Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 5.0 KiB |
BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png
Normal file → Executable file
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 144 KiB |
@@ -86,11 +86,11 @@
|
||||
android:id="@+id/tvFaultHelpEventTime"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/dp_24"
|
||||
android:alpha="0.59"
|
||||
android:textColor="@color/v2x_FFF_666"
|
||||
android:textColor="@color/v2x_FFF_999"
|
||||
android:textSize="@dimen/dp_29"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginBottom="@dimen/dp_24"
|
||||
app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
|
||||
tools:text="15:30发布求助信息" />
|
||||
|
||||