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

Merge branch 'master' into tmp_mon

Browse Source 
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
This commit is contained in:
zlzw
2023-02-09 10:06:06 +08:00
parent 13c53644a2 a808cd13c0
commit af00538101
119 changed files with 5325 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
live/src/main/res/drawable/background_pk_time.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#60000000" />
<corners android:radius="7.17dp" />
</shape>

252
live/src/main/res/layout/view_live_pk_details.xml Normal file
View File

@@ -0,0 +1,252 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--左上-->
<LinearLayout
android:id="@+id/lin_pk1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:id="@+id/linear_grade1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5.33dp"
android:layout_marginTop="4.67dp"
android:background="@drawable/background_pk_time"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/image_grade1"
android:layout_width="10.67dp"
android:layout_height="10.67dp"
android:layout_marginStart="2.67dp"
android:layout_marginTop="1.67dp"
android:layout_marginEnd="4.33dp"
android:layout_marginBottom="1.67dp"
android:src="@mipmap/icon_livepk_no1" />
<TextView
android:id="@+id/text_grade1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6.76dp"
android:text="000"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<TextView
android:id="@+id/text_pk_name1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5.33dp"
android:layout_marginTop="3.3dp"
android:background="@drawable/background_pk_time"
android:maxLines="1"
android:ellipsize="end"
android:maxWidth="50dp"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"
android:paddingBottom="4.33dp"
android:text="我方"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<!--右上-->
<LinearLayout
android:id="@+id/lin_pk2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:gravity="end"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:id="@+id/linear_grade2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4.67dp"
android:layout_marginEnd="5.33dp"
android:background="@drawable/background_pk_time"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/image_grade2"
android:layout_width="10.67dp"
android:layout_height="10.67dp"
android:layout_marginStart="2.67dp"
android:layout_marginTop="1.67dp"
android:layout_marginEnd="4.33dp"
android:layout_marginBottom="1.67dp"
android:src="@mipmap/icon_livepk_no2" />
<TextView
android:id="@+id/text_grade2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6.76dp"
android:text="000"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<TextView
android:id="@+id/text_pk_name2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3.3dp"
android:layout_marginEnd="5.33dp"
android:background="@drawable/background_pk_time"
android:ellipsize="end"
android:maxWidth="50dp"
android:maxLines="1"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"
android:paddingBottom="4.33dp"
android:text="我方"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<!--左下-->
<LinearLayout
android:id="@+id/lin_pk3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/text_pk_name3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5.33dp"
android:layout_marginBottom="3.3dp"
android:background="@drawable/background_pk_time"
android:maxLines="1"
android:ellipsize="end"
android:maxWidth="50dp"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"
android:paddingBottom="4.33dp"
android:text="我方"
android:textColor="@color/white"
android:textSize="8sp" />
<LinearLayout
android:id="@+id/linear_grade3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5.33dp"
android:layout_marginBottom="4.67dp"
android:background="@drawable/background_pk_time"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/image_grade3"
android:layout_width="10.67dp"
android:layout_height="10.67dp"
android:layout_marginStart="2.67dp"
android:layout_marginTop="1.67dp"
android:layout_marginEnd="4.33dp"
android:layout_marginBottom="1.67dp"
android:src="@mipmap/icon_livepk_no3" />
<TextView
android:id="@+id/text_grade3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6.76dp"
android:text="000"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
</LinearLayout>
<!--右下-->
<LinearLayout
android:id="@+id/lin_pk4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:gravity="end"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/text_pk_name4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5.33dp"
android:layout_marginBottom="3.3dp"
android:background="@drawable/background_pk_time"
android:maxLines="1"
android:ellipsize="end"
android:maxWidth="50dp"
android:paddingStart="6dp"
android:paddingTop="4.33dp"
android:paddingEnd="6dp"
android:paddingBottom="4.33dp"
android:text="我方"
android:textColor="@color/white"
android:textSize="8sp" />
<LinearLayout
android:id="@+id/linear_grade4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5.33dp"
android:layout_marginBottom="4.67dp"
android:background="@drawable/background_pk_time"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/image_grade4"
android:layout_width="10.67dp"
android:layout_height="10.67dp"
android:layout_marginStart="2.67dp"
android:layout_marginTop="1.67dp"
android:layout_marginEnd="4.33dp"
android:layout_marginBottom="1.67dp"
android:src="@mipmap/icon_livepk_no3" />
<TextView
android:id="@+id/text_grade4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6.76dp"
android:text="000"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
</LinearLayout>
<!--PK时间-->
<FrameLayout
android:id="@+id/time_title"
android:layout_width="70dp"
android:layout_height="18dp"
android:layout_gravity="center_horizontal"
android:background="@mipmap/live_pk_time_bg"
android:visibility="gone">
<TextView
android:id="@+id/text_time"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/pk_time"
android:textColor="@color/white"
android:textSize="10sp" />
</FrameLayout>
</FrameLayout>

