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-04-19 15:12:25 +08:00
parent c85d74d795
commit f09a8dccb0
8 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt
View File

@@ -74,7 +74,7 @@ class SingleRoomPKBoardView @JvmOverloads constructor(
binding.viewRankListContributeRight.updateData(roomPkBean?.asRank)
binding.ivBlueAvatar.load(roomPkBean?.aAvatar)
binding.tvBlueNickname.text = roomPkBean?.aTitle.subAndReplaceDot(7)
binding.tvBlueNickname.text = roomPkBean?.aNick.subAndReplaceDot(7)
binding.pbScore.progress = ((roomPkBean?.cPercent ?: 0.5f) * 100).toInt()
val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams

2
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
View File

@@ -14,7 +14,7 @@ class SingleRoomPKSearchAdapter :
BaseQuickAdapter<SimpleRoomInfo, BaseViewHolder>(R.layout.item_single_room_pk_search) {
override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
helper.setText(R.id.tv_room_title, item.title.subAndReplaceDot(7))
helper.setText(R.id.tv_room_title, item.nick.subAndReplaceDot(7))
.setText(R.id.tv_room_id, "大鹅号:${item.erbanNo}")
ImageLoadUtils.loadImage(mContext, item.avatar, helper.getView(R.id.iv_avatar))
helper.addOnClickListener(R.id.iv_avatar, R.id.tv_select)

2
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
View File

@@ -34,7 +34,7 @@ class SingleRoomPkFinishDialog : BaseDialog<DialogSingleRoomPkFinishBinding>() {
@SuppressLint("CheckResult", "SetTextI18n")
override fun init() {
binding.tvClose.setOnClickListener { dismissAllowingStateLoss() }
binding.tvTitleRed.text = roomPkBean.cTitle.subAndReplaceDot(7)
binding.tvTitleRed.text = roomPkBean.cNick.subAndReplaceDot(7)
binding.tvValueRed.text = "${roomPkBean.cAmount}"
binding.ivAvatarRed.load(roomPkBean.cAvatar, defaultRes = R.drawable.default_avatar)

4
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt
View File

@@ -30,7 +30,7 @@ class SingleRoomPkForceFinishDialog : BaseDialog<DialogSingleRoomPkForceFinishBi
@SuppressLint("CheckResult", "SetTextI18n")
override fun init() {
binding.ivClose.setOnClickListener { dismissAllowingStateLoss() }
binding.tvTitleRed.text = roomPkBean.cTitle.subAndReplaceDot(7)
binding.tvTitleRed.text = roomPkBean.cNick.subAndReplaceDot(7)
binding.tvValueRed.text = "${roomPkBean.cAmount}"
ImageLoadUtils.loadImage(
context,
@@ -39,7 +39,7 @@ class SingleRoomPkForceFinishDialog : BaseDialog<DialogSingleRoomPkForceFinishBi
R.drawable.default_avatar
)
binding.tvTitleBlue.text = roomPkBean.aTitle.subAndReplaceDot(7)
binding.tvTitleBlue.text = roomPkBean.aNick.subAndReplaceDot(7)
binding.tvValueBlue.text = "${roomPkBean.aAmount}"
ImageLoadUtils.loadImage(

4
app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.java
View File

@@ -862,8 +862,8 @@ public class RoomEffectView extends FrameLayout {
private void showSingleRoomPKNotify(ChatRoomMessage chatRoomMessage) {
RoomPkBean roomPkBean = ((RoomPKAttachment) chatRoomMessage.getAttachment()).getRoomPkBean();
View rootView = LayoutInflater.from(mContext).inflate(R.layout.layout_single_room_pk_notify, null);
((TextView) rootView.findViewById(R.id.tv_title_left)).setText(StringExtensionKt.subAndReplaceDot(roomPkBean.getWinTitle(), 7));
((TextView) rootView.findViewById(R.id.tv_title_right)).setText(StringExtensionKt.subAndReplaceDot(roomPkBean.getFailTitle(), 7));
((TextView) rootView.findViewById(R.id.tv_title_left)).setText(StringExtensionKt.subAndReplaceDot(roomPkBean.getWinNick(), 7));
((TextView) rootView.findViewById(R.id.tv_title_right)).setText(StringExtensionKt.subAndReplaceDot(roomPkBean.getFailNick(), 7));
((TextView) rootView.findViewById(R.id.tv_win_text)).setText(roomPkBean.getMsg());
ImageLoadUtils.loadImage(getContext(), roomPkBean.getWinAvatar(), rootView.findViewById(R.id.iv_avatar_left));
ImageLoadUtils.loadImage(getContext(), roomPkBean.getFailAvatar(), rootView.findViewById(R.id.iv_avatar_right));

2
app/src/module_mini_world/res/layout/fragment_single_room.xml
View File

@@ -234,7 +234,7 @@
app:layout_constraintBottom_toTopOf="@id/fl_speedy_message"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/micro_view" />
app:layout_constraintTop_toBottomOf="@id/barrier_micro" />
<com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView

10
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java
View File

@@ -15,6 +15,10 @@ public class RoomPkBean implements Serializable {
* 邀请房间标题
**/
private String inviteRoomTitle;
/**
* 邀请人昵称
**/
private String inviteNick;
/**
* 邀请房间uid
**/
@@ -57,6 +61,8 @@ public class RoomPkBean implements Serializable {
private String cAvatar;
//当前方房间名称
private String cTitle;
//当前方房主昵称
private String cNick;
//当前方流水
private long cAmount;
//比例:0-100，当前方进度条比率
@@ -74,6 +80,8 @@ public class RoomPkBean implements Serializable {
private String aAvatar;
//另一方房间名称
private String aTitle;
//另一方房主昵称
private String aNick;
//另一方流水
private long aAmount;
//比例:0-100，另一方进度条比率
@@ -99,6 +107,8 @@ public class RoomPkBean implements Serializable {
private String failUid;
private String failTitle;
private String winTitle;
private String winNick;
private String failNick;
@Data
public static class RankBean implements Serializable {

1
core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt
View File

@@ -4,6 +4,7 @@ import java.io.Serializable
data class SimpleRoomInfo(
val title: String? = null,
val nick: String? = null,
val roomUid: Long = 0L,
val erbanNo: Long = 0L,
val avatar: String? = null,