Merge remote-tracking branch 'origin/master'

This commit is contained in:
18142669586 2022-09-01 11:39:54 +08:00
commit 161306de30

View File

@ -197,26 +197,18 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/group_1"
android:layout_marginLeft="15dp"
android:layout_marginEnd="10dp"
android:layout_toRightOf="@id/group_1">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="end|center" android:gravity="end|center"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_recyclerView" android:id="@+id/user_recyclerView"
android:layout_width="110dp" android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="40dp" android:layout_height="40dp"
android:visibility="visible"
android:layout_gravity="end|center" android:layout_gravity="end|center"
android:layout_marginRight="-3dp" android:layout_marginRight="-3dp"
android:overScrollMode="never" /> android:overScrollMode="never" />
@ -238,7 +230,6 @@
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@mipmap/icon_live_close_3" /> android:src="@mipmap/icon_live_close_3" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
</LinearLayout> </LinearLayout>