4
live/src/main/res/layout/view_live_play_ksy.xml
View File

@@ -7,9 +7,11 @@
android:layout_height="match_parent">
<com.tencent.rtmp.ui.TXCloudVideoView
<com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/video_view"
android:layout_width="match_parent"
app:surface_type="texture_view"
app:use_controller="false"
android:layout_height="match_parent" />
<ImageView

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

@@ -1,33 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/camera_preview"
<LinearLayout
android:id="@+id/camera"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:id="@+id/camera_preview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<FrameLayout
android:id="@+id/camera_preview3"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
<FrameLayout
android:id="@+id/camera_preview1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout android:id="@+id/dr_pk_view"
<LinearLayout
android:id="@+id/dr_pk_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/camera_preview"
android:layout_marginTop="130dp"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="wrap_content"
@@ -37,17 +53,17 @@
<FrameLayout
android:id="@+id/dr1_preview"
android:layout_width="100dp"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="@mipmap/live_icon_vacancy"/>
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy" />
<FrameLayout
android:id="@+id/dr2_preview"
android:layout_width="100dp"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="@mipmap/live_icon_vacancy"/>
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy" />
</LinearLayout>
@@ -59,24 +75,23 @@
<FrameLayout
android:id="@+id/dr3_preview"
android:layout_width="100dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy"/>
android:background="@mipmap/live_icon_vacancy" />
<FrameLayout
android:id="@+id/dr4_preview"
android:layout_width="100dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@mipmap/live_icon_vacancy"/>
android:background="@mipmap/live_icon_vacancy" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<FrameLayout
@@ -85,75 +100,110 @@
android:layout_height="match_parent">
</FrameLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/layout_surface"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<SurfaceView
android:id="@+id/surface_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:id="@+id/goto_room_view"
android:layout_width="wrap_content"
android:layout_height="27dp"
android:layout_alignParentRight="true"
android:layout_marginTop="122dp"
android:layout_marginRight="9dp"
android:background="@drawable/bg_live_other_ico"
android:gravity="center"
android:visibility="gone">
<RelativeLayout
android:layout_width="21dp"
android:layout_height="21dp"
android:layout_marginLeft="3dp"
android:gravity="center">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatarOther"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
</RelativeLayout>
<TextView
android:id="@+id/tv_avatarOther_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="3dp"
android:maxLength="4"
android:maxLines="1"
android:text=""
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
<FrameLayout
android:id="@+id/pk_container"
android:layout_width="match_parent"
android:layout_height="270dp"
android:layout_marginTop="130dp"
>
android:layout_marginTop="130dp">
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/left_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="20dp"
/>
android:layout_marginBottom="20dp" />
<com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/right_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="right"
android:layout_marginBottom="20dp"
/>
android:layout_marginBottom="20dp" />
</FrameLayout>
<TextView
android:id="@+id/btn_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="400dp"
android:layout_marginRight="8dp"
android:background="@drawable/background_dedede"
android:paddingLeft="8dp"
android:paddingTop="5dp"
android:paddingRight="8dp"
android:paddingBottom="5dp"
android:text="結束連麥"
android:textColor="@color/color_white"
android:textSize="13sp"
android:visibility="gone" />
<com.yunbao.live.custom.MyFrameLayout3
android:id="@+id/small_container"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="120dp"
app:mfl3_ratio="0.25"
/>
<TextView android:id="@+id/btn_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_marginTop="120dp"
android:layout_marginRight="8dp"
android:layout_alignParentRight="true"
android:text="結束連麥"
android:textSize="13sp"
android:textColor="@color/color_white"
android:visibility="gone"
android:background="@drawable/background_dedede"/>
app:mfl3_ratio="0.25" />
<ImageView
@@ -161,7 +211,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:scaleType="centerCrop"
android:src="@mipmap/zslk"
android:visibility="gone"
android:scaleType="centerCrop"/>
android:visibility="gone" />
<FrameLayout
android:id="@+id/time_title"
android:layout_width="60dp"
android:layout_height="16.67dp"
android:layout_centerHorizontal="true"
android:background="@mipmap/live_pk_time_bg"
android:visibility="gone">
<TextView
android:id="@+id/text_time"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/pk_time"
android:textColor="@color/white"
android:textSize="8sp" />
<!-- 详情-->
</FrameLayout>
</RelativeLayout>

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

