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

Merge branch 'dev_6.5.4'

Browse Source
This commit is contained in:
zlzw
2023-08-05 16:53:13 +08:00
parent dfeb1c246b d912ad6119
commit e7daabe588
86 changed files with 2953 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,94 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="350dp"
android:background="@mipmap/bg_fans_group_buy_dialog">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/anchorName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="37dp"
android:layout_marginBottom="12dp"
android:textColor="#8670F5"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/giftName"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="主播昵稱" />
<TextView
android:id="@+id/giftName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="#333333"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/anchorName"
android:text="@string/live_fans_group_buy_title" />
<TextView
android:id="@+id/giftInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:textColor="#B3000000"
android:textSize="10sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/giftName"
android:text="@string/live_fans_group_buy_info" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/giftList"
android:layout_width="wrap_content"
android:layout_height="130dp"
android:layout_marginStart="25dp"
android:layout_marginTop="19dp"
android:layout_marginEnd="25dp"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/giftInfo"
app:layout_constraintWidth_max="310dp"
tools:itemCount="3"
tools:listitem="@layout/item_fans_group_buy_list" />
<TextView
android:id="@+id/buy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="29dp"
android:background="@mipmap/icon_fans_group_buy_dialog_buy"
android:paddingStart="9dp"
android:paddingTop="6dp"
android:paddingEnd="9dp"
android:paddingBottom="6dp"
android:textColor="#FFF"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/giftList"
android:text="@string/live_fans_group_buy_buy" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

86
live/src/main/res/layout/dialog_fans_group_info.xml Normal file
View File

@@ -0,0 +1,86 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="350dp"
android:background="@mipmap/bg_fans_group_buy_dialog">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="30dp"
android:layout_marginTop="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:textStyle="bold"
android:textColor="#333333"
android:textSize="15sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info_title" />
<TextView
android:layout_marginTop="13dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info_text1" />
<TextView
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info_text2" />
<TextView
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info_text3" />
<TextView
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info_text4" />
<TextView
android:textStyle="bold"
android:textColor="#333333"
android:layout_marginTop="20dp"
android:textSize="15sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info2_title" />
<TextView
android:layout_marginTop="13dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info2_text1" />
<TextView
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/live_fans_group_info2_text2" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<ImageView
android:id="@+id/colse"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="12dp"
android:src="@mipmap/ic_live_fans_group_info_colse"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

52
live/src/main/res/layout/dialog_fans_group_send.xml Normal file
View File

@@ -0,0 +1,52 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="480dp"
android:background="@mipmap/bg_fans_group_buy_dialog">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/anchorName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="37dp"
android:textColor="#8670F5"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:text="@string/live_fans_group_send_title" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/giftList"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="25dp"
android:layout_marginTop="17dp"
android:layout_marginEnd="25dp"
android:layout_marginBottom="30dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/anchorName"
tools:itemCount="4"
app:spanCount="3"
tools:listitem="@layout/item_fans_group_package_list" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

144
live/src/main/res/layout/dialog_live_contact_details_gift.xml Normal file
View File

@@ -0,0 +1,144 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/background_d6e8fe">
<ImageView
android:id="@+id/back"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="22.5dp"
android:layout_marginTop="7dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_contact_details_back" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="235dp"
android:layout_marginTop="28dp"
android:layout_marginBottom="19dp"
android:background="@mipmap/bg_live_user_mailbox"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/title"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#3399FF"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="赠送时光怀表会获得到用户_98274的信件与联系方式" />
<LinearLayout
android:id="@+id/tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28.5dp"
android:layout_marginBottom="6.5dp"
android:gravity="start"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="50dp"
android:layout_height="50dp">
<com.makeramen.roundedimageview.RoundedImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:scaleType="centerCrop"
android:src="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<ImageView
android:id="@+id/gift_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:orientation="vertical">
<TextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="3dp"
android:layout_weight="1"
android:gravity="bottom"
android:textColor="#FFFFFF"
android:textSize="10sp"
tools:text="TextView" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="12dp"
android:layout_height="10dp"
android:layout_weight="1"
app:srcCompat="@mipmap/diamond" />
<TextView
android:id="@+id/diamond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="#FFFFFF"
android:textSize="10sp"
tools:text="20000" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/send"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="28.5dp"
android:layout_marginBottom="13.5dp"
android:background="@drawable/bg_item_live_send_details_gift"
android:paddingStart="10dp"
android:paddingTop="4dp"
android:paddingEnd="10dp"
android:paddingBottom="4dp"
android:text="@string/live_details_send_gift_btn"
android:textColor="#FFF"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

84
live/src/main/res/layout/item_fans_group_buy_list.xml Normal file
View File

@@ -0,0 +1,84 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="94dp"
android:layout_height="125dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="3dp"
android:background="@mipmap/icon_fans_group_buy_dialog_item">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/iconLayout"
android:layout_width="0dp"
android:layout_height="73dp"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:background="@drawable/bg_fans_group_buy_dialog_item"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/giftIcon"
android:layout_width="70dp"
android:layout_height="60dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/diamond" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/day"
android:layout_width="27dp"
android:layout_height="12dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="4dp"
android:background="@mipmap/icon_fans_group_buy_dialog_day"
android:gravity="center"
android:textColor="#7059BB"
android:textSize="8sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="1天"
tools:visibility="visible" />
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/introduce"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="浪漫啓航 *1" />
<TextView
android:id="@+id/introduce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:textColor="#FFFFFF"
android:textSize="11sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="5200" />
<ImageView
android:id="@+id/diamondIcon"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginEnd="4dp"
app:layout_constraintBottom_toBottomOf="@+id/introduce"
app:layout_constraintEnd_toStartOf="@+id/introduce"
app:layout_constraintTop_toTopOf="@+id/introduce"
app:srcCompat="@mipmap/diamond" />
</androidx.constraintlayout.widget.ConstraintLayout>

