|
@@ -8,8 +8,9 @@
|
|
|
|
|
|
|
|
<include layout="@layout/view_toolbar" />
|
|
<include layout="@layout/view_toolbar" />
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- <ScrollView
|
|
|
|
|
|
|
+ <!--不要使用ScrollView嵌套RecyclerView,会导致显示不全。
|
|
|
|
|
+ 要使用NestedScrollView嵌套RecyclerView,配合android:nestedScrollingEnabled="false"属性解决滑动冲突问题-->
|
|
|
|
|
+ <androidx.core.widget.NestedScrollView
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content">
|
|
android:layout_height="wrap_content">
|
|
|
|
|
|
|
@@ -18,15 +19,15 @@
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:gravity="center_vertical"
|
|
android:gravity="center_vertical"
|
|
|
android:orientation="vertical"
|
|
android:orientation="vertical"
|
|
|
- android:paddingStart="@dimen/margin_default"
|
|
|
|
|
- android:paddingEnd="@dimen/margin_default">
|
|
|
|
|
|
|
+ android:paddingStart="@dimen/margin_s"
|
|
|
|
|
+ android:paddingEnd="@dimen/margin_s">
|
|
|
|
|
|
|
|
<!--标题-->
|
|
<!--标题-->
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/tv_title"
|
|
android:id="@+id/tv_title"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginTop="@dimen/margin_default"
|
|
|
|
|
|
|
+ android:layout_marginTop="@dimen/margin_s"
|
|
|
android:textColor="@color/black"
|
|
android:textColor="@color/black"
|
|
|
android:textSize="@dimen/text_sub_title" />
|
|
android:textSize="@dimen/text_sub_title" />
|
|
|
|
|
|
|
@@ -66,24 +67,21 @@
|
|
|
android:textSize="@dimen/text_s" />
|
|
android:textSize="@dimen/text_s" />
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
- <include layout="@layout/view_divider_slight"/>
|
|
|
|
|
-
|
|
|
|
|
- <!--图片-->
|
|
|
|
|
<androidx.recyclerview.widget.RecyclerView
|
|
<androidx.recyclerview.widget.RecyclerView
|
|
|
- android:id="@+id/rv_detail"
|
|
|
|
|
|
|
+ android:id="@+id/rv_magnet"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:nestedScrollingEnabled="false"/>
|
|
|
|
|
|
|
+ android:nestedScrollingEnabled="false"
|
|
|
|
|
+ android:layout_marginBottom="@dimen/margin_default"/>
|
|
|
|
|
|
|
|
<include layout="@layout/view_divider_slight"/>
|
|
<include layout="@layout/view_divider_slight"/>
|
|
|
|
|
|
|
|
|
|
+ <!--图片-->
|
|
|
<androidx.recyclerview.widget.RecyclerView
|
|
<androidx.recyclerview.widget.RecyclerView
|
|
|
- android:id="@+id/rv_magnet"
|
|
|
|
|
|
|
+ android:id="@+id/rv_detail"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:nestedScrollingEnabled="false"
|
|
|
|
|
- android:layout_marginTop="@dimen/margin_ss"
|
|
|
|
|
- android:layout_marginBottom="@dimen/margin_ss"/>
|
|
|
|
|
|
|
+ android:nestedScrollingEnabled="false"/>
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
- </ScrollView>
|
|
|
|
|
|
|
+ </androidx.core.widget.NestedScrollView>
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|