@@ -189,7 +189,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/chat_recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="370dp"
android:overScrollMode="never"
android:scrollbars="none" />
@@ -707,8 +707,8 @@
android:layout_height="27dp"
android:layout_below="@id/live_time"
android:layout_marginLeft="12dp"
android:layout_marginTop="12dp"
android:visibility="gone">
android:layout_marginTop="-12dp"
android:visibility="visible">
<ImageView
android:id="@+id/img_hot_gif"
@@ -1258,8 +1258,8 @@
<ImageView
android:id="@+id/icon_pk_top"
android:layout_width="130dp"
android:layout_height="35dp"
android:layout_width="110dp"
android:layout_height="28dp"
android:layout_alignTop="@+id/live_video"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
@@ -1280,12 +1280,12 @@
android:layout_marginStart="13dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_item_pk_rank_red"
android:paddingStart="17dp"
android:paddingTop="5dp"
android:paddingEnd="17dp"
android:paddingBottom="5dp"
android:paddingStart="10dp"
android:paddingTop="3dp"
android:paddingEnd="10dp"
android:paddingBottom="3dp"
android:textColor="#FFFFFF"
android:textSize="15sp"
android:textSize="12sp"
android:textStyle="bold"
android:visibility="gone" />
@@ -1298,12 +1298,12 @@
android:layout_marginEnd="13dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_item_pk_rank_blue"
android:paddingStart="17dp"
android:paddingTop="5dp"
android:paddingEnd="17dp"
android:paddingBottom="5dp"
android:paddingStart="10dp"
android:paddingTop="3dp"
android:paddingEnd="10dp"
android:paddingBottom="3dp"
android:textColor="#FFFFFF"
android:textSize="15sp"
android:textSize="12sp"
android:textStyle="bold"
android:visibility="gone" />
@@ -2112,7 +2112,6 @@
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@mipmap/voice" />
</RelativeLayout>

43
live/src/main/res/layout/view_new_live_ready.xml
View File

@@ -54,6 +54,43 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:id="@+id/btn_live_clarity"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginStart="16dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/img_clarity"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_weight="1"
app:srcCompat="@mipmap/icon_fhd" />
<TextView
android:id="@+id/live_clarity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:text="@string/high_definition"
android:textColor="@color/white"
android:textSize="12sp" />
<ImageView
android:layout_width="5dp"
android:layout_height="10dp"
android:layout_weight="1"
android:scaleType="centerCrop"
android:src="@mipmap/icon_live_more" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_room_type"
android:layout_width="wrap_content"
@@ -62,7 +99,7 @@
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_live_clarity"
app:layout_constraintTop_toTopOf="parent">
<ImageView
@@ -94,11 +131,11 @@
android:id="@+id/btn_live_class"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginStart="75dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintStart_toEndOf="@+id/btn_room_type"
app:layout_constraintEnd_toStartOf="@+id/btn_wishlist"
app:layout_constraintTop_toTopOf="parent">
<TextView

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_normal_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_normal_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 883 B

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_pay_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_pay_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 955 B

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_pwd_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_pwd_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_time_1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
live/src/main/res/mipmap-mdpi/icon_live_type_time_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_livepk_no1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_livepk_no2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_livepk_no3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_livepk_no4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB