From f09a8dccb01deda4eb8966cf19e6054aae7cad59 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Tue, 19 Apr 2022 15:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=92=ADPK:=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E4=B8=BB=E6=92=AD=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/singleroompk/SingleRoomPKBoardView.kt |  2 +-
 .../avroom/singleroompk/SingleRoomPKSearchAdapter.kt   |  2 +-
 .../avroom/singleroompk/SingleRoomPkFinishDialog.kt    |  2 +-
 .../singleroompk/SingleRoomPkForceFinishDialog.kt      |  4 ++--
 .../yizhuan/erban/avroom/widget/RoomEffectView.java    |  4 ++--
 .../res/layout/fragment_single_room.xml                |  2 +-
 .../xchat_android_core/im/custom/bean/RoomPkBean.java  | 10 ++++++++++
 .../room/anotherroompk/SimpleRoomInfo.kt               |  1 +
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt
index 35df1438c..2206f8ce8 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt
@@ -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
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
index 83591d08d..cda5491c6 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
@@ -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)
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
index a29ca8bc6..03cd89e83 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
@@ -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)
 
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt
index 893bf4045..132afb71d 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt
@@ -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(
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.java
index 907e93989..3dd5901a5 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.java
@@ -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));
diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/module_mini_world/res/layout/fragment_single_room.xml
index 1433bedc3..836fc1c45 100644
--- a/app/src/module_mini_world/res/layout/fragment_single_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_single_room.xml
@@ -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
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java
index 0c12124f5..e2c9df7a1 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java
@@ -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 {
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt b/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt
index 74ef6a357..22ede2a50 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt
@@ -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,