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

zb端多人Pk合流完成，Pk结束完成

Browse Source
This commit is contained in:
18401019693
2022-12-08 17:29:29 +08:00
parent 7ebd935eba
commit 4cd4939c58
11 changed files with 236 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
live/src/main/res/layout/view_live_pk_details.xml
View File

@@ -47,6 +47,9 @@
android:layout_marginStart="5.33dp"
android:layout_marginTop="3.3dp"
android:background="@drawable/background_pk_time"
android:ellipsize="end"
android:maxEms="6"
android:maxLines="1"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"
@@ -102,6 +105,9 @@
android:layout_marginTop="3.3dp"
android:layout_marginEnd="5.33dp"
android:background="@drawable/background_pk_time"
android:ellipsize="end"
android:maxEms="6"
android:maxLines="1"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"
@@ -126,6 +132,9 @@
android:layout_marginStart="5.33dp"
android:layout_marginBottom="3.3dp"
android:background="@drawable/background_pk_time"
android:ellipsize="end"
android:maxEms="6"
android:maxLines="1"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"
@@ -181,6 +190,9 @@
android:layout_marginEnd="5.33dp"
android:layout_marginBottom="3.3dp"
android:background="@drawable/background_pk_time"
android:ellipsize="end"
android:maxEms="6"
android:maxLines="1"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"

1
live/src/main/res/layout/view_live_push_ry.xml
View File

@@ -183,6 +183,7 @@
android:visibility="gone">
<TextView
android:id="@+id/text_time"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"

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

@@ -1541,12 +1541,6 @@
android:textColor="@color/white"
android:textSize="12sp" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/dr_pk_end_gif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<LinearLayout
android:layout_width="match_parent"
@@ -2282,4 +2276,14 @@
android:layout_height="30dp"
android:visibility="visible" />
</LinearLayout>
<pl.droidsonroids.gif.GifImageView
android:id="@+id/dr_pk_end_gif"
android:layout_width="140dp"
android:layout_height="140dp"
android:layout_marginTop="160dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="false"
android:src="@mipmap/drpkend"
android:visibility="gone" />
</RelativeLayout>