From 10a5cf3cf00170abd7c6e0f44b476eab504691a5 Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Fri, 31 Jul 2020 18:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E5=8F=91=E8=A8=80bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/fragment/HomePartyRoomFragment.java | 12 ++++++++++--
 .../erban/avroom/presenter/AvRoomPresenter.java      |  1 +
 .../xchat_android_core/room/bean/RoomInfo.java       |  3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
index af86e9f47..a01ca8fb6 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
@@ -945,12 +945,20 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
         gameBinding.rvSpeedyMessage.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
         adapter.setNewData(phrases);
         adapter.setOnItemClickListener((adapter1, view, position) -> {
-            if (CurrentTimeUtils.getCurrentTime() - lastSendTime > 30000) {
+            if (CurrentTimeUtils.getCurrentTime() - lastSendTime > 10000) {
                 sendMsg(phrases.get(position));
                 lastSendTime = CurrentTimeUtils.getCurrentTime();
                 StatisticManager.Instance().onEvent("room_quickchat", "语音房_快捷发言");
             } else {
-                SingleToastUtil.showToast("你发送的太频繁啦，66星球忙不过来~");
+                RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
+                if (roomInfo == null) {
+                    return;
+                }
+                if (roomInfo.isCloseScreen()) {
+                    toast("房间公屏已关闭");
+                    return;
+                }
+                SingleToastUtil.showToast("你发送的太频繁啦，请稍后再试");
             }
 
         });
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
index 811247c5a..47bd2717d 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java
@@ -136,6 +136,7 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
         //我们自己服务端信息
         AvRoomDataManager.get().mCurrentRoomInfo = roomInfo;
         AvRoomDataManager.get().mBoxSwitchVo = roomInfo.boxSwitchVo;
+        AvRoomDataManager.get().phrases = roomInfo.getSpeakTemplate();
         // 第一次进房，离开模式下更新本地房主位ui
         AvRoomDataManager.get().nick = roomInfo.getNick();
         AvRoomDataManager.get().gender = roomInfo.getGender();
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
index cd131437d..0255aa939 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
@@ -202,6 +202,7 @@ public class RoomInfo implements Parcelable,Serializable {
                 ", roomModeType=" + roomModeType +
                 ", isPermitRoom=" + isPermitRoom +
                 ", showGiftValue=" + showGiftValue +
+
                 '}';
     }
 
@@ -242,6 +243,7 @@ public class RoomInfo implements Parcelable,Serializable {
         gender = in.readInt();
         hideFlag = in.readInt();
         closeScreenFlag = in.readInt();
+        speakTemplate = in.createStringArrayList();
         boxSwitchVo = in.readParcelable(BoxSwitchVo.class.getClassLoader());
     }
 
@@ -278,6 +280,7 @@ public class RoomInfo implements Parcelable,Serializable {
         dest.writeByte((byte) (serverRedEnvelopeSwitch ? 1 : 0));
         dest.writeInt(gender);
         dest.writeString(nick);
+        dest.writeStringList(speakTemplate);
         dest.writeInt(hideFlag);
         dest.writeInt(closeScreenFlag);
         dest.writeParcelable(boxSwitchVo, flags);