moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:调整礼物飘窗弹窗-去围观位置

Browse Source
This commit is contained in:
Max
2023-10-31 17:25:22 +08:00
parent 1defcb0d28
commit 7ba43a51d4
3 changed files with 144 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
View File

@@ -16,7 +16,7 @@ import com.chuhai.utils.ktx.singleClick
import com.chuhai.utils.ktx.toStringRes import com.chuhai.utils.ktx.toStringRes
import com.yizhuan.erban.R import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.activity.AVRoomActivity import com.yizhuan.erban.avroom.activity.AVRoomActivity
import com.yizhuan.erban.databinding.DialogGiftAllServiceLevel2Binding import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelBinding
import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity
import com.yizhuan.xchat_android_core.initial.InitialModel import com.yizhuan.xchat_android_core.initial.InitialModel
import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit
class AllServiceGiftLevelDialog : BaseDialog { class AllServiceGiftLevelDialog : BaseDialog {
private var data: AllServiceGiftProtocol.DataBean? = null private var data: AllServiceGiftProtocol.DataBean? = null
private var binding: DialogGiftAllServiceLevel2Binding? = null private var binding: DialogGiftAllServiceLevelBinding? = null
private var disposable: Disposable? = null private var disposable: Disposable? = null
@@ -50,7 +50,7 @@ class AllServiceGiftLevelDialog : BaseDialog {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
requestWindowFeature(Window.FEATURE_NO_TITLE) requestWindowFeature(Window.FEATURE_NO_TITLE)
val inflate = val inflate =
LayoutInflater.from(context).inflate(R.layout.dialog_gift_all_service_level2, null) LayoutInflater.from(context).inflate(R.layout.dialog_gift_all_service_level, null)
setContentView(inflate.rootView) setContentView(inflate.rootView)
setCancelable(true) setCancelable(true)
setCanceledOnTouchOutside(true) setCanceledOnTouchOutside(true)
@@ -83,7 +83,7 @@ class AllServiceGiftLevelDialog : BaseDialog {
private fun init( private fun init(
data: AllServiceGiftProtocol.DataBean, data: AllServiceGiftProtocol.DataBean,
binding: DialogGiftAllServiceLevel2Binding binding: DialogGiftAllServiceLevelBinding
) { ) {
binding.ivAvatar.singleClick { binding.ivAvatar.singleClick {
goRoom(data) goRoom(data)

254
app/src/main/res/layout/dialog_gift_all_service_level.xml
View File

@@ -10,131 +10,157 @@
type="com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" /> type="com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
</data> </data>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="69dp" android:layout_height="wrap_content">
android:background="@drawable/all_service_gift_bg_1">
<ImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/iv_avatar_bg" android:layout_marginTop="80dp"
android:layout_width="88dp" android:id="@+id/layout_root"
android:layout_height="69dp" android:layout_width="match_parent"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar" android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="@id/iv_avatar" android:background="@drawable/all_service_gift_bg_1"
app:layout_constraintStart_toStartOf="@id/iv_avatar" app:layout_constraintDimensionRatio="h,375:69"
app:layout_constraintTop_toTopOf="@id/iv_avatar" app:layout_constraintTop_toTopOf="parent">
tools:background="@color/black" />
<com.yizhuan.erban.common.widget.CircleImageView <ImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar_bg"
avatarUrl="@{giftBean.sendUserAvatar}" android:layout_width="0dp"
android:layout_width="44dp" android:layout_height="match_parent"
android:layout_height="44dp" app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
android:layout_marginStart="22.5dp" app:layout_constraintDimensionRatio="w,89:69"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/iv_avatar"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="@id/iv_avatar"
tools:src="@drawable/default_avatar" /> tools:background="@color/black" />
<TextView <androidx.constraintlayout.widget.Guideline
android:id="@+id/tv_message" android:id="@+id/line_content_start"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="13dp" android:orientation="vertical"
android:layout_marginEnd="4.5dp" app:layout_constraintGuide_percent="0.0586" />
android:layout_marginBottom="5dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:includeFontPadding="false"
android:marqueeRepeatLimit="marquee_forever"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toTopOf="@id/tv_room_name"
app:layout_constraintEnd_toStartOf="@id/iv_gift"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="XXX 送给 XXX XXXX" />
<TextView <com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/tv_room_name" android:id="@+id/iv_avatar"
android:layout_width="0dp" avatarUrl="@{giftBean.sendUserAvatar}"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_marginStart="2.5dp" android:layout_height="0dp"
android:layout_marginEnd="4.5dp" app:layout_constraintBottom_toBottomOf="parent"
android:includeFontPadding="false" app:layout_constraintDimensionRatio="w,1:1"
android:singleLine="true" app:layout_constraintHeight_percent="0.6376"
android:text="@{giftBean.roomTitle}" app:layout_constraintStart_toStartOf="@id/line_content_start"
android:textColor="@color/white" app:layout_constraintTop_toTopOf="parent"
android:textSize="12dp" tools:src="@drawable/default_avatar" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_room_go"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/iv_room"
app:layout_constraintTop_toBottomOf="@id/tv_message"
app:layout_constraintWidth_default="wrap"
tools:text="XXXXXXXX" />
<TextView <TextView
android:id="@+id/tv_room_go" android:id="@+id/tv_message"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="19dp" android:layout_height="wrap_content"
android:layout_marginEnd="2dp" android:layout_marginStart="13dp"
android:background="@drawable/all_service_gift_bg_room_go1" android:layout_marginEnd="4.5dp"
android:gravity="center" android:ellipsize="marquee"
android:paddingHorizontal="7.5dp" android:focusable="true"
android:singleLine="true" android:focusableInTouchMode="true"
android:text="@string/all_service_gift_room_go" android:includeFontPadding="false"
android:textColor="@color/white" android:marqueeRepeatLimit="marquee_forever"
android:textSize="10dp" android:singleLine="true"
app:layout_constraintBottom_toBottomOf="@id/tv_room_name" android:textColor="@color/white"
app:layout_constraintEnd_toStartOf="@id/iv_gift" android:textSize="14dp"
app:layout_constraintStart_toEndOf="@id/tv_room_name" app:layout_constraintBottom_toTopOf="@id/tv_room_name"
app:layout_constraintTop_toTopOf="@id/tv_room_name" /> app:layout_constraintEnd_toStartOf="@id/iv_gift"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="XXX 送给 XXX XXXX" />
<TextView
android:id="@+id/tv_room_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="2.5dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="4.5dp"
android:includeFontPadding="false"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_room_go"
app:layout_constraintStart_toEndOf="@id/iv_room"
app:layout_constraintTop_toBottomOf="@id/tv_message"
tools:text="X1111111111111111111" />
<ImageView <TextView
android:id="@+id/iv_room" android:id="@+id/tv_room_go"
android:layout_width="12dp" android:layout_width="wrap_content"
android:layout_height="12dp" android:layout_height="19dp"
android:src="@drawable/all_service_gift_ic_room" android:layout_marginEnd="2dp"
app:layout_constraintBottom_toBottomOf="@id/tv_room_name" android:background="@drawable/all_service_gift_bg_room_go1"
app:layout_constraintStart_toStartOf="@id/tv_message" android:gravity="center"
app:layout_constraintTop_toTopOf="@id/tv_room_name" /> android:paddingHorizontal="7.5dp"
android:singleLine="true"
android:text="@string/all_service_gift_room_go"
android:textColor="@color/white"
android:textSize="10dp"
app:layout_constraintBottom_toBottomOf="@id/tv_room_name"
app:layout_constraintEnd_toStartOf="@id/iv_gift"
app:layout_constraintTop_toTopOf="@id/tv_room_name" />
<ImageView <ImageView
android:id="@+id/iv_gift" android:id="@+id/iv_room"
nomalUrl="@{giftBean.giftUrl}" android:layout_width="12dp"
android:layout_width="64dp" android:layout_height="12dp"
android:layout_height="64dp" android:src="@drawable/all_service_gift_ic_room"
android:layout_marginEnd="2dp" app:layout_constraintBottom_toBottomOf="@id/tv_room_name"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@id/tv_message"
app:layout_constraintEnd_toStartOf="@id/tv_count" app:layout_constraintTop_toTopOf="@id/tv_room_name" />
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="24dp"
tools:background="@color/black" />
<TextView <ImageView
android:id="@+id/tv_count" android:id="@+id/iv_gift"
android:layout_width="wrap_content" nomalUrl="@{giftBean.giftUrl}"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_marginEnd="24dp" android:layout_height="0dp"
android:ellipsize="end" android:layout_marginEnd="2dp"
android:fontFamily="sans-serif-medium" app:layout_constraintBottom_toBottomOf="parent"
android:maxWidth="120dp" app:layout_constraintDimensionRatio="w,1:1"
android:singleLine="true" app:layout_constraintEnd_toStartOf="@id/tv_count"
android:textColor="@color/color_FFE468" app:layout_constraintHeight_percent="0.9275"
android:textSize="16dp" app:layout_constraintTop_toTopOf="parent"
android:textStyle="italic|bold" tools:background="@color/black" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="X1000" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/line_content_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.9413" />
<TextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxWidth="180dp"
android:singleLine="true"
android:textColor="@color/color_FFE468"
android:textSize="16dp"
android:textStyle="italic|bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/line_content_end"
app:layout_constraintTop_toTopOf="parent"
tools:text="X10000" />
<androidx.constraintlayout.widget.Group
android:id="@+id/group_room"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="tv_room_name,tv_room_go,iv_room"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>

170
app/src/main/res/layout/dialog_gift_all_service_level2.xml
View File

@@ -1,170 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout 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">
<data>
<variable
name="giftBean"
type="com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol.DataBean" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_marginTop="80dp"
android:id="@+id/layout_root"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@drawable/all_service_gift_bg_1"
app:layout_constraintDimensionRatio="h,375:69"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_avatar_bg"
android:layout_width="0dp"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintDimensionRatio="w,89:69"
app:layout_constraintEnd_toEndOf="@id/iv_avatar"
app:layout_constraintStart_toStartOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="@id/iv_avatar"
tools:background="@color/black" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/line_content_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.0586" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar"
avatarUrl="@{giftBean.sendUserAvatar}"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="w,1:1"
app:layout_constraintHeight_percent="0.6376"
app:layout_constraintStart_toStartOf="@id/line_content_start"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/default_avatar" />
<TextView
android:id="@+id/tv_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="13dp"
android:layout_marginEnd="4.5dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:includeFontPadding="false"
android:marqueeRepeatLimit="marquee_forever"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toTopOf="@id/tv_room_name"
app:layout_constraintEnd_toStartOf="@id/iv_gift"
app:layout_constraintStart_toEndOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="XXX 送给 XXX XXXX" />
<TextView
android:id="@+id/tv_room_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="2.5dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="4.5dp"
android:includeFontPadding="false"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_room_go"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/iv_room"
app:layout_constraintTop_toBottomOf="@id/tv_message"
app:layout_constraintWidth_default="wrap"
tools:text="X11111111111111111" />
<TextView
android:id="@+id/tv_room_go"
android:layout_width="wrap_content"
android:layout_height="19dp"
android:layout_marginEnd="2dp"
android:background="@drawable/all_service_gift_bg_room_go1"
android:gravity="center"
android:paddingHorizontal="7.5dp"
android:singleLine="true"
android:text="@string/all_service_gift_room_go"
android:textColor="@color/white"
android:textSize="10dp"
app:layout_constraintBottom_toBottomOf="@id/tv_room_name"
app:layout_constraintEnd_toStartOf="@id/iv_gift"
app:layout_constraintStart_toEndOf="@id/tv_room_name"
app:layout_constraintTop_toTopOf="@id/tv_room_name" />
<ImageView
android:id="@+id/iv_room"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@drawable/all_service_gift_ic_room"
app:layout_constraintBottom_toBottomOf="@id/tv_room_name"
app:layout_constraintStart_toStartOf="@id/tv_message"
app:layout_constraintTop_toTopOf="@id/tv_room_name" />
<ImageView
android:id="@+id/iv_gift"
nomalUrl="@{giftBean.giftUrl}"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="2dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="w,1:1"
app:layout_constraintEnd_toStartOf="@id/tv_count"
app:layout_constraintHeight_percent="0.9275"
app:layout_constraintTop_toTopOf="parent"
tools:background="@color/black" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/line_content_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.9413" />
<TextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxWidth="180dp"
android:singleLine="true"
android:textColor="@color/color_FFE468"
android:textSize="16dp"
android:textStyle="italic|bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/line_content_end"
app:layout_constraintTop_toTopOf="parent"
tools:text="X10000" />
<androidx.constraintlayout.widget.Group
android:id="@+id/group_room"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="tv_room_name,tv_room_go,iv_room"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>