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

Merge branch 'master' into dev_random_pk

Browse Source 
# Conflicts:
#	live/src/main/res/values/strings.xml
This commit is contained in:
zlzw
2022-12-05 17:46:57 +08:00
parent ed6b531b8d 2a2672587c
commit 9ead9a6fb8
207 changed files with 7020 additions and 3152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
live/src/main/res/drawable/bg_live_anchor_open_mic.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="233dp" android:height="40dp">
<shape android:shape="rectangle">
<solid android:color="#ff0fdab8" />
<corners android:topLeftRadius="20dp" android:topRightRadius="20dp" android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp" />
</shape>
</item>
</selector>

25
live/src/main/res/drawable/bg_live_mic_av.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="40dp" android:height="40dp">
<shape android:shape="oval">
<corners
android:radius="1dp"
android:topLeftRadius="12dp"
android:topRightRadius="2dp"
android:bottomLeftRadius="2dp"
android:bottomRightRadius="2dp"/><!-- 设置圆角半径 -->
<gradient
android:startColor="#fffe9afc"
android:endColor="#ff8ab3ff"
android:useLevel="true"
android:angle="45"
android:type="linear"
android:centerX="0"
android:centerY="0"
android:gradientRadius="90"/>
</shape>
</item>
</selector>

BIN
live/src/main/res/drawable/loading_00000.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 29 KiB

BIN
live/src/main/res/drawable/loading_00001.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
live/src/main/res/drawable/loading_00002.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
live/src/main/res/drawable/loading_00003.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
live/src/main/res/drawable/loading_00004.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
live/src/main/res/drawable/loading_00005.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
live/src/main/res/drawable/loading_00006.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
live/src/main/res/drawable/loading_00007.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
live/src/main/res/drawable/loading_00008.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

BIN
live/src/main/res/drawable/loading_00009.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
live/src/main/res/drawable/loading_00010.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
live/src/main/res/drawable/loading_00011.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
live/src/main/res/drawable/loading_00012.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
live/src/main/res/drawable/loading_00013.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
live/src/main/res/drawable/loading_00014.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

BIN
live/src/main/res/drawable/loading_00015.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

20
live/src/main/res/layout/activity_live_anchor.xml
View File

@@ -1,19 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/live_bg"
>
android:background="@mipmap/live_bg">
<FrameLayout
android:id="@+id/preview_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/container_wrap"
@@ -23,21 +20,18 @@
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
</FrameLayout>
<pl.droidsonroids.gif.GifImageView
android:id="@+id/gift_gif"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:scaleType="centerCrop"/>
android:scaleType="centerCrop" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga"
@@ -46,11 +40,11 @@
android:layout_gravity="center_vertical"
android:scaleType="centerCrop"
app:autoPlay="true"
app:loopCount="1"/>
app:loopCount="1" />
<FrameLayout
android:id="@+id/page_container"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</FrameLayout>

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

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.yunbao.common.views.weight.MyDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -53,6 +52,9 @@
android:visibility="gone" />
</FrameLayout>
<include
android:id="@+id/loading"
layout="@layout/layout_portrait_live_item" />
</com.yunbao.common.views.weight.MyDrawerLayout>

50
live/src/main/res/layout/anchor_open_mic_view.xml Normal file
View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/anchor_open_mic"
android:layout_width="match_parent"
android:layout_height="200dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="63dp"
android:layout_height="93dp"
android:src="@mipmap/icon_big_mic" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:text="@string/live_anchor_open_mic"
android:textColor="#ffb1b1b1"
android:textSize="14sp" />
<LinearLayout
android:id="@+id/open_mic"
android:layout_width="233dp"
android:layout_height="45dp"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:background="@drawable/bg_live_anchor_open_mic"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:text="打開語音連麥權限"
android:textColor="#FFFFFF"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="3dp"
android:layout_marginBottom="8dp"
android:text="粉絲等級5以上的用戶可向您發起申請"
android:textColor="#259484"
android:textSize="8sp" />
</LinearLayout>
</LinearLayout>

94
live/src/main/res/layout/dialog_anchor_mic_list.xml Normal file
View File

