个播PK过程UI实现,数据对接
This commit is contained in:
BIN
app/src/main/assets/svga/single_room_pk_pb_indicator.svga
Normal file
BIN
app/src/main/assets/svga/single_room_pk_pb_indicator.svga
Normal file
Binary file not shown.
BIN
app/src/main/assets/svga/single_room_pk_vs.svga
Normal file
BIN
app/src/main/assets/svga/single_room_pk_vs.svga
Normal file
Binary file not shown.
@@ -4,14 +4,26 @@ import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.ImageView
|
||||
import android.widget.TextView
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.yizhuan.erban.R
|
||||
import com.yizhuan.erban.common.widget.CircleImageView
|
||||
import com.yizhuan.erban.ui.utils.ImageLoadUtils
|
||||
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
|
||||
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
|
||||
import com.yizhuan.xchat_android_library.utils.config.BasicConfig
|
||||
|
||||
|
||||
class SingleRoomPKMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context) {
|
||||
|
||||
private var isAttention: Boolean = false
|
||||
|
||||
fun setAttention(isAttention: Boolean) {
|
||||
this.isAttention = isAttention
|
||||
}
|
||||
|
||||
/**
|
||||
* Set LayoutManager and bind this to RecyclerView
|
||||
*/
|
||||
@@ -35,8 +47,47 @@ class SingleRoomPKMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(con
|
||||
inner class SingleAnchorBossMicroViewHolder internal constructor(itemView: View) :
|
||||
NormalMicroViewHolder(itemView) {
|
||||
|
||||
private val tvLabelLeaveMode: TextView = itemView.findViewById(R.id.tv_label_leave_mode)
|
||||
private val ivLeaveMode: CircleImageView = itemView.findViewById(R.id.iv_bg_leave_mode)
|
||||
private val ivAttention: ImageView = itemView.findViewById(R.id.iv_attention)
|
||||
|
||||
public override fun bind(info: RoomQueueInfo, position: Int) {
|
||||
super.bind(info, position)
|
||||
|
||||
// 新版房主位优先判断麦序是否有人,麦序没人再判断是否是离开模式(防止新版展示离开模式,实际麦位有人)
|
||||
val chatRoomMember = info.mChatRoomMember
|
||||
val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
|
||||
if (chatRoomMember == null) {
|
||||
if (roomInfo?.isLeaveMode == true || AvRoomDataManager.get().isSingleRoom) {
|
||||
tvLabelLeaveMode.visibility = View.VISIBLE
|
||||
ivLeaveMode.visibility = View.VISIBLE
|
||||
ImageLoadUtils.loadDefaultImage(
|
||||
BasicConfig.INSTANCE.appContext,
|
||||
ivLeaveMode,
|
||||
R.drawable.bg_leave_mode
|
||||
)
|
||||
ivAvatar.visibility = View.VISIBLE
|
||||
ivLockImage.visibility = View.INVISIBLE
|
||||
ivUpImage.visibility = View.INVISIBLE
|
||||
val avRoomDataManager = AvRoomDataManager.get()
|
||||
ImageLoadUtils.loadAvatar(
|
||||
BasicConfig.INSTANCE.appContext,
|
||||
avRoomDataManager.avatar,
|
||||
ivAvatar
|
||||
)
|
||||
setSelectText(-1, avRoomDataManager.nick, avRoomDataManager.gender)
|
||||
} else {
|
||||
ivLeaveMode.visibility = View.GONE
|
||||
tvLabelLeaveMode.visibility = View.GONE
|
||||
}
|
||||
} else {
|
||||
ivLeaveMode.visibility = View.GONE
|
||||
tvLabelLeaveMode.visibility = View.GONE
|
||||
}
|
||||
ivAttention.setImageResource(if (isAttention) R.drawable.single_room_pk_bg_attentioned else R.drawable.single_room_pk_bg_attention)
|
||||
ivAttention.setOnClickListener {
|
||||
//EventBus.getDefault().post()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -277,6 +277,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -13,6 +13,9 @@ import com.yizhuan.erban.avroom.adapter.SingleRoomPKMicroViewAdapter
|
||||
import com.yizhuan.erban.avroom.dialog.RequestUpMicDialog
|
||||
import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog
|
||||
import com.yizhuan.erban.avroom.presenter.SingleRoomPresenter
|
||||
import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkFinishDialog
|
||||
import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkForceFinishDialog
|
||||
import com.yizhuan.erban.avroom.singleroompk.SingleRoomPkReceivedDialog
|
||||
import com.yizhuan.erban.avroom.view.ISingleRoomView
|
||||
import com.yizhuan.erban.databinding.FragmentSingleRoomBinding
|
||||
import com.yizhuan.erban.fansteam.FansTeamJoinActivity
|
||||
@@ -29,6 +32,7 @@ import com.yizhuan.xchat_android_core.fansteam.FansTeamInitInfo
|
||||
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
|
||||
import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment
|
||||
import com.yizhuan.xchat_android_core.im.custom.bean.RequestUpmicAttachment
|
||||
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment
|
||||
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
|
||||
import com.yizhuan.xchat_android_core.manager.RoomEvent
|
||||
import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent
|
||||
@@ -79,7 +83,6 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
override fun initiate() {
|
||||
gameBinding.microView.bindAdapter(SingleRoomPKMicroViewAdapter(context))
|
||||
super.initiate()
|
||||
mvpPresenter?.getBannerList()
|
||||
initSpeedyMessage(gameBinding.flSpeedyMessage)
|
||||
@@ -204,6 +207,19 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
|
||||
)
|
||||
}
|
||||
}
|
||||
RoomEvent.ROOM_PK_INVITE ->
|
||||
SingleRoomPkReceivedDialog.newInstance((roomEvent.chatRoomMessage.attachment as RoomPKAttachment).roomPkBean)
|
||||
.show(mContext)
|
||||
RoomEvent.ROOM_PK_FINISH -> {
|
||||
val roomPkBean =
|
||||
(roomEvent.chatRoomMessage.attachment as RoomPKAttachment).roomPkBean
|
||||
if (roomPkBean.isForce) {
|
||||
SingleRoomPkForceFinishDialog.newInstance(roomPkBean).show(mContext);
|
||||
} else {
|
||||
SingleRoomPkFinishDialog.newInstance(roomPkBean).show(mContext);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,7 +267,15 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
|
||||
override fun updateView() {
|
||||
super.updateView()
|
||||
showSingleRoomGiftValue()
|
||||
gameBinding.microView.adapter?.notifyDataSetChanged()
|
||||
if (AvRoomDataManager.get().isOpenAnotherPKMode && gameBinding.microView.adapter !is SingleRoomPKMicroViewAdapter) {
|
||||
gameBinding.microView.bindAdapter(SingleRoomPKMicroViewAdapter(context))
|
||||
gameBinding.viewPkBoard.isVisible = true
|
||||
} else if (!AvRoomDataManager.get().isOpenAnotherPKMode && gameBinding.microView.adapter !is SingleAnchorMicroViewAdapter) {
|
||||
gameBinding.microView.bindAdapter(SingleAnchorMicroViewAdapter(context))
|
||||
gameBinding.viewPkBoard.isVisible = false
|
||||
} else {
|
||||
gameBinding.microView.adapter?.notifyDataSetChanged()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onShowBanner(dialogInfos: List<BannerInfo>) {
|
||||
|
@@ -16,11 +16,14 @@ import androidx.lifecycle.Observer
|
||||
import com.netease.nim.uikit.common.util.sys.ScreenUtil
|
||||
import com.netease.nim.uikit.common.util.sys.TimeUtil
|
||||
import com.yizhuan.erban.R
|
||||
import com.yizhuan.erban.avroom.adapter.SingleRoomPKMicroViewAdapter
|
||||
import com.yizhuan.erban.avroom.activity.AVRoomActivity
|
||||
import com.yizhuan.erban.databinding.LayoutSingleRoomPkBoardViewBinding
|
||||
import com.yizhuan.erban.ui.user.UserInfoActivity
|
||||
import com.yizhuan.erban.ui.utils.load
|
||||
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
|
||||
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
|
||||
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
|
||||
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.disposables.Disposable
|
||||
@@ -39,27 +42,19 @@ class SingleRoomPKBoardView @JvmOverloads constructor(
|
||||
init {
|
||||
addView(binding.root, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
|
||||
AvRoomDataManager.get().roomPkLiveData.observeForever(observer)
|
||||
binding.viewRankListContributeRight.showCharmStyle()
|
||||
|
||||
/* binding.ivHelp.setOnClickListener { showHelpPopup() }
|
||||
|
||||
binding.ivAvatarLeft.setOnClickListener {
|
||||
roomPkBean?.let {
|
||||
RxBus.get().post(ShowUserInfoDialogEvent(it.cUid.toString()))
|
||||
}
|
||||
}
|
||||
|
||||
binding.ivAvatarRight.setOnClickListener {
|
||||
roomPkBean?.let {
|
||||
RxBus.get().post(ShowUserInfoDialogEvent(it.aUid.toString()))
|
||||
}
|
||||
}*/
|
||||
|
||||
/* binding.tvGoAnotherRoom.setOnClickListener {
|
||||
binding.ivFindHim.setOnClickListener {
|
||||
roomPkBean?.let {
|
||||
AVRoomActivity.start(context, it.aUid)
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
binding.ivBlueAvatar.setOnClickListener {
|
||||
roomPkBean?.let {
|
||||
UserInfoActivity.Companion.start(context, it.aUid)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -74,9 +69,11 @@ class SingleRoomPKBoardView @JvmOverloads constructor(
|
||||
this.roomPkBean = roomPkBean
|
||||
|
||||
binding.viewRankListContributeLeft.updateData(roomPkBean?.csRank)
|
||||
|
||||
binding.viewRankListContributeRight.updateData(roomPkBean?.asRank)
|
||||
|
||||
binding.ivBlueAvatar.load(roomPkBean?.aAvatar)
|
||||
binding.tvBlueNickname.text = roomPkBean?.aTitle.subAndReplaceDot(7)
|
||||
|
||||
binding.pbScore.progress = ((roomPkBean?.cPercent ?: 0.5f) * 100).toInt()
|
||||
val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams
|
||||
layoutParams.horizontalBias = roomPkBean?.cPercent ?: 0.5f
|
||||
@@ -88,13 +85,21 @@ class SingleRoomPKBoardView @JvmOverloads constructor(
|
||||
disposable = Observable.interval(1, TimeUnit.SECONDS)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe { _ ->
|
||||
binding.tvTime.text = roomPkBean?.endTime?.let {
|
||||
val remainTime = (it - CurrentTimeUtils.getCurrentTime()).toInt() / 1000
|
||||
binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#ff87a1" else "#fff600"))
|
||||
binding.tvTime.isVisible = remainTime > 0
|
||||
binding.tvEndHint.isVisible = remainTime <= 0
|
||||
TimeUtil.secToTime(remainTime)
|
||||
} ?: "00:00"
|
||||
if (roomPkBean?.pkState == 1) {
|
||||
binding.tvPk.text = "PK"
|
||||
binding.tvTime.text = roomPkBean.endTime.let {
|
||||
val remainTime = (it - CurrentTimeUtils.getCurrentTime()).toInt() / 1000
|
||||
binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#ff87a1" else "#fff600"))
|
||||
TimeUtil.secToTime(remainTime)
|
||||
} ?: "00:00"
|
||||
} else {
|
||||
binding.tvPk.text = "惩罚时间"
|
||||
binding.tvTime.text = roomPkBean?.penaltyEndTime?.let {
|
||||
val remainTime = (it - CurrentTimeUtils.getCurrentTime()).toInt() / 1000
|
||||
binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#ff87a1" else "#fff600"))
|
||||
TimeUtil.secToTime(remainTime)
|
||||
} ?: "00:00"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -5,6 +5,8 @@ import android.util.AttributeSet
|
||||
import android.view.LayoutInflater
|
||||
import android.widget.FrameLayout
|
||||
import androidx.core.view.isGone
|
||||
import androidx.core.view.isInvisible
|
||||
import androidx.core.view.isVisible
|
||||
import com.yizhuan.erban.R
|
||||
import com.yizhuan.erban.databinding.LayoutSingleRoomPkRankListViewBinding
|
||||
import com.yizhuan.erban.ui.utils.ImageLoadUtils
|
||||
@@ -20,7 +22,7 @@ class SingleRoomPKRankListView @JvmOverloads constructor(
|
||||
LayoutSingleRoomPkRankListViewBinding.inflate(LayoutInflater.from(context))
|
||||
private val tvValues = arrayOf(binding.tvValue1, binding.tvValue2, binding.tvValue3)
|
||||
private val ivAvatars = arrayOf(binding.ivAvatar1, binding.ivAvatar2, binding.ivAvatar3)
|
||||
private var defaultAvatarRes = R.drawable.bg_room_pk_rank_contribute_default
|
||||
private var defaultAvatarRes = R.drawable.single_room_pk_bg_red_mic
|
||||
|
||||
init {
|
||||
addView(binding.root)
|
||||
@@ -44,7 +46,10 @@ class SingleRoomPKRankListView @JvmOverloads constructor(
|
||||
for (i in tvValues.indices) {
|
||||
val rankBean = data?.getOrNull(i)
|
||||
tvValues[i].text = rankBean?.amount ?: "0"
|
||||
tvValues[i].isGone = "0" == tvValues[i].text
|
||||
tvValues[i].isInvisible = "0" == tvValues[i].text
|
||||
if (i == 0) {
|
||||
binding.viewMvp.isVisible = "0" != tvValues[i].text
|
||||
}
|
||||
ImageLoadUtils.loadImage(
|
||||
context,
|
||||
rankBean?.avatar,
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 9.5 KiB |
@@ -44,37 +44,43 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/up_image"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="90dp"
|
||||
android:layout_height="90dp"
|
||||
android:layout_marginStart="40dp"
|
||||
android:layout_marginTop="26dp"
|
||||
android:layout_marginEnd="40dp"
|
||||
android:src="@drawable/icon_room_up_micro_boss"
|
||||
app:layout_constraintBottom_toBottomOf="@id/avatar"
|
||||
app:layout_constraintEnd_toEndOf="@id/avatar"
|
||||
app:layout_constraintStart_toStartOf="@id/avatar"
|
||||
app:layout_constraintTop_toTopOf="@id/avatar"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/lock_image"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="90dp"
|
||||
android:layout_height="90dp"
|
||||
android:layout_marginStart="40dp"
|
||||
android:layout_marginTop="26dp"
|
||||
android:layout_marginEnd="40dp"
|
||||
android:src="@drawable/icon_room_lock_micro_boss"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintBottom_toBottomOf="@id/avatar"
|
||||
app:layout_constraintEnd_toEndOf="@id/avatar"
|
||||
app:layout_constraintStart_toStartOf="@id/avatar"
|
||||
app:layout_constraintTop_toTopOf="@id/avatar"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<com.yizhuan.erban.common.widget.CircleImageView
|
||||
android:id="@+id/iv_bg_leave_mode"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="90dp"
|
||||
android:layout_height="90dp"
|
||||
android:layout_marginStart="40dp"
|
||||
android:layout_marginTop="26dp"
|
||||
android:layout_marginEnd="40dp"
|
||||
android:src="@drawable/bg_leave_mode"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/avatar"
|
||||
app:layout_constraintEnd_toEndOf="@id/avatar"
|
||||
app:layout_constraintStart_toStartOf="@id/avatar"
|
||||
app:layout_constraintTop_toTopOf="@id/avatar" />
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_label_leave_mode"
|
||||
@@ -86,10 +92,10 @@
|
||||
android:textColor="#E6FFFFFF"
|
||||
android:textSize="16dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/avatar"
|
||||
app:layout_constraintEnd_toEndOf="@id/avatar"
|
||||
app:layout_constraintStart_toStartOf="@id/avatar"
|
||||
app:layout_constraintTop_toTopOf="@id/avatar" />
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/mute_image"
|
||||
|
@@ -15,15 +15,15 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageView
|
||||
<com.opensource.svgaplayer.SVGAImageView
|
||||
android:id="@+id/iv_vs"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="74dp"
|
||||
android:layout_marginTop="21dp"
|
||||
android:src="@drawable/single_room_pk_ic_vs"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:source="svga/single_room_pk_vs.svga" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/iv_rule"
|
||||
@@ -52,7 +52,7 @@
|
||||
app:loopCount="0"
|
||||
app:source="svga/single_headware.svga" />
|
||||
|
||||
<ImageView
|
||||
<com.yizhuan.erban.common.widget.CircleImageView
|
||||
android:id="@+id/iv_blue_avatar"
|
||||
android:layout_width="90dp"
|
||||
android:layout_height="90dp"
|
||||
@@ -116,6 +116,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="3dp"
|
||||
android:includeFontPadding="false"
|
||||
android:text="PK"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="14dp"
|
||||
@@ -137,21 +138,6 @@
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/tv_pk" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_end_hint"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:includeFontPadding="false"
|
||||
android:text="PK结果计算中..."
|
||||
android:textColor="#fffff600"
|
||||
android:textSize="11dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.72"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/pb_score"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
@@ -189,15 +175,17 @@
|
||||
|
||||
<com.opensource.svgaplayer.SVGAImageView
|
||||
android:id="@+id/svga_hot"
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="27dp"
|
||||
android:layout_marginBottom="18dp"
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="26dp"
|
||||
app:autoPlay="true"
|
||||
app:layout_constraintBottom_toBottomOf="@id/pb_score"
|
||||
app:layout_constraintEnd_toStartOf="@id/iv_blue_star"
|
||||
app:layout_constraintEnd_toEndOf="@id/iv_blue_star"
|
||||
app:layout_constraintHorizontal_bias="0"
|
||||
app:layout_constraintStart_toEndOf="@id/iv_red_star"
|
||||
app:source="svga/room_pk_pb_indicator.svga" />
|
||||
app:layout_constraintStart_toStartOf="@id/iv_red_star"
|
||||
android:layout_marginStart="13dp"
|
||||
android:layout_marginEnd="13dp"
|
||||
app:layout_constraintTop_toTopOf="@id/pb_score"
|
||||
app:source="svga/single_room_pk_pb_indicator.svga" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_score_left"
|
||||
|
@@ -20,7 +20,7 @@
|
||||
android:src="@drawable/single_room_pk_bg_red_mic" />
|
||||
|
||||
<View
|
||||
android:id="@+id/view_bg_1"
|
||||
android:id="@+id/view_mvp"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="11dp"
|
||||
android:layout_marginTop="13dp"
|
||||
@@ -54,14 +54,6 @@
|
||||
android:layout_marginBottom="2dp"
|
||||
android:src="@drawable/single_room_pk_bg_red_mic" />
|
||||
|
||||
<View
|
||||
android:id="@+id/view_bg_2"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="11dp"
|
||||
android:layout_marginTop="13dp"
|
||||
android:background="@drawable/single_room_pk_bg_mvp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_value_2"
|
||||
android:layout_width="24dp"
|
||||
@@ -89,13 +81,6 @@
|
||||
android:layout_marginBottom="2dp"
|
||||
android:src="@drawable/single_room_pk_bg_red_mic" />
|
||||
|
||||
<View
|
||||
android:id="@+id/view_bg_3"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="11dp"
|
||||
android:layout_marginTop="13dp"
|
||||
android:background="@drawable/single_room_pk_bg_mvp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_value_3"
|
||||
android:layout_width="24dp"
|
||||
|
@@ -12,22 +12,34 @@
|
||||
|
||||
</data>
|
||||
|
||||
<RelativeLayout
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<com.yizhuan.erban.avroom.widget.MicroView
|
||||
android:id="@+id/micro_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="140dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:background="@color/color_red" />
|
||||
|
||||
<com.yizhuan.erban.avroom.singleroompk.SingleRoomPKBoardView
|
||||
android:id="@+id/view_pk_board"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignTop="@id/micro_view" />
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/micro_view" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/barrier_micro"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="view_pk_board,micro_view" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/contribute_list"
|
||||
@@ -37,7 +49,9 @@
|
||||
android:background="@drawable/bg_contribute_entrance"
|
||||
android:gravity="center"
|
||||
android:onClick="@{click}"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
@@ -59,8 +73,9 @@
|
||||
android:id="@+id/fl_fans_team"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/contribute_list"
|
||||
android:layout_marginTop="4dp">
|
||||
android:layout_marginTop="4dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/contribute_list">
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/fl_fans_team_join_tip"
|
||||
@@ -112,9 +127,7 @@
|
||||
android:id="@+id/tv_single_room_gift_value"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="24dp"
|
||||
android:layout_alignTop="@id/contribute_list"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_toEndOf="@id/contribute_list"
|
||||
android:background="@drawable/shape_bg_of_mic_charm_single_anchor"
|
||||
android:drawableEnd="@drawable/icon_gift_value"
|
||||
android:drawablePadding="3dp"
|
||||
@@ -123,16 +136,20 @@
|
||||
android:paddingEnd="12dp"
|
||||
android:text="0"
|
||||
android:textColor="@color/white"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"
|
||||
app:layout_constraintStart_toEndOf="@id/contribute_list"
|
||||
app:layout_constraintTop_toTopOf="@id/contribute_list" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/fl_speedy_message"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="22dp"
|
||||
android:layout_above="@+id/bottom_view"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:layout_marginBottom="6dp">
|
||||
android:layout_marginBottom="6dp"
|
||||
app:layout_constraintBottom_toTopOf="@id/bottom_view"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rv_speedy_message"
|
||||
@@ -154,73 +171,85 @@
|
||||
|
||||
<com.yizhuan.erban.avroom.widget.BottomView
|
||||
android:id="@+id/bottom_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginBottom="10dp" />
|
||||
android:layout_marginBottom="10dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_first_charge_enter"
|
||||
android:layout_width="65dp"
|
||||
android:layout_height="65dp"
|
||||
android:layout_above="@id/iv_treasure_box"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:onClick="@{click}"
|
||||
android:src="@drawable/ic_first_charge_enter"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@id/iv_treasure_box"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
tools:contentDescription="首充红包" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_treasure_box"
|
||||
android:layout_width="65dp"
|
||||
android:layout_height="65dp"
|
||||
android:layout_above="@id/fl_speedy_message"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:onClick="@{click}"
|
||||
android:src="@drawable/icon_room_treasure_box"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
tools:contentDescription="许愿池" />
|
||||
|
||||
<com.yizhuan.erban.avroom.widget.MessageView
|
||||
android:id="@+id/message_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_above="@+id/fl_speedy_message"
|
||||
android:layout_below="@id/vip_broadcast_view"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_marginTop="@dimen/dp_8"
|
||||
android:layout_marginEnd="90dp"
|
||||
android:layout_marginBottom="@dimen/dp_10" />
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/vip_broadcast_view" />
|
||||
|
||||
<com.yizhuan.erban.vip.VipBroadcastView
|
||||
android:id="@+id/vip_broadcast_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/view_pk_board"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/barrier_micro" />
|
||||
|
||||
<com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
|
||||
android:id="@+id/activity_img"
|
||||
android:layout_width="65dp"
|
||||
android:layout_height="75dp"
|
||||
android:layout_below="@id/view_pk_board"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_below="@id/barrier_micro"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/barrier_micro"
|
||||
app:rollviewpager_hint_gravity="center" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/input_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:visibility="visible">
|
||||
|
||||
<LinearLayout
|
||||
@@ -259,10 +288,14 @@
|
||||
|
||||
<ViewStub
|
||||
android:id="@+id/vs_music_player"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="75dp"
|
||||
android:layout="@layout/avroom_music_player_layout" />
|
||||
android:layout="@layout/avroom_music_player_layout"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</RelativeLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</layout>
|
@@ -4,9 +4,9 @@ import java.io.Serializable
|
||||
|
||||
data class SimpleRoomInfo(
|
||||
val title: String? = null,
|
||||
val roomUid :Long = 0L,
|
||||
val erbanNo :Long = 0L,
|
||||
val avatar :String? = null,
|
||||
val crossPking:Boolean = false,
|
||||
var checked :Boolean = false
|
||||
val roomUid: Long = 0L,
|
||||
val erbanNo: Long = 0L,
|
||||
val avatar: String? = null,
|
||||
val crossPking: Boolean = false,
|
||||
var checked: Boolean = false
|
||||
) : Serializable
|
||||
|
Reference in New Issue
Block a user