From a8328ac8b97349b81fffe393aaacdd9fb64a406e Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Thu, 8 Jan 2026 18:29:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/room/activity/RoomActivity.kt | 97 ++++--------------- .../room/fragment/ChatRoomFragment.java | 1 - .../activity/room/fragment/RoomPubFragment.kt | 5 +- .../xscm/modulemain/utils/CountdownTimer.kt | 3 +- .../src/main/res/layout/activity_room.xml | 18 ++++ .../main/res/layout/layout_room_pub_wheat.xml | 2 +- 6 files changed, 45 insertions(+), 81 deletions(-) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index a17278b3..43293d57 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -245,6 +245,8 @@ class RoomActivity : BaseMvpActivity(), private var mOnlineBean: RoomOnline? = null var redPacketConfig: RedPacketConfig = RedPacketConfig() + private var isShowPrivateMsg = false + override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_DOWN) { // 拦截返回键，显示退出对话框而不是直接退出 @@ -588,6 +590,12 @@ class RoomActivity : BaseMvpActivity(), ) } + mBinding!!.ivPrivateSet.setOnClickListener { view: View -> + this.onClick( + view + ) + } + mBinding!!.inputMenu1.performClick() V2TIMManager.getConversationManager() @@ -2757,6 +2765,16 @@ class RoomActivity : BaseMvpActivity(), maiStatus = true } // } + } else if (id == R.id.iv_private_set) { + if (mBinding?.ivPrivateSet?.tag == 1){ + mBinding?.ivPrivateSet?.setImageResource(R.mipmap.icon_pri_select_off) + mBinding?.ivPrivateSet?.tag = "0" + isShowPrivateMsg = true + }else { + mBinding?.ivPrivateSet?.setImageResource(R.mipmap.icon_pri_select_on) + mBinding?.ivPrivateSet?.tag = "1" + isShowPrivateMsg = false + } } } @@ -2938,6 +2956,8 @@ class RoomActivity : BaseMvpActivity(), if (voive) View.VISIBLE else View.GONE mBinding!!.rlMai.visibility = if (voive) View.VISIBLE else View.VISIBLE + mBinding?.rlPrivateMsg?.visibility = View.VISIBLE + mRoomInfoResp?.user_info?.pit_number = 9527 } /** 进入小黑屋将所有的底部隐藏 */ @@ -2960,6 +2980,7 @@ class RoomActivity : BaseMvpActivity(), if (voive) View.VISIBLE else View.GONE mBinding!!.clFirstCharge.visibility = if (voive) View.VISIBLE else View.GONE + mBinding?.rlPrivateMsg?.visibility = View.GONE } /** 这里是当进入电影放房的时候，如果是排麦模式，并且不是电影放的时候，就隐藏排麦视图 */ @@ -4550,79 +4571,3 @@ class RoomActivity : BaseMvpActivity(), } } - - -/* 房间内区分逻辑 -mBinding?.ivSoundEffects?.visibility = View.GONE -if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.AUCTION) { - mRoomInfoResp?.room_info?.pit_list?.forEachIndexed { index, pit -> - if (index == 0) { - if (mRoomInfoResp?.user_info?.pit_number != 0 && pit.user_id.equals( - mRoomInfoResp?.user_info?.user_id.toString() - ) - ) { - mBinding?.rlMai?.visibility = View.VISIBLE - mBinding?.ivSoundEffects?.visibility = View.VISIBLE - } else if (mRoomInfoResp?.room_auction?.auction_user?.user_id.equals( - mRoomInfoResp?.user_info?.user_id.toString() - ) - ) { //拍卖房 888麦位 - mBinding?.rlMai?.visibility = View.VISIBLE - } else if (mRoomInfoResp?.room_auction?.auction_list != null && mRoomInfoResp?.room_auction?.auction_list?.size!! > 0) { - mRoomInfoResp?.room_auction?.auction_list?.forEachIndexed { index, auction -> - if (index < 6 && auction.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) { - mBinding?.rlMai?.visibility = View.VISIBLE - } - } - } else { - mBinding?.rlMai?.visibility = View.GONE - } - } - } -} else { - mRoomInfoResp?.room_info?.pit_list?.forEachIndexed { index, pit -> - //判断是交友房 练歌房 - if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.DATING - && mRoomInfoResp?.room_info?.label_id.equals("2") - ) { - - if (!mRoomInfoResp?.song_user_info?.user_id.isNullOrEmpty()) { - if (mRoomInfoResp?.song_user_info?.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) { - mBinding?.rlMai?.visibility = View.VISIBLE - } else { - mBinding?.rlMai?.visibility = View.GONE - } - } else { - mRoomInfoResp?.song_pit_list?.forEach { songPit -> - if (songPit.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) { - mBinding?.rlMai?.visibility = View.VISIBLE - } else { - mBinding?.rlMai?.visibility = View.GONE - } - } - } - } else if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.JUKEBOX) { - if (mRoomInfoResp?.singer_info?.song_info?.user_id!! > 0 - && mRoomInfoResp?.singer_info?.song_info?.user_id == mRoomInfoResp?.user_info?.user_id - ) { - mBinding?.rlMai?.visibility = View.VISIBLE - } else { - if (pit.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) { - mBinding?.rlMai?.visibility = View.VISIBLE - } - } - } else { - //判断是交友房 and 自己是主持麦 - if (RoomType.fromTypeId(mRoomInfoResp?.room_info?.type_id.toString()) == RoomType.DATING - && index == 8 - && pit.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString()) - ) { - mBinding?.rlPk?.visibility = View.VISIBLE - } - } - //音效 - if (index == 8 && pit.user_id.equals(mRoomInfoResp?.user_info?.user_id.toString())) { - mBinding?.ivSoundEffects?.visibility = View.VISIBLE - } - } -}*/ diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java index a8917e58..e58c076e 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java @@ -75,7 +75,6 @@ public class ChatRoomFragment extends BaseMvpFragment + + + + + + + diff --git a/MainModule/src/main/res/layout/layout_room_pub_wheat.xml b/MainModule/src/main/res/layout/layout_room_pub_wheat.xml index e3e917c6..0de2be89 100644 --- a/MainModule/src/main/res/layout/layout_room_pub_wheat.xml +++ b/MainModule/src/main/res/layout/layout_room_pub_wheat.xml @@ -200,7 +200,7 @@