Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2

This commit is contained in:
董宏宇
2020-08-19 19:29:09 +08:00
9 changed files with 109 additions and 27 deletions

View File

@@ -20,7 +20,7 @@
android:id="@+id/tv_brief"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:gravity="top"
android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
android:text="周围5公里共15条交通信息"
android:textColor="@color/white"
@@ -48,12 +48,12 @@
android:layout_height="match_parent"
android:layout_below="@+id/layout_top"
android:layout_marginLeft="@dimen/module_v2x_surrounding_root_margin_left"
android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
android:layout_marginRight="@dimen/module_v2x_surrounding_root_margin_left"
android:layout_marginBottom="@dimen/module_v2x_surrounding_margin_left">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/surrounding_recycleview"
android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible" />

View File

@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginBottom="16px"
android:layout_marginBottom="14px"
android:background="@drawable/bg_v2x_event_description"
android:orientation="vertical">

View File

@@ -7,9 +7,8 @@
<style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
<item name="android:minHeight">16px</item>
<item name="android:maxHeight">16px</item>
<item name="android:maxWidth">19px</item>
<item name="android:minWidth">19px</item>
<item name="android:spacing">4px</item>
<item name="android:maxWidth">20px</item>
<item name="android:minWidth">20px</item>
<item name="android:numStars">5</item>
<item name="android:rating">1</item>
<item name="android:stepSize">0.5</item>