1:修改进入小黑屋添加了和外部的特效一个功能

2：给用户主页添加私信按钮，常显示
3：优化退出酒吧房小黑屋，

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -595,6 +595,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             )
         }
 
+        mBinding?.rlEffects?.setOnClickListener { view: View ->
+            this.onClick(
+                 view
+            )
+        }
+
         mBinding!!.inputMenu1.performClick()
 
         V2TIMManager.getConversationManager()
@@ -1056,7 +1062,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         MvpPre?.roomRedPackets(roomId)
 
 
-        if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.AUCTION){
+        if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.AUCTION) {
             var userId = 0
             mRoomInfoResp?.room_auction?.auction_list?.forEachIndexed { idx, auction ->
                 if (idx < 6) {
@@ -1660,10 +1666,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
     private fun goneAll() {
         if (mRoomInfoResp?.room_info?.label_id == "11") {
-            mBinding?.clDayTask?.visibility= View.GONE
+            mBinding?.clDayTask?.visibility = View.GONE
-            mBinding?.xlhRk?.visibility= View.GONE
+            mBinding?.xlhRk?.visibility = View.GONE
-        }else{
+        } else {
-            mBinding?.clDayTask?.visibility= View.VISIBLE
+            mBinding?.clDayTask?.visibility = View.VISIBLE
         }
 
     }
@@ -2866,6 +2872,20 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 mBinding?.ivPrivateSet?.tag = "1"
                 isShowPrivateMsg = false
             }
+        } else if (id == R.id.rl_effects) {
+            //关闭特效
+            if (SpUtil.getOpenEffect() == 1) {
+                mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_open_effects)
+                SpUtil.setOpenEffect(0)
+                QXGiftPlayerManager.getInstance(this).openOrCloseEffectViewWith(false)
+                mBinding!!.svgaGift.visibility = View.GONE
+            } else {
+                SpUtil.setOpenEffect(1)
+                mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_close_effects)
+                QXGiftPlayerManager.getInstance(this).openOrCloseEffectViewWith(true)
+                mBinding!!.svgaGift.visibility = View.VISIBLE
+            }
+
         }
     }
 
@@ -2953,14 +2973,14 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         var isSkip = false
         for (activity in ActivityUtils.getActivityList()) {
             if (activity !is RoomActivity && activity !is TransparentActivity) {
-                LogUtils.e("这是返回到上一页","这是要跳转的activity:"+activity::class.java.name)
+                LogUtils.e("这是返回到上一页", "这是要跳转的activity:" + activity::class.java.name)
                 singleTaskToActivity(activity::class.java)
                 isSkip = true
                 break
             }
         }
         if (!isSkip) {
-            LogUtils.e("这是返回到上一页","这是要跳转的activity:"+isSkip)
+            LogUtils.e("这是返回到上一页", "这是要跳转的activity:" + isSkip)
             singleTaskToActivity(MainActivity::class.java)
         }
     }
@@ -3050,6 +3070,14 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         mBinding!!.rlMai.visibility =
             if (voive) View.VISIBLE else View.VISIBLE
         mBinding?.rlPrivateMsg?.visibility = View.VISIBLE
+        mBinding?.rlEffects?.visibility = View.VISIBLE
+
+        if (SpUtil.getOpenEffect()==1){
+            mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_close_effects)
+        }else{
+            mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_open_effects)
+        }
+
         mRoomInfoResp?.user_info?.pit_number = 9527
     }
 
@@ -3074,6 +3102,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         mBinding!!.clFirstCharge.visibility =
             if (voive) View.VISIBLE else View.GONE
         mBinding?.rlPrivateMsg?.visibility = View.GONE
+        mBinding?.rlEffects?.visibility = View.GONE
     }
 
     /** 这里是当进入电影放房的时候，如果是排麦模式，并且不是电影放的时候，就隐藏排麦视图 */
@@ -3976,6 +4005,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     fun quit() {
         CommonAppContext.getInstance().isPlaying = false
         CommonAppContext.getInstance().isShow = false
+        CommonAppContext.getInstance().isMai = false
         AgoraManager.getInstance().cleanup()
         MyRoomSingleton.getInstance().onExitRoom()
     }
@@ -4006,8 +4036,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             publicScreenFragment?.clearExMessageListener()
             publicScreenFragment?.setIsPriRoom(false, arrayListOf())
         }
-        MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "")
+//        MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "")
-        AgoraManager.getInstance().lastRoomId = ""
+//        AgoraManager.getInstance().lastRoomId = ""
     }
 
 

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt

@@ -20,6 +20,7 @@ import com.xscm.modulemain.activity.room.contacts.PrivateContacts
 import com.xscm.modulemain.activity.room.presenter.PrivatePresenter
 import com.xscm.modulemain.databinding.FragmentRoomPrivateBinding
 import com.xscm.moduleutil.base.BaseMvpFragment