@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg_black"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="24dp"
android:orientation="horizontal">
<TextView
android:id="@+id/audience_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="當前連麥"
android:textColor="#fff6f7fb"
android:textSize="16sp" />
<TextView
android:id="@+id/guard_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="連麥申請"
android:textColor="#ff646464"
android:textSize="16sp" />
<TextView
android:id="@+id/fans_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="邀請連麥"
android:visibility="gone"
android:textColor="#EB6877"
android:textSize="16sp" />
<TextView
android:id="@+id/apply_btn"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_weight="1"
android:layout_marginRight="15dp"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="@string/apply_for_lianmai"
android:textColor="#FFFFFF"
android:background="@drawable/background_0fdab8"
android:textSize="12sp" />
</LinearLayout>
<View
android:id="@+id/view_no"
android:layout_width="match_parent"
android:layout_height="0dp"
android:visibility="gone" />
<include
layout="@layout/anchor_open_mic_view"
android:layout_width="233dp"
android:layout_height="233dp"
android:layout_gravity="center"
android:visibility="gone" />
<include
layout="@layout/no_more_mic_view"
android:layout_width="233dp"
android:layout_height="233dp"
android:layout_gravity="center"
android:visibility="gone" />
<com.yunbao.common.custom.CommonRefreshView
android:id="@+id/refreshView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="65dp" />
</LinearLayout>
</RelativeLayout>

267
live/src/main/res/layout/dialog_live_gift_wrap.xml
View File

