From 26a40f8ffb39578338af965a1d56cd874fde9084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 8 Jan 2026 11:43:30 +0800 Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E5=AE=9E=E5=90=8D=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E5=89=8D=E5=90=8E=E8=BE=93=E5=85=A5=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E5=87=BA=E7=8E=B0=E7=9A=84=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E5=90=8D=E7=9A=84=E6=83=85=E5=86=B5=202:=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=80=E9=94=AE=E5=85=A8=E6=92=A9=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E9=BA=A6=E4=B8=8A=E5=8F=AA=E6=9C=89=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=B0=B1=E7=BB=99?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=203:=E6=B7=BB=E5=8A=A0=E9=85=92=E5=90=A7?= =?UTF-8?q?=E6=88=BF=E8=BF=9B=E5=85=A5=E4=BA=A4=E5=8F=8B=E6=88=BF=EF=BC=8C?= =?UTF-8?q?=E5=8F=8C=E6=96=B9=E4=B8=8B=E9=BA=A6=EF=BC=8C=E5=9C=A8=E9=BA=A6?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E4=B8=8B=E9=BA=A6=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/room/activity/RoomActivity.kt | 94 +++++++++++-------- .../activity/room/fragment/RoomPubFragment.kt | 5 +- .../user/activity/RealNameActivity.java | 2 +- 3 files changed, 61 insertions(+), 40 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 31bce6f1..28d81d5e 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 @@ -242,7 +242,7 @@ class RoomActivity : BaseMvpActivity(), //用户列表用 private var mOnlineBean: RoomOnline? = null - var redPacketConfig : RedPacketConfig= RedPacketConfig() + var redPacketConfig: RedPacketConfig = RedPacketConfig() override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_DOWN) { @@ -1577,10 +1577,15 @@ class RoomActivity : BaseMvpActivity(), QXGiftPlayerManager.getInstance(this) .displayChatEffectView(messageEvent.text.play_image) - }else if( msgType == EMMessageInfo.QXRoomMessageTypeFlirtatious){ //酒吧房撩ta推送的信息 + } else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatious) { //酒吧房撩ta推送的信息 roomFragment?.handleRoomMessage(messageEvent) - }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoom) {//酒吧房约她进入小黑屋 - MvpPre?.postRoomInfo(messageEvent.text.room_id) + } else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoom) {//酒吧房约她进入小黑屋 + if (mRoomInfoResp?.user_info?.user_id == messageEvent.text.user_id.toInt() || mRoomInfoResp?.user_info?.user_id == messageEvent.text.meet_user_id.toInt()) { + if (mRoomInfoResp?.user_info?.pit_number !=0) { + MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString()) + } + MvpPre?.postRoomInfo(messageEvent.text.room_id) + } } } @@ -1752,7 +1757,7 @@ class RoomActivity : BaseMvpActivity(), } } - // TODO: 房间类型切换 + // TODO: 房间类型切换 private fun handleMsgType1012() { if (customMusicFloatingView != null) { customMusicFloatingView!!.destroy() @@ -1767,7 +1772,9 @@ class RoomActivity : BaseMvpActivity(), AgoraManager.getInstance().ClientRole(false) } if (mRoomInfoResp?.song_user_info != null && mRoomInfoResp?.song_user_info?.user_id != null) { - if (mRoomInfoResp?.song_user_info?.user_id == SpUtil.getUserId().toString() + "") { + if (mRoomInfoResp?.song_user_info?.user_id == SpUtil.getUserId() + .toString() + "" + ) { AgoraManager.getInstance().ClientRole(false) } } @@ -2340,7 +2347,8 @@ class RoomActivity : BaseMvpActivity(), mRoomInfoResp?.user_info?.pit_number = roomPitBean.pit_number.toInt() roomBtnShowIsHide(mRoomInfoResp?.user_info?.user_id!!) } - mRoomInfoResp?.room_info?.pit_list!![roomPitBean.pit_number.toInt() - 1] = roomPitBean + mRoomInfoResp?.room_info?.pit_list!![roomPitBean.pit_number.toInt() - 1] = + roomPitBean pitArr.add(roomPitBean) } @@ -2616,10 +2624,9 @@ class RoomActivity : BaseMvpActivity(), ) } else if (id == R.id.rl) { MvpPre!!.clearUserCharm(roomId, "") - }else if (id == R.id.rl2) { + } else if (id == R.id.rl2) { MakeFriendsDialog(this, roomId).show() - } - else if (id == R.id.ll_input) { + } else if (id == R.id.ll_input) { mBinding?.llInput?.visibility = View.GONE mBinding?.inputMenu1?.dismiss() } else if (id == R.id.iv_emoji) { @@ -2711,21 +2718,21 @@ class RoomActivity : BaseMvpActivity(), // MvpPre!!.downPit(roomId, "") // } // } else { - if (maiStatus) { - if (mRoomInfoResp?.room_info?.type_id == "11"){ - WishGiftDialog( - ActivityUtils.getTopActivity(), - roomId.toString(), - "" - ).show() - }else { - MvpPre!!.applyPit(roomId, "") - } - maiStatus = false + if (maiStatus) { + if (mRoomInfoResp?.room_info?.type_id == "11") { + WishGiftDialog( + ActivityUtils.getTopActivity(), + roomId.toString(), + "" + ).show() } else { - MvpPre!!.downPit(roomId, "") - maiStatus = true + MvpPre!!.applyPit(roomId, "") } + maiStatus = false + } else { + MvpPre!!.downPit(roomId, "") + maiStatus = true + } // } } } @@ -2889,7 +2896,7 @@ class RoomActivity : BaseMvpActivity(), } } - fun setPrivateRoomShowBottom(){ + fun setPrivateRoomShowBottom() { mBinding!!.rlPk.visibility = if (voive) View.GONE else View.GONE mBinding!!.rlMisc.visibility = @@ -3136,13 +3143,17 @@ class RoomActivity : BaseMvpActivity(), if (mRoomInfoResp?.room_info?.head_line != null) { mBinding!!.flaoatZuoji.visibility = View.VISIBLE - ImageUtils.loadHeadCC(mRoomInfoResp?.room_info?.head_line?.avatar, mBinding!!.headAvate) + ImageUtils.loadHeadCC( + mRoomInfoResp?.room_info?.head_line?.avatar, + mBinding!!.headAvate + ) mBinding!!.headName.text = mRoomInfoResp?.room_info?.head_line?.nickname mBinding!!.headCone.text = mRoomInfoResp?.room_info?.head_line?.content mBinding!!.headAvate.setOnClickListener { view -> ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE) - .withString("userId", mRoomInfoResp?.room_info?.head_line?.user_id).navigation() + .withString("userId", mRoomInfoResp?.room_info?.head_line?.user_id) + .navigation() } mBinding!!.ivQuanQiang.setOnClickListener { v: View? -> @@ -3269,7 +3280,8 @@ class RoomActivity : BaseMvpActivity(), } override fun showPasswordDialog() { - val roomPasswordSetDialogFragment = RoomPasswordSetDialogFragment.newInstance(true, roomId) + val roomPasswordSetDialogFragment = + RoomPasswordSetDialogFragment.newInstance(true, roomId) roomPasswordSetDialogFragment.show(supportFragmentManager) } @@ -3729,11 +3741,11 @@ class RoomActivity : BaseMvpActivity(), } RoomType.BLACK_ROOM -> { - if ("11" == labelId){ + if ("11" == labelId) { changeBackground(R.mipmap.icon_pri_bg) setvisibTop(false) QXRoomSeatViewType.PRIVATE - }else{ + } else { changeBackground(com.xscm.moduleutil.R.mipmap.cabin_bj) setvisibTop(false) QXRoomSeatViewType.CABIN @@ -3761,16 +3773,19 @@ class RoomActivity : BaseMvpActivity(), setvisibTop(true) QXRoomSeatViewType.SIGNCONTRACT } + RoomType.PUB_ROOM -> { changeBackgroundColor(mRoomInfoResp?.room_info?.room_background) setvisibTop(true) QXRoomSeatViewType.PUB } + RoomType.PRIVATE_ROOM -> { changeBackgroundColor(mRoomInfoResp?.room_info?.room_background) setvisibTop(true) QXRoomSeatViewType.PRIVATE } + null -> { LogUtils.e("@@@", "RoomType is null") QXRoomSeatViewType.NONE @@ -3890,8 +3905,8 @@ class RoomActivity : BaseMvpActivity(), override fun getRedpacketConfig(data: RedPacketConfig?) { - this.redPacketConfig= data!! - RedBagSendDialog(this, roomId,redPacketConfig).show() + this.redPacketConfig = data!! + RedBagSendDialog(this, roomId, redPacketConfig).show() } fun getTasksMessageService(number: Int) { @@ -4226,7 +4241,10 @@ class RoomActivity : BaseMvpActivity(), private val AUDIO_PERMISSIONS = arrayOf(Manifest.permission.RECORD_AUDIO) } - override fun onRedPacketsAdded(redPackets: MutableList?, remainingCount: Int) { + override fun onRedPacketsAdded( + redPackets: MutableList?, + remainingCount: Int + ) { // 处理添加红包列表的逻辑 if (redPackets!!.isNotEmpty()) { mBinding!!.drvRed.visibility = View.VISIBLE @@ -4335,11 +4353,11 @@ class RoomActivity : BaseMvpActivity(), userMakeVisibility() } - // TODO: 判断房间类型是否是酒吧房，只有酒吧房才会有交友小屋，其他房间类型没有 - private fun userMakeVisibility(){ - if(mRoomInfoResp?.room_info?.type_id=="11"){ + // TODO: 判断房间类型是否是酒吧房，只有酒吧房才会有交友小屋，其他房间类型没有 + private fun userMakeVisibility() { + if (mRoomInfoResp?.room_info?.type_id == "11") { mBinding?.roomTop?.rl2?.visibility = View.VISIBLE - }else{ + } else { mBinding?.roomTop?.rl2?.visibility = View.GONE } } @@ -4350,7 +4368,7 @@ class RoomActivity : BaseMvpActivity(), val builder = AlertDialog.Builder(this) val inflater = layoutInflater val dialogView = - inflater.inflate(com.xscm.moduleutil.R.layout.room_message_input_menu, null) + inflater.inflate(com.xscm.moduleutil.R.layout.room_message_input_menu, null) builder.setView(dialogView) val etContent = dialogView.findViewById(com.xscm.moduleutil.R.id.et_content) val tvSend = dialogView.findViewById