yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_hour_rank

Browse Source
This commit is contained in:
zlzw
2022-08-29 09:44:46 +08:00
parent 55ccb03b4a 513d6d19eb
commit 308ceeb28c
102 changed files with 3632 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
live/src/main/res/layout/view_live_room.xml
View File

@@ -9,6 +9,76 @@
android:paddingTop="15dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/btn_event1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="18dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.ms.banner.Banner
android:id="@+id/banner1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event2"
android:layout_width="58dp"
android:layout_height="80dp"
android:layout_gravity="right"
android:layout_marginRight="15dp"
android:layout_marginBottom="45dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.ms.banner.Banner
android:id="@+id/banner2"
android:layout_width="58dp"
android:layout_height="80dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/img_event"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/live_turntable" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/lin"
android:layout_width="match_parent"
@@ -127,12 +197,12 @@
android:id="@+id/user_guard"
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
app:riv_oval="true"
android:src="@mipmap/img_guardian_empty"/>
android:src="@mipmap/img_guardian_empty"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
@@ -141,18 +211,18 @@
android:layout_height="38dp"
android:src="@drawable/img_guardian_online"
android:visibility="gone"
app:autoPlay="true"/>
app:autoPlay="true" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_recyclerView"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginRight="-3dp"
android:overScrollMode="never" />
<ImageView
android:id="@+id/user_more"
android:layout_width="33dp"
@@ -352,10 +422,10 @@
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="6dp"
android:flipInterval="5000"
android:layout_marginEnd="6dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out"/>
android:outAnimation="@anim/anim_marquee_out" />
</LinearLayout>
<!--粉丝团-->
@@ -1796,7 +1866,11 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<!-- SVG 座骑-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/room_fast_msg"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_alignParentBottom="true" />
</RelativeLayout>