@@ -2,181 +2,196 @@
<LinearLayout 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="wrap_content"
android:layout_height="350dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/live_gift_download_all"
android:layout_width="155dp"
android:layout_height="32dp"
android:layout_marginStart="12dp"
android:layout_alignParentStart="true"
android:background="@drawable/bg_live_gift_download_all"
android:gravity="center"
android:visibility="invisible"
android:orientation="horizontal">
<ImageView
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_marginEnd="7dp"
android:src="@mipmap/icon_small_download" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:visibility="visible"
android:text="一鍵下載所有禮物動畫"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_luck_gift_tip"
android:layout_width="105.27dp"
android:layout_alignParentEnd="true"
android:layout_height="32dp"
android:layout_marginEnd="12dp"
android:background="@drawable/bg_live_vip_blue"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/vipGoldIcon"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginEnd="7dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_vip_gold" />
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:gravity="start"
android:layout_height="wrap_content">
android:id="@+id/live_gift_download_all"
android:layout_width="155dp"
android:layout_height="32dp"
android:layout_alignParentStart="true"
android:layout_marginStart="12dp"
android:background="@drawable/bg_live_gift_download_all"
android:gravity="center"
android:orientation="horizontal"
android:visibility="invisible">
<ImageView
android:layout_width="19dp"
android:layout_height="19dp"
android:layout_marginEnd="7dp"
android:src="@mipmap/icon_small_download" />
<TextView
android:id="@+id/vipGoldTitle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:textColor="#FFFFFF"
android:text="@string/live_gift_buy_gold"
android:textSize="11.52sp" />
<TextView
android:id="@+id/vipGoldDesc"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:textColor="#999999"
android:text="@string/live_gift_buy_gold_desc"
android:textSize="7.68sp" />
android:gravity="center"
android:text="一鍵下載所有禮物動畫"
android:textSize="10sp"
android:visibility="visible" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/btn_luck_gift_tip"
android:layout_width="105.27dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="12dp"
android:background="@drawable/bg_live_vip_blue"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/vipGoldIcon"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginEnd="7dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_vip_gold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:orientation="vertical">
<TextView
android:id="@+id/vipGoldTitle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:text="@string/live_gift_buy_gold"
android:textColor="#FFFFFF"
android:textSize="11.52sp" />
<TextView
android:id="@+id/vipGoldDesc"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:text="@string/live_gift_buy_gold_desc"
android:textColor="#999999"
android:textSize="7.68sp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_live_gift">
<LinearLayout
android:id="@+id/gift_tab_layout"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="40dp"
android:gravity="center"
android:layout_height="50dp">
android:orientation="horizontal">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/items"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="5dp" />
android:layout_marginEnd="5dp"
android:layout_weight="1" />
<ImageView
android:layout_marginEnd="15dp"
android:layout_width="wrap_content"
android:src="@drawable/bg_live_gift_package_line"
android:layout_gravity="center"
android:layout_height="23dp"/>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/btn_gift_package"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="10dp"
android:drawablePadding="2dp"
android:gravity="center_vertical"
android:text="@string/live_wrap"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:dt_left_height="23dp"
app:dt_left_width="1.3dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="23dp"
android:layout_gravity="center"
android:layout_marginEnd="15dp"
android:src="@drawable/bg_live_gift_package_line" />
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/btn_gift_package"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="10dp"
android:drawablePadding="2dp"
android:gravity="center_vertical"
android:text="@string/live_wrap"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:dt_left_height="23dp"
app:dt_left_width="1.3dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/group"
android:layout_width="match_parent"
android:layout_height="300dp"
android:gravity="bottom"
android:layout_below="@id/gift_tab_layout"
android:gravity="bottom"
android:orientation="vertical">
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginTop="5dp"
android:layout_marginBottom="1dp"/>
android:layout_weight="1" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/vpWrapList"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginTop="5dp"
android:layout_marginBottom="1dp"
android:layout_marginBottom="3dp"
android:layout_weight="1"
android:visibility="gone" />
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_marginEnd="30dp"
android:layout_gravity="end"
android:orientation="horizontal" />
<RadioGroup
android:id="@+id/radio_group_wrap"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal"
android:visibility="gone" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_weight="0"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:layout_height="66dp"
android:layout_weight="0">
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_gravity="end"
android:layout_marginTop="3.5dp"
android:layout_marginEnd="20dp"
android:gravity="end"
android:orientation="horizontal" />
<RadioGroup
android:id="@+id/radio_group_wrap"
android:layout_width="wrap_content"
android:layout_marginEnd="20dp"
android:layout_height="6dp"
android:layout_gravity="end"
android:layout_marginTop="3.5dp"
android:gravity="end"
android:orientation="horizontal"
android:visibility="visible" />
<RelativeLayout
android:id="@+id/btn_send_group"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp">
<TextView
android:id="@+id/btn_send"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_gift_send_2"
android:enabled="false"
android:gravity="center"
@@ -188,7 +203,8 @@
android:id="@+id/btn_choose"
android:layout_width="60dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="10dp"
android:layout_toLeftOf="@id/btn_send"
android:background="@drawable/bg_live_gift_choose"
android:gravity="center"
@@ -202,31 +218,35 @@
android:id="@+id/arrow"
android:layout_width="13dp"
android:layout_height="7dp"
android:layout_centerVertical="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="22dp"
android:layout_toLeftOf="@id/btn_send"
android:src="@mipmap/icon_live_gift_2"
app:tint="@color/global"
android:visibility="invisible" />
android:visibility="invisible"
app:tint="@color/global" />
</RelativeLayout>
<LinearLayout
android:orientation="horizontal"
android:gravity="bottom"
android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginBottom="5dp"
android:gravity="bottom"
android:layout_marginStart="20dp"
android:orientation="horizontal">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/goldCoin"
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:textColor="@color/white"
@@ -253,16 +273,17 @@
app:dt_right_width="14dp" />
</LinearLayout>
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/go_charge"
android:layout_width="42dp"
android:layout_height="22dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="3dp"
android:background="@drawable/bg_live_gift_buy"
android:drawablePadding="4dp"
android:gravity="center"
android:text="@string/charge"
android:background="@drawable/bg_live_gift_buy"
android:textColor="@color/yellow5"
android:textSize="12sp"
app:dt_left_height="20dp"

2
live/src/main/res/layout/dialog_live_role.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/bg_live_role"
android:background="@drawable/bg_live_tota"
android:layout_width="match_parent"
android:layout_height="171dp">

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

@@ -22,7 +22,7 @@
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:text="@string/live_class_tip_title"
android:textColor="#F6F7FB"
@@ -37,11 +37,9 @@
android:layout_marginStart="10dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="10dp"
android:text="@string/live_class_tip"
android:textColor="#B3F6F7FB"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2" />

30
live/src/main/res/layout/dialog_new_live_user.xml
View File

