From ff0a1556f39116a305b5f76baee20ed12c73e4be Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Wed, 22 Jul 2020 02:04:03 +0800
Subject: [PATCH] bugfix

---
 .../erban/avroom/dialog/RoomOperationDialog.java |  2 +-
 .../avroom/fragment/HomePartyRoomFragment.java   |  4 +++-
 .../avroom/presenter/HomePartyPresenter.java     | 16 ++++++++--------
 .../com/yizhuan/erban/base/BaseMvpActivity.java  |  4 ++--
 .../manager/AvRoomDataManager.java               | 15 ++++++++++++++-
 .../xchat_android_core/room/bean/RoomInfo.java   |  6 ++++++
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
index 179bdc004..6a640cfed 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
@@ -107,7 +107,7 @@ public class RoomOperationDialog extends BottomSheetDialog {
             return;
         }
 
-            boolean getIsShowRedPackage = AvRoomDataManager.get().serverRedEnvelopeSwitch;
+            boolean getIsShowRedPackage = AvRoomDataManager.get().isCloseRedPackage();
             String text = getIsShowRedPackage ?
                     context.getResources().getString(R.string.close_redpackage_notice) :
                     context.getResources().getString(R.string.open_redpackage_notice);
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 87003edc3..a0a6564f8 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
@@ -409,7 +409,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
         //audioQulity = AvRoomDataManager.get().mCurrentRoomInfo.getAudioQuality();
         gameBinding.setRoomInfo(AvRoomDataManager.get().mCurrentRoomInfo);
         isCloseScreen = AvRoomDataManager.get().isCloseScreen();
-        isRedPackage = AvRoomDataManager.get().serverRedEnvelopeSwitch;
+        isRedPackage = AvRoomDataManager.get().isCloseRedPackage();
         isRoomPureMode = AvRoomDataManager.get().isOpenPureMode();
         showGiftValue = AvRoomDataManager.get().isShowGiftValue();
         openOrCloseGiftValue(true);
@@ -928,6 +928,8 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
         getMvpPresenter().updateScreen(isCloseScreen);
     }
 
+
+
     /**
      * 嗨聊房切换清屏方法
      */
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java
index 93a097940..640cb37ef 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/HomePartyPresenter.java
@@ -682,15 +682,15 @@ public class HomePartyPresenter extends BaseMvpPresenter<IHomePartyView> {
 
     public void updateRedPackage(){
         RedPackageModel.INSTANCE.setRedPackageSwitch(AvRoomDataManager.get().getRoomUid()).subscribe(setIsNeedOpenRedPackage -> {
-            AvRoomDataManager.get().serverRedEnvelopeSwitch = setIsNeedOpenRedPackage;
+//            AvRoomDataManager.get().isCloseRedPackage() = setIsNeedOpenRedPackage;
 
-            RoomInfoAttachment attachment = new RoomInfoAttachment(CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO,
-                    CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE);
-            ChatRoomMessage screenMsg = ChatRoomMessageBuilder.createChatRoomCustomMessage(
-                    String.valueOf(AvRoomDataManager.get().getRoomId()),
-                    attachment
-            );
-            IMNetEaseManager.get().addRedPackageSwitch(screenMsg);
+//            RoomInfoAttachment attachment = new RoomInfoAttachment(CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO,
+//                    CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE);
+//            ChatRoomMessage screenMsg = ChatRoomMessageBuilder.createChatRoomCustomMessage(
+//                    String.valueOf(AvRoomDataManager.get().getRoomId()),
+//                    attachment
+//            );
+//            IMNetEaseManager.get().addRedPackageSwitch(screenMsg);
         });
 
 //        IMNetEaseManager.get().updateGiftEffect(AvRoomDataManager.get().getRoomUid())
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java
index a0f7ce4a8..c6994ef20 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java
@@ -971,8 +971,8 @@ public abstract class BaseMvpActivity<V extends IMvpBaseView, P extends Abstract
                         if (roomInfo != null && roomInfo.getUid() == notifyInfo.getRoomUid() && context instanceof AVRoomActivity) {//红包所在房间 是在房间
                             RedPackageOpenDialog.Companion.newInstance(notifyInfo).show(this);
                         } else {
-                            LogUtil.e("Red_Base:"+AvRoomDataManager.get().serverRedEnvelopeSwitch);
-                            if (roomInfo != null && roomInfo.getUid() != notifyInfo.getRoomUid() && AvRoomDataManager.get().serverRedEnvelopeSwitch && context instanceof AVRoomActivity){
+                            LogUtil.e("Red_Base:"+AvRoomDataManager.get().isCloseRedPackage());
+                            if (roomInfo != null && roomInfo.getUid() != notifyInfo.getRoomUid() && AvRoomDataManager.get().isCloseRedPackage() && context instanceof AVRoomActivity){
                                 RedPackageGoRoomDialog.Companion.newInstance(notifyInfo).show(this);
                             }else if (roomInfo == null){
                                 RedPackageGoRoomDialog.Companion.newInstance(notifyInfo).show(this);
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
index cc276ead0..e0460a06a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
@@ -64,7 +64,7 @@ public final class AvRoomDataManager {
     /**
      * 是否需要打开全服红包
      */
-    public boolean serverRedEnvelopeSwitch;
+//    public boolean serverRedEnvelopeSwitch;
     /**
      * 房间创建者
      */
@@ -769,6 +769,19 @@ public final class AvRoomDataManager {
         return roomInfo.isCloseScreen();
     }
 
+    /**
+     * ture为关闭公屏
+     *
+     * @return -
+     */
+    public boolean isCloseRedPackage() {
+        RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
+        if (roomInfo == null) {
+            return true;
+        }
+        return roomInfo.isServerRedEnvelopeSwitch();
+    }
+
 
     /**
      * 是否为ktv模式
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 dbbe45b0d..e6b6676b0 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
@@ -67,6 +67,11 @@ public class RoomInfo implements Parcelable,Serializable {
 
     public String roomPwd;
 
+    /**
+     * 是否需要打开全服红包
+     */
+    private boolean serverRedEnvelopeSwitch;
+
     /** 主题类型名称 */
     private String roomTag;
     /** 主题类型id */
@@ -187,6 +192,7 @@ public class RoomInfo implements Parcelable,Serializable {
                 ", isOpenGame=" + isOpenGame +
                 ", roomGame=" + roomGame +
                 ", boxSwitchVo=" + boxSwitchVo +
+                ", serverRedEnvelopeSwitch=" + serverRedEnvelopeSwitch +
                 ", singingMusicName='" + singingMusicName + '\'' +
                 ", limitType='" + limitType + '\'' +
                 ", roomModeType=" + roomModeType +