92
live/src/main/res/layout/item_fans_group_package_list.xml Normal file
View File

@@ -0,0 +1,92 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="94dp"
android:layout_height="155dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="19dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout4"
android:layout_width="94dp"
android:layout_height="120dp"
android:background="@mipmap/icon_fans_group_buy_dialog_item"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/iconLayout"
android:layout_width="0dp"
android:layout_height="73dp"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:background="@drawable/bg_fans_group_buy_dialog_item"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/giftIcon"
android:layout_width="70dp"
android:layout_height="60dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/diamond" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textColor="#FFFFFF"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iconLayout"
tools:text="浪漫啓航 *1" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/day"
android:layout_width="27dp"
android:layout_height="12dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="4dp"
android:background="@mipmap/icon_fans_group_buy_dialog_day"
android:gravity="center"
android:textColor="#7059BB"
android:textSize="8sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="1天"
tools:visibility="visible" />
<TextView
android:id="@+id/send"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:background="@mipmap/bg_funs_group_send_dialog_item"
android:paddingStart="13dp"
android:paddingTop="4dp"
android:paddingEnd="13dp"
android:paddingBottom="4dp"
android:textColor="#E6FFFFFF"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout4"
android:text="@string/live_fans_group_send_sub" />
</androidx.constraintlayout.widget.ConstraintLayout>

37
live/src/main/res/layout/view_fans_group_enter_room_leave.xml Normal file
View File

@@ -0,0 +1,37 @@
<?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:id="@+id/fans_enter_room_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="fitXY"
android:src="@mipmap/live_zt"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="8dp"
android:text="@string/come_hint"
android:textColor="#fff"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

62
live/src/main/res/layout/view_funs_live_anchor_start_notify.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="340dp"
android:layout_height="75dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@mipmap/bg_funs_live_anchor_start">
<com.yunbao.common.custom.RatioRoundImageView
android:id="@+id/avatar"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginTop="7dp"
android:layout_marginBottom="7dp"
android:src="@mipmap/icon_green_science"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:ri_ratio="0.5"
app:riv_oval="true" />
<TextView
android:id="@+id/anchorName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="15dp"
android:text="TextView"
android:textColor="#FFFFFF"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@+id/avatar"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/main_anchor_live_notify_info"
android:textSize="13sp"
android:textColor="#CCFFFFFF"
app:layout_constraintStart_toStartOf="@+id/anchorName"
app:layout_constraintTop_toBottomOf="@+id/anchorName" />
<TextView
android:id="@+id/liveGo"
android:layout_width="41dp"
android:layout_height="21dp"
android:layout_marginEnd="11dp"
android:background="@mipmap/bg_funs_live_go_start"
android:gravity="center"
android:textColor="#FFFEF3"
android:textSize="12sp"
android:text="@string/main_anchor_live_notify_live"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

69
live/src/main/res/layout/view_gift_danmu_fans.xml Normal file
View File

@@ -0,0 +1,69 @@
<?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="wrap_content"
android:layout_height="27dp"
android:background="@mipmap/bg_fans_danmu"
android:gravity="center">
<LinearLayout
android:layout_width="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_marginStart="1dp">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="34dp"
android:layout_height="34dp"
android:padding="7dp"
android:src="@mipmap/beauty_jingbai"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_border_color="@color/white"
app:riv_border_width="1dp"
app:riv_oval="true" />
<ImageView
android:layout_width="34dp"
android:layout_height="30dp"
android:background="@mipmap/icon_fans_danmu_avatar"
android:scaleType="centerInside"
app:layout_constraintBottom_toBottomOf="@+id/avatar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="@color/color_white"
android:textSize="12sp"
android:visibility="visible"
tools:text="用戶昵稱：" />
<TextView
android:id="@+id/content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="13sp"
android:visibility="visible"
tools:text="彈幕~" />
</LinearLayout>
</LinearLayout>

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="350dp"
android:layout_height="370dp"
android:layout_height="wrap_content"
android:background="@mipmap/viptip_box"
android:orientation="vertical">
@@ -37,6 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="22dp"
android:layout_marginBottom="15dp"
android:layout_marginEnd="16dp"
android:gravity="center_horizontal">
@@ -60,9 +61,9 @@
android:layout_marginStart="20dp"
android:background="@drawable/bg_btn_common"
android:enabled="true"
android:paddingStart="48dp"
android:paddingStart="30dp"
android:paddingTop="15dp"
android:paddingEnd="48dp"
android:paddingEnd="30dp"
android:paddingBottom="15dp"
android:text="@string/go_nobility"
android:textColor="@color/white"

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

@@ -223,6 +223,15 @@
android:layout_marginStart="3dp"
android:layout_marginBottom="-350dp"
android:visibility="gone" />
<include
android:id="@+id/fans_enter_room_leave"
layout="@layout/view_fans_group_enter_room_leave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/chat_recyclerView"
android:layout_marginStart="3dp"
android:layout_marginBottom="-350dp"
android:visibility="gone" />
</RelativeLayout>
<FrameLayout