@@ -156,6 +156,7 @@
android:layout_height="17dp"
android:layout_marginTop="13dp"
android:gravity="center"
android:layout_gravity="center"
android:orientation="horizontal">
<ImageView
@@ -179,7 +180,6 @@
android:id="@+id/id_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="10dp"
android:textColor="#B1B1B1"
android:textSize="13sp" />
@@ -196,7 +196,6 @@
android:id="@+id/fans_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="10dp"
android:textColor="#B1B1B1"
android:textSize="13sp" />
@@ -213,7 +212,6 @@
android:id="@+id/praise_val"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="10dp"
android:textColor="#B1B1B1"
android:textSize="13sp" />
@@ -221,7 +219,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="17.5dp"
android:layout_marginTop="15dp"
android:gravity="center"
android:orientation="horizontal">
@@ -229,13 +227,13 @@
<ImageView
android:id="@+id/sex"
android:layout_width="27dp"
android:layout_height="17dp"
android:layout_height="match_parent"
android:layout_marginLeft="4dp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:orientation="horizontal"
android:layout_width="46.5dp"
android:layout_height="17.5dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="6dp">
@@ -252,7 +250,7 @@
<TextView
android:id="@+id/user_card_lv_val"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="5dp"
android:gravity="center"
@@ -267,30 +265,30 @@
<LinearLayout
android:id="@+id/btn_union"
android:layout_width="75dp"
android:layout_height="23dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="6dp"
android:background="@drawable/bg_user_card_guard"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:visibility="gone">
<TextView
android:id="@+id/union_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center"
android:text="@string/user_card_guard"
android:textColor="#FFFFFF"
android:textSize="12sp" />
android:textSize="9sp" />
</LinearLayout>
<ImageView
android:id="@+id/user_card_noble"
android:layout_width="48dp"
android:layout_height="24dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="6dp"
android:src="@mipmap/emperor_rom" />
</LinearLayout>

7
live/src/main/res/layout/dialog_user_more_list.xml
View File

@@ -114,8 +114,8 @@
<ImageView
android:id="@+id/no_more"
android:layout_width="233dp"
android:layout_height="233dp"
android:layout_marginBottom="32dp"
android:layout_height="200dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -125,9 +125,10 @@
android:id="@+id/no_more_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#B3FFFFFF"
android:textSize="14sp"
android:visibility="gone"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/no_more" />

150
live/src/main/res/layout/item_anchor_mic_info.xml Normal file
View File

@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="69dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginLeft="27dp"
android:gravity="center">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
app:autoPlay="true" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="用户名称"
android:textColor="#F6F7FB"
android:textSize="14sp" />
<ImageView
android:id="@+id/noble"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginLeft="5dp"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/sex"
android:layout_width="18dp"
android:layout_height="15dp" />
<ImageView
android:id="@+id/level"
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_marginLeft="5dp" />
</LinearLayout>
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/mic_icon"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="27dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/mic_exit"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/beauty_jingbai" />
<ImageView
android:id="@+id/mic_exit"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="36dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/btn_icon_quit" />
<Button
android:id="@+id/mic_btn"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginEnd="36dp"
android:background="@drawable/bg_anchor_mic_info_btn_ok"
android:text="同意"
android:textColor="#FFFFFF"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

57
live/src/main/res/layout/item_live_gift.xml
View File

