Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9
This commit is contained in:
@@ -187,7 +187,7 @@
|
||||
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
|
||||
app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
|
||||
app:layout_goneMarginLeft="@dimen/dp_10"
|
||||
tools:visibility="visible" />
|
||||
tools:visibility="visible"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -198,8 +198,8 @@
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginTop="@dimen/dp_5"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:maxLines="2"
|
||||
android:textColor="@color/v2x_FFF_333"
|
||||
android:maxLines="1"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_40"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/dp_20"
|
||||
android:layout_marginTop="@dimen/dp_15"
|
||||
android:textColor="@color/v2x_FFF_333"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_40"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
|
||||
@@ -73,7 +73,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:alpha="0.59"
|
||||
android:textColor="@color/v2x_FFF_999"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_24"
|
||||
app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
|
||||
@@ -87,7 +87,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/dp_42"
|
||||
android:gravity="center_vertical"
|
||||
android:textColor="@color/v2x_FFF_333"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="@dimen/dp_70"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
|
||||
|
||||
Reference in New Issue
Block a user