yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

个播PK规则弹窗整合

Browse Source
This commit is contained in:
huangjian
2022-12-23 15:10:15 +08:00
parent ebfae32e84
commit 449ec6b88c
7 changed files with 94 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt
View File

@@ -41,9 +41,6 @@ class SingleRoomPKCreateActivity : BaseViewBindingActivity<ActivitySingleRoomPkC
WindowManager.LayoutParams.WRAP_CONTENT,
)
window.setGravity(Gravity.BOTTOM)
binding.ivHelp.setOnClickListener {
SingleRoomPkRuleDialog.newInstance().show(this)
}
binding.ivAddPkRoom.setOnClickListener {
SingleRoomPKSearchActivity.start(this)

6
app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkRuleDialog.kt
View File

@@ -1,10 +1,9 @@
package com.mango.moshen.avroom.singleroompk
import android.text.method.ScrollingMovementMethod
import com.mango.moshen.base.BaseDialog
import com.mango.moshen.databinding.DialogSingleRoomPkRuleBinding
import com.mango.core.room.anotherroompk.SingleRoomPKModel
import com.mango.core.utils.toast
import com.mango.moshen.base.BaseDialog
import com.mango.moshen.databinding.DialogSingleRoomPkRuleBinding
class SingleRoomPkRuleDialog : BaseDialog<DialogSingleRoomPkRuleBinding>() {
@@ -18,7 +17,6 @@ class SingleRoomPkRuleDialog : BaseDialog<DialogSingleRoomPkRuleBinding>() {
override fun init() {
binding.ivClose.setOnClickListener { dismissAllowingStateLoss() }
binding.tvContent.movementMethod = ScrollingMovementMethod.getInstance()
SingleRoomPKModel.getSingleRoomPkRule()
.compose(bindToLifecycle())
.doOnSuccess {

2
app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkSelectTypeDialog.kt
View File

@@ -27,7 +27,7 @@ class SingleRoomPkSelectTypeDialog : BaseDialog<DialogSingleRoomSelectTypeBindin
@SuppressLint("CheckResult")
override fun init() {
binding.ivHelp.setOnClickListener {
SingleRoomPkTypeRuleDialog.newInstance().show(requireContext())
SingleRoomPkRuleDialog.newInstance().show(requireContext())
}
binding.ivInvite.setOnClickListener {
SingleRoomPKCreateActivity.start(requireContext())

19
app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPkTypeRuleDialog.kt
View File

@@ -1,19 +0,0 @@
package com.mango.moshen.avroom.singleroompk
import com.mango.moshen.base.BaseDialog
import com.mango.moshen.databinding.DialogSingleRoomPkTypeRuleBinding
class SingleRoomPkTypeRuleDialog : BaseDialog<DialogSingleRoomPkTypeRuleBinding>() {
companion object {
@JvmStatic
fun newInstance(): SingleRoomPkTypeRuleDialog {
return SingleRoomPkTypeRuleDialog()
}
}
override fun init() {
binding.ivClose.setOnClickListener { dismissAllowingStateLoss() }
}
}

10
app/src/main/res/layout/activity_single_room_pk_create.xml
View File

@@ -25,16 +25,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_help"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="12dp"
android:src="@drawable/ic_room_pk_help"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_pk_object"
android:layout_width="wrap_content"

97
app/src/main/res/layout/dialog_single_room_pk_rule.xml
View File

@@ -25,8 +25,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_content"
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
@@ -34,13 +33,99 @@
android:layout_marginEnd="15dp"
android:layout_marginBottom="23dp"
android:scrollbars="vertical"
android:textColor="@color/color_333333"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/room_pk_rule" />
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/color_333333"
android:textSize="14dp"
tools:text="@string/room_pk_rule" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<View
android:layout_width="88dp"
android:layout_height="8dp"
android:background="@drawable/shape_single_room_pk_rule"
app:layout_constraintBottom_toBottomOf="@id/tv_random_pk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_random_pk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:text="随机PK"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_random_pk_rule"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:text="参与匹配，随机与一名主播房主播PK，匹配成功后开启PK。PK时长固定"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_random_pk" />
<View
android:layout_width="88dp"
android:layout_height="8dp"
android:background="@drawable/shape_single_room_pk_rule"
app:layout_constraintBottom_toBottomOf="@id/tv_invite_pk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_invite_pk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="邀请PK"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_random_pk_rule" />
<TextView
android:id="@+id/tv_invite_pk_rule"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:text="指定一个主播房主播，邀请其进行PK，对方接受后开启PK"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_invite_pk" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</ScrollView>
<ImageView
android:id="@+id/iv_close"

108
app/src/main/res/layout/dialog_single_room_pk_type_rule.xml
View File

@@ -1,108 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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:layout_gravity="center">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="300dp"
android:layout_height="324dp"
android:layout_gravity="center"
android:background="@drawable/bg_single_room_pk_rule_dialog"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="82dp"
android:text="PK规则"
android:textColor="@color/white"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="88dp"
android:layout_height="8dp"
android:background="@drawable/shape_single_room_pk_rule"
app:layout_constraintBottom_toBottomOf="@id/tv_random_pk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_random_pk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:text="随机PK"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" />
<TextView
android:id="@+id/tv_random_pk_rule"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="9dp"
android:layout_marginEnd="15dp"
android:text="参与匹配，随机与一名主播房主播PK，匹配成功后开启PK。PK时长固定"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_random_pk" />
<View
android:layout_width="88dp"
android:layout_height="8dp"
android:background="@drawable/shape_single_room_pk_rule"
app:layout_constraintBottom_toBottomOf="@id/tv_invite_pk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_invite_pk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="邀请PK"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_random_pk_rule" />
<TextView
android:id="@+id/tv_invite_pk_rule"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="9dp"
android:layout_marginEnd="15dp"
android:text="指定一个主播房主播，邀请其进行PK，对方接受后开启PK"
android:textColor="@color/color_333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_invite_pk" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="14dp"
android:src="@drawable/ic_room_pk_force_finish_close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>