@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<com.yunbao.common.custom.MyFrameLayout2
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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="wrap_content"
app:mfl_ratio="1"
android:layout_height="92dp"
android:background="@drawable/bg_live_gift_items"
>
app:mfl_ratio="1">
<com.yunbao.common.custom.MyRadioButton
android:id="@+id/radioButton"
@@ -14,15 +12,14 @@
android:layout_height="match_parent"
android:background="@drawable/bg_live_gift_item"
android:button="@null"
android:checked="true"
/>
android:checked="true" />
<com.yunbao.live.custom.GiftMarkView
android:id="@+id/mark"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="1dp"
android:layout_marginTop="1dp"/>
android:layout_marginTop="1dp"
android:layout_marginRight="1dp" />
<RelativeLayout
android:layout_width="45dp"
@@ -34,20 +31,21 @@
android:id="@+id/icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"/>
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<TextView android:id="@+id/expire"
<TextView
android:id="@+id/expire"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:textColor="@color/color_white"
android:gravity="center"
android:background="#D996cff0"
android:visibility="gone"
android:layout_centerVertical="true"
android:layout_marginBottom="2dp"
android:textSize="8sp"/>
android:background="#D996cff0"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="8sp"
android:visibility="gone" />
</RelativeLayout>
@@ -56,21 +54,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:gravity="center"
android:layout_marginBottom="8dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView android:id="@+id/pay_ico"
<ImageView
android:id="@+id/pay_ico"
android:layout_width="10dp"
android:layout_height="10dp"/>
android:layout_height="10dp" />
<TextView
android:id="@+id/price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/gray3"
android:layout_marginLeft="5dp"
android:textSize="11sp"/>
android:textColor="@color/gray3"
android:textSize="11sp" />
</LinearLayout>
@@ -78,18 +77,17 @@
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="23dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="12sp"
android:layout_gravity="bottom"
/>
android:textSize="12sp" />
<TextView
android:visibility="gone"
android:layout_gravity="right"
android:id="@+id/tvRedpoint"
android:layout_width="wrap_content"
android:layout_height="14dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:background="@drawable/bg_red_point"
android:gravity="center"
@@ -98,7 +96,8 @@
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:textColor="@color/white"
android:textSize="10sp" />
android:textSize="10sp"
android:visibility="gone" />
<LinearLayout
android:id="@+id/gift_loading_layout"
@@ -117,4 +116,4 @@
</LinearLayout>
</com.yunbao.common.custom.MyFrameLayout2>
</FrameLayout>

2
live/src/main/res/layout/item_new_live_ready_class.xml
View File

@@ -4,7 +4,7 @@
android:layout_height="60dp"
android:layout_marginBottom="12dp"
android:background="@drawable/bg_new_live_room_type_uncheck"
android:paddingLeft="35dp"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<ImageView

54
live/src/main/res/layout/item_user_more_info.xml
View File

@@ -126,9 +126,9 @@
<ImageView
android:id="@+id/level"
android:layout_width="42dp"
android:layout_height="14dp"
android:scaleType="fitXY"
android:layout_marginLeft="5dp" />
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:scaleType="fitXY" />
</LinearLayout>
</LinearLayout>
@@ -142,6 +142,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="25dp"
android:layout_marginRight="35dp" />
@@ -154,34 +155,35 @@
android:layout_marginRight="35dp">
</FrameLayout>
<ImageView
android:id="@+id/ivIcon"
android:layout_alignParentRight="true"
android:layout_width="60dp"
android:layout_height="30dp"
android:paddingLeft="13dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="26dp"
android:layout_gravity="center" />
<TextView
android:id="@+id/tvName"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_gravity="center"
android:layout_marginTop="25dp"
android:layout_marginEnd="25dp"
android:paddingLeft="13dp"
android:text="主播"
android:textColor="@color/white"
android:textSize="10sp" />
android:layout_marginEnd="25dp">
<ImageView
android:id="@+id/ivIcon"
android:layout_width="60dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:layout_gravity="center"
android:paddingLeft="13dp" />
<TextView
android:id="@+id/tvName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="主播"
android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp"
android:layout_centerVertical="true"
android:textColor="@color/white"
android:textSize="10sp" />
</RelativeLayout>
</RelativeLayout>

21
live/src/main/res/layout/layout_portrait_live_item.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@mipmap/live_bg" />
<ImageView
android:id="@+id/iv_loading"
android:layout_width="150dp"
android:layout_height="188dp"
android:layout_centerInParent="true"
android:background="@drawable/loading_animation" />
</RelativeLayout>

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

@@ -12,6 +12,7 @@
android:src="@mipmap/icon_big_mic"/>
<TextView
android:id="@+id/no_more_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_more_mic"

11
live/src/main/res/layout/view_live_anchor.xml
View File

@@ -166,18 +166,17 @@ PK"
android:id="@+id/et_input"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginLeft="45dp"
android:background="@drawable/bg_live_item"
android:alpha="0.5"
android:layout_centerVertical="true"
android:layout_marginLeft="45dp"
android:layout_toLeftOf="@id/btn_pk"
android:alpha="0.5"
android:background="@drawable/bg_live_item"
android:hint="@string/live_say_something"
android:padding="5dp"
android:singleLine="true"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="14sp"
android:layout_toLeftOf="@id/btn_pk"
/>
android:textSize="14sp" />
<ImageView
android:layout_centerVertical="true"
android:id="@+id/btn_chat"