+import com.xscm.moduleutil.base.CommonAppContext
 import com.xscm.moduleutil.bean.RoomMessageEvent
 import com.xscm.moduleutil.bean.RoonGiftModel
 import com.xscm.moduleutil.bean.WalletBean
@@ -28,6 +29,7 @@ import com.xscm.moduleutil.bean.room.RoomInfoResp
 import com.xscm.moduleutil.bean.room.RoomPitBean
 import com.xscm.moduleutil.bean.room.RoomUserBean
 import com.xscm.moduleutil.listener.MessageExListenerSingleton
+import com.xscm.moduleutil.rtc.AgoraManager
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import java.util.Date
@@ -288,12 +290,15 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) :
 
     override fun exitRoom() {
         if (activity is RoomActivity) {
-            LogUtils.e(
+//            LogUtils.e(
-                "lxj",
+//                "lxj",
-                ("退出房间时间：" + TimeUtils.date2String(Date())).toString() + ":退出的roomId" + mRoomId
+//                ("退出房间时间：" + TimeUtils.date2String(Date())).toString() + ":退出的roomId" + mRoomId, "需要加入的房间："+AgoraManager.getInstance().lastRoomId
-            )
+//            )
             MessageExListenerSingleton.quitGroup(mRoomId)
-            (activity as RoomActivity).quit()
+////            (activity as RoomActivity).quit()
+////            CommonAppContext.getInstance().isPlaying = false
+////            CommonAppContext.getInstance().isShow = false
+            CommonAppContext.getInstance().isMai = false
             (activity as RoomActivity).jiaPrivateR()
         }
     }

MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java

@@ -234,6 +234,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
 
         mBinding.headerInfo.tvGz.setOnClickListener(this::onClick);
         mBinding.headerInfo.tvGsSx.setOnClickListener(this::onClick);
+        mBinding.headerInfo.tvSx.setOnClickListener(this::onClick);
         mBinding.headerInfo.ivRightAvatar.setOnClickListener(this::onClick);
         refreshView();
         if (userInfo.getGuild_name() == null || userInfo.getGuild_name().isEmpty()) {
@@ -364,9 +365,11 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
 
 
             if (userInfo.getRoom_id() == null || userInfo.getRoom_id().equals("0")) {
-                mBinding.headerInfo.tvGsSx.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.six));
+                mBinding.headerInfo.tvGsSx.setVisibility(GONE);
+//                mBinding.headerInfo.tvGsSx.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.six));
             } else {
-                mBinding.headerInfo.tvGsSx.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.gsui));
+                mBinding.headerInfo.tvGsSx.setVisibility(VISIBLE);
+//                mBinding.headerInfo.tvGsSx.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.gsui));
             }
 
         }
@@ -386,7 +389,13 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
 
 //                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", userInfo.getRoom_id()).navigation();
             }
-        } else if (view.getId() == R.id.im_gift_w) {
+        }else if (view.getId() == R.id.tv_sx) {
+            Intent intent = new Intent(getActivity(), TUIC2CChatActivity.class);
+            intent.putExtra(TUIConstants.TUIChat.CHAT_ID, "u" + userInfo.getUser_id());
+            intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C);
+            startActivity(intent);
+        }
+        else if (view.getId() == R.id.im_gift_w) {
             Intent intent = new Intent(getContext(), GiftWallActivity.class);
             intent.putExtra("userId", userInfo.getUser_id());
             startActivity(intent);

MainModule/src/main/res/layout/activity_room.xml

@@ -409,6 +409,21 @@
                     android:src="@mipmap/room_sett" />
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/rl_effects"
+                android:layout_width="0dp"
+                android:visibility="gone"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.3">
+
+
+                <ImageView
+                    android:id="@+id/iv_icon"
+                    android:layout_width="@dimen/dp_27"
+                    android:layout_height="@dimen/dp_27"
+                    android:layout_centerInParent="true"
+                    android:src="@mipmap/icon_close_effects" />
+            </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/rl_private_msg"

MainModule/src/main/res/layout/user_top.xml

@@ -78,7 +78,17 @@
                 android:layout_marginTop="@dimen/dp_6"
                 android:layout_marginEnd="@dimen/dp_10"
                 android:background="@mipmap/gsui"
-                app:layout_constraintEnd_toStartOf="@id/ctl_guild"
+                app:layout_constraintEnd_toStartOf="@+id/tv_sx"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_sx"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_6"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:background="@mipmap/six"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
 
@@ -148,9 +158,9 @@
                 android:id="@+id/ctl_guild"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_6"
+                app:layout_constraintTop_toBottomOf="@+id/iv_right_avatar"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/iv_right_avatar"
-                app:layout_constraintTop_toTopOf="parent">
+                app:layout_constraintBottom_toBottomOf="@+id/riv_user_head">
 
                 <androidx.constraintlayout.widget.Guideline
                     android:id="@+id/gl_start"