From 38d1c266d61aad1bbaa0626dd040e004ce22eddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Tue, 13 Jan 2026 19:13:19 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5=E5=B0=8F?= =?UTF-8?q?=E9=BB=91=E5=B1=8B=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=92=8C=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E7=9A=84=E7=89=B9=E6=95=88=E4=B8=80=E4=B8=AA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202=EF=BC=9A=E7=BB=99=E7=94=A8=E6=88=B7=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E6=B7=BB=E5=8A=A0=E7=A7=81=E4=BF=A1=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E5=B8=B8=E6=98=BE=E7=A4=BA=203=EF=BC=9A=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=80=80=E5=87=BA=E9=85=92=E5=90=A7=E6=88=BF=E5=B0=8F?= =?UTF-8?q?=E9=BB=91=E5=B1=8B=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/room/activity/RoomActivity.kt | 48 +++++++++++++++---- .../room/fragment/RoomPrivateFragment.kt | 15 ++++-- .../user/fragment/UserHomepageFragment.java | 15 ++++-- .../src/main/res/layout/activity_room.xml | 15 ++++++ MainModule/src/main/res/layout/user_top.xml | 18 +++++-- 5 files changed, 90 insertions(+), 21 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 27011d13..8bbf2efd 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 @@ -595,6 +595,12 @@ class RoomActivity : BaseMvpActivity(), ) } + mBinding?.rlEffects?.setOnClickListener { view: View -> + this.onClick( + view + ) + } + mBinding!!.inputMenu1.performClick() V2TIMManager.getConversationManager() @@ -1056,7 +1062,7 @@ class RoomActivity : BaseMvpActivity(), 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(), private fun goneAll() { if (mRoomInfoResp?.room_info?.label_id == "11") { - mBinding?.clDayTask?.visibility= View.GONE - mBinding?.xlhRk?.visibility= View.GONE - }else{ - mBinding?.clDayTask?.visibility= View.VISIBLE + mBinding?.clDayTask?.visibility = View.GONE + mBinding?.xlhRk?.visibility = View.GONE + } else { + mBinding?.clDayTask?.visibility = View.VISIBLE } } @@ -2866,6 +2872,20 @@ class RoomActivity : BaseMvpActivity(), 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(), 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(), 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(), 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(), 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(), publicScreenFragment?.clearExMessageListener() publicScreenFragment?.setIsPriRoom(false, arrayListOf()) } - MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "") - AgoraManager.getInstance().lastRoomId = "" +// MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "") +// AgoraManager.getInstance().lastRoomId = "" } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt index 7bc8c827..7a0e604f 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt +++ b/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( - "lxj", - ("退出房间时间：" + TimeUtils.date2String(Date())).toString() + ":退出的roomId" + mRoomId - ) +// LogUtils.e( +// "lxj", +// ("退出房间时间：" + 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() } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java index 598a00fe..58210a2c 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java @@ -234,6 +234,7 @@ public class UserHomepageFragment extends BaseMvpFragment + + + + + + + @@ -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_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toBottomOf="@+id/iv_right_avatar" + app:layout_constraintStart_toStartOf="@+id/iv_right_avatar" + app:layout_constraintBottom_toBottomOf="@+id/riv_user_head">