2
live/src/main/res/layout/view_live_audience.xml
View File

@@ -414,7 +414,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_gravity="center_vertical"
android:layout_marginRight="5dp"
android:layout_marginRight="47dp"
android:layout_marginBottom="40dp"
app:autoPlay="true" />

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

@@ -1,41 +1,38 @@
<?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:id="@+id/root"
android:animateLayoutChanges="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/video_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<ImageView
android:id="@+id/leave"
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" />
<RelativeLayout
android:id="@+id/pk_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/live_top"
>
android:layout_marginTop="@dimen/live_top">
<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"
@@ -51,34 +48,43 @@
android:id="@+id/small_container"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="120dp"
app:mfl3_ratio="0.25"
/>
app:mfl3_ratio="0.25" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
android:visibility="invisible"
/>
<FrameLayout
android:id="@+id/ry_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
/>
android:scaleType="centerCrop" />
<FrameLayout android:id="@+id/ry_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ProgressBar
android:id="@+id/loading"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="240dp"
android:layout_centerHorizontal="true"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
android:visibility="invisible" />
<ProgressBar
android:id="@+id/loading2"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="240dp"
android:layout_centerHorizontal="true"
android:indeterminateBehavior="repeat"
android:indeterminateDrawable="@drawable/anim_loading"
android:indeterminateOnly="true"
android:visibility="invisible" />
</RelativeLayout>

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

@@ -9,6 +9,11 @@
android:paddingTop="15dp">
<com.yunbao.common.views.weight.NobleNoticeView
android:id="@+id/noble"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="60dp" />
<LinearLayout
android:id="@+id/lin"
@@ -2017,10 +2022,20 @@
android:layout_height="50dp"
android:visibility="gone">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
@@ -2041,10 +2056,20 @@
android:layout_marginTop="19dp"
android:visibility="gone">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico1"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
@@ -2065,10 +2090,20 @@
android:layout_marginTop="19dp"
android:visibility="gone">
<View
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_live_mic_av" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/mic_ico2"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:layout_marginBottom="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
@@ -2089,13 +2124,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/live_video" />
<com.yunbao.common.views.weight.NobleNoticeView
android:id="@+id/noble"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/live_wks_layout"
android:layout_marginTop="10dp" />
<LinearLayout
android:id="@+id/bannerLayout"
@@ -2252,6 +2280,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:visibility="visible"></LinearLayout>
android:visibility="visible" />
</LinearLayout>
</RelativeLayout>

1
live/src/main/res/values-en/strings.xml
View File

@@ -17,4 +17,5 @@
<string name="live_room_public_des">Available for all</string>
<string name="live_room_private_des">Only those who have the room code can watch</string>
<string name="live_room_type_submit">Submit</string>
<string name="live_mic_max">The number of voices has reached 3, and no more can be added.</string>
</resources>

5
live/src/main/res/values/strings.xml
View File

@@ -27,6 +27,11 @@
<string name="more_than" translatable="false">已超过10秒未识别到录音</string>
<string name="live_role_title" translatable="false">身份特權</string>
<string name="noble_seat" translatable="false">貴族坐席</string>
<string name="live_mic_max">當前連麥語音人數已達到3人，無法再添加。</string>
<string name="live_mic_user_apply" translatable="false">%s 申請連麥,是否查看</string>
<string name="live_mic_user_down" translatable="false">已踢下麥</string>
<string name="live_mic_invite" translatable="false">已發出邀請,等待用戶接受</string>
<string name="live_mic_request" translatable="false">已同意請求,等待用戶接受</string>
<string name="random_pk_info_title" translatable="false">PK主要規則說明：</string>
<string name="random_pk_info_desc_1" translatable="false">1、開始匹配後，系統將會自動給您挑選對手進行PK；</string>
<string name="random_pk_info_desc_2" translatable="false">2、每場PK總時長10分鍾，懲罰時間為1分